Merge pull request #15 from nixbuild/nix-2_9_0

Add Nix 2.9.0
nixbuild · Jun 9, 2022 · b249097 · b249097
2 parents c97efb7 + 700177d
commit b249097
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -39,6 +39,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-10.15]
         nix_version:
+          - 2.9.0
           - 2.8.1
           - 2.7.0
           - 2.6.1
@@ -77,6 +78,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-10.15]
         nix_version:
+          - 2.9.0
           - 2.8.1
           - 2.7.0
           - 2.6.1
@@ -90,6 +92,8 @@ jobs:
           - 2.3.7
           - 2.2.2
         include:
+          - nix_version: 2.9.0
+            nix_conf: experimental-features = nix-command flakes
           - nix_version: 2.8.1
             nix_conf: experimental-features = nix-command flakes
           - nix_version: 2.7.0

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs-nix-2_9_0.url = "nixpkgs/d10d2e4fb824eece9b090d77218db7d6e1ad4b61";
     nixpkgs-nix-2_8_1.url = "nixpkgs/eb78d30bf48c1064299d96082054bae587582f2e";
     nixpkgs-nix-2_7_0.url = "nixpkgs/e3a73aed432da016f57230ac977cf515525e6cc5";
     nixpkgs-nix-2_6_1.url = "nixpkgs/a4a3ef1016e6dddda8ebd3bde232ba5102a406e7";
@@ -25,6 +26,7 @@
   outputs = {
     self,
     flake-utils,
+    nixpkgs-nix-2_9_0,
     nixpkgs-nix-2_8_1,
     nixpkgs-nix-2_7_0,
     nixpkgs-nix-2_6_1,
@@ -45,14 +47,14 @@
 
     let
 
-      inherit (nixpkgs-nix-2_8_1) lib;
+      inherit (nixpkgs-nix-2_9_0) lib;
 
       preferRemoteBuild = drv: drv.overrideAttrs (_: {
         preferLocalBuild = false;
         allowSubstitutes = true;
       });
 
-      pkgs = import nixpkgs-nix-2_8_1 {
+      pkgs = import nixpkgs-nix-2_9_0 {
         inherit system;
         overlays = [
           (self: super: super.prefer-remote-fetch self super)
@@ -76,7 +78,8 @@
       nixVersions = system: lib.listToAttrs (map (nix: lib.nameValuePair
         nix.version nix
       ) (
-        [ nixpkgs-nix-2_8_1.legacyPackages.${system}.nix
+        [ nixpkgs-nix-2_9_0.legacyPackages.${system}.nix
+          nixpkgs-nix-2_8_1.legacyPackages.${system}.nix
           nixpkgs-nix-2_7_0.legacyPackages.${system}.nix
           nixpkgs-nix-2_6_1.legacyPackages.${system}.nix
           nixpkgs-nix-2_6_0.legacyPackages.${system}.nix