switch to nix unstable

nix-community · Aug 6, 2023 · b8f3f06 · b8f3f06
1 parent e371bdb
commit b8f3f06
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/default.nix b/default.nix
@@ -1,11 +1,10 @@
 { pkgs ? (import <nixpkgs> { })
 , rustPlatform ? pkgs.rustPlatform
-, nix ? pkgs.nix
+, nixVersions ? pkgs.nixVersions
 , nix-gitignore ? pkgs.nix-gitignore
 , lib ? pkgs.lib
 , clippy ? pkgs.clippy
 , pkg-config ? pkgs.pkg-config
-, nixVersions ? pkgs.nixVersions
 , nlohmann_json ? pkgs.nlohmann_json
 , libsodium ? pkgs.libsodium
 , boost ? pkgs.boost
@@ -20,7 +19,7 @@ rustPlatform.buildRustPackage ({
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableClippy [ clippy ];
   buildInputs = [
-    (if lib.versionAtLeast nix.version nixVersions.nix_2_12.version then nix else nixVersions.nix_2_12)
+    nixVersions.unstable
     nlohmann_json
     libsodium
     boost

diff --git a/shell.nix b/shell.nix
@@ -1,10 +1,22 @@
-{ pkgs ? import <nixpkgs> { } }:
+{ pkgs ? import <nixpkgs> { }
+, nixVersions ? pkgs.nixVersions
+, nlohmann_json ? pkgs.nlohmann_json
+, libsodium ? pkgs.libsodium
+, boost ? pkgs.boost
+, rustfmt ? pkgs.rustfmt
+, clippy ? pkgs.clippy
+, cargo-watch ? pkgs.cargo-watch
+, cargo-edit ? pkgs.cargo-edit
+, cargo-outdated ? pkgs.cargo-outdated
+, cargo-audit ? pkgs.cargo-audit
+, openssl ? pkgs.openssl
+}:
 
 pkgs.mkShell {
   name = "harmonia";
   nativeBuildInputs = with pkgs; [ rustc cargo pkg-config ];
-  buildInputs = with pkgs; [
-    (if lib.versionAtLeast nix.version nixVersions.nix_2_12.version then nix else nixVersions.nix_2_12)
+  buildInputs = [
+    nixVersions.unstable
     nlohmann_json
     libsodium
     boost