Add Nix 2.8.0

nixbuild · Apr 26, 2022 · df55011 · df55011
1 parent a10962f
commit df55011
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 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.8.0
           - 2.7.0
           - 2.6.1
           - 2.6.0
@@ -76,6 +77,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-10.15]
         nix_version:
+          - 2.8.0
           - 2.7.0
           - 2.6.1
           - 2.6.0
@@ -88,6 +90,8 @@ jobs:
           - 2.3.7
           - 2.2.2
         include:
+          - nix_version: 2.8.0
+            nix_conf: experimental-features = nix-command flakes
           - nix_version: 2.7.0
             nix_conf: experimental-features = nix-command flakes
           - nix_version: 2.6.1

diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ jobs:
 ### Using Nix flakes
 
 To be able to use Nix flakes you need to specify a version of Nix that supports
-it (the default Nix version, 2.7.0, works fine), and enable the flakes
+it (the default Nix version, 2.8.0, works fine), and enable the flakes
 functionality in the nix configuration:
 
 ```yaml

diff --git a/action.yml b/action.yml
@@ -6,7 +6,7 @@ inputs:
 
   nix_version:
     required: true
-    default: "2.7.0"
+    default: "2.8.0"
     description: |
       The version of Nix that should be installed
 

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_8_0.url = "nixpkgs/b57126a16e9a70fc763b517ad45bf5f16f9e4dab";
     nixpkgs-nix-2_7_0.url = "nixpkgs/e3a73aed432da016f57230ac977cf515525e6cc5";
     nixpkgs-nix-2_6_1.url = "nixpkgs/a4a3ef1016e6dddda8ebd3bde232ba5102a406e7";
     nixpkgs-nix-2_6_0.url = "nixpkgs/8ea208739449a10d5deee5cea0f229ac3a65cfb6";
@@ -24,6 +25,7 @@
   outputs = {
     self,
     flake-utils,
+    nixpkgs-nix-2_8_0,
     nixpkgs-nix-2_7_0,
     nixpkgs-nix-2_6_1,
     nixpkgs-nix-2_6_0,
@@ -43,14 +45,14 @@
 
     let
 
-      inherit (nixpkgs-nix-2_7_0) lib;
+      inherit (nixpkgs-nix-2_8_0) lib;
 
       preferRemoteBuild = drv: drv.overrideAttrs (_: {
         preferLocalBuild = false;
         allowSubstitutes = true;
       });
 
-      pkgs = import nixpkgs-nix-2_7_0 {
+      pkgs = import nixpkgs-nix-2_8_0 {
         inherit system;
         overlays = [
           (self: super: super.prefer-remote-fetch self super)
@@ -74,7 +76,8 @@
       nixVersions = system: lib.listToAttrs (map (nix: lib.nameValuePair
         nix.version nix
       ) (
-        [ nixpkgs-nix-2_7_0.legacyPackages.${system}.nix
+        [ nixpkgs-nix-2_8_0.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
           nixpkgs-nix-2_5_1.legacyPackages.${system}.nix