chore: bump nix to 2.21

holochain · Jun 13, 2024 · f5c74b0 · f5c74b0
1 parent dd3c92b
commit f5c74b0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,7 +4,8 @@
   inputs = {
     nixpkgs.follows = "nixpkgs-23-11";
     nixpkgs-23-11 = {url = "github:nixos/nixpkgs/nixos-23.11";};
-    nixpkgsNix = {url = "github:nixos/nixpkgs/nixos-unstable";};
+    nixpkgs-24-05 = {url = "github:nixos/nixpkgs/nixos-24.05";};
+    nixpkgsNix.follows = "nixpkgs-24-05";
     nixpkgsGithubActionRunners = {url = "github:nixos/nixpkgs/nixos-unstable";};
     nixpkgsUnstable = {url = "github:nixos/nixpkgs/nixos-unstable";};
     nixpkgsMaster = {url = "github:nixos/nixpkgs/master";};

diff --git a/modules/nixos/shared.nix b/modules/nixos/shared.nix
@@ -17,7 +17,7 @@
     # ]
     ;
 
-  nix.package = lib.mkDefault inputs.nixpkgsNix.legacyPackages.${pkgs.stdenv.system}.nixVersions.nix_2_20;
+  nix.package = lib.mkDefault inputs.nixpkgsNix.legacyPackages.${pkgs.stdenv.system}.nixVersions.nix_2_21;
 
   nix.settings.extra-platforms =
     lib.mkIf pkgs.stdenv.isDarwin ["x86_64-darwin" "aarch64-darwin"];