diff --git a/flake.nix b/flake.nix index 6963038c..505cc63a 100644 --- a/flake.nix +++ b/flake.nix @@ -144,9 +144,6 @@ inputs.guix-overlay.nixosModules.guix ]; - # Bleeding edge, baybee! - nix.package = lib.mkDefault pkgs.nixUnstable; - # I want to capture the usual flakes to its exact version so we're # making them available to our system. This will also prevent the # annoying downloads since it always get the latest revision. diff --git a/modules/nixos/profiles/system.nix b/modules/nixos/profiles/system.nix index 1204cb9f..ec3b1a9f 100644 --- a/modules/nixos/profiles/system.nix +++ b/modules/nixos/profiles/system.nix @@ -161,10 +161,7 @@ in { hardware.opentabletdriver.enable = true; # Enable support for Bluetooth. - hardware.bluetooth = { - enable = true; - package = pkgs.bluezFull; - }; + hardware.bluetooth.enable = true; }) (lib.mkIf cfg.cleanup.enable { diff --git a/pkgs/software-heritage/swh-model.nix b/pkgs/software-heritage/swh-model.nix index 3a115a05..7cd2dd03 100644 --- a/pkgs/software-heritage/swh-model.nix +++ b/pkgs/software-heritage/swh-model.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { typing-extensions hypothesis iso8601 - dateutil + python-dateutil attrs attrs-strict diff --git a/pkgs/software-heritage/swh-web-client.nix b/pkgs/software-heritage/swh-web-client.nix index 9048a8e4..06158ccf 100644 --- a/pkgs/software-heritage/swh-web-client.nix +++ b/pkgs/software-heritage/swh-web-client.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ - dateutil + python-dateutil click requests diff --git a/pkgs/tic-80/default.nix b/pkgs/tic-80/default.nix index eab46473..e4c7f755 100644 --- a/pkgs/tic-80/default.nix +++ b/pkgs/tic-80/default.nix @@ -13,7 +13,7 @@ , libglvnd , mesa , SDL2 -, pkgconfig +, pkg-config , valgrind , sndio , libsamplerate @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace '@mruby@' "${mruby}" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib freeglut diff --git a/shells/rust.nix b/shells/rust.nix index e8049cab..e612fad8 100644 --- a/shells/rust.nix +++ b/shells/rust.nix @@ -2,7 +2,7 @@ # to use the `rust` template from `nixpkgs` or whatever you prefer. { mkShell , openssl -, pkgconfig +, pkg-config , cargo , rustc , rustfmt @@ -14,7 +14,7 @@ mkShell { buildInputs = [ openssl # In case some package needs it. - pkgconfig # In case some other package needs it. + pkg-config # In case some other package needs it. # Rust platform. cargo