Merge pull request #49 from nixbuild/nix-updates

Bump Nix versions, and add Nix 2.22, 2.23, 2.24
nixbuild · Nov 5, 2024 · 52616b7 · 52616b7
2 parents 6d8e472 + 941ae2d
commit 52616b7
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 29 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-22.04, macos-12]
+        os: [ubuntu-22.04, macos-13]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -45,14 +45,16 @@ jobs:
         os:
           - ubuntu-22.04
           - ubuntu-20.04
-          - macos-12
-          - macos-11
+          - macos-13
         nix_version:
-          - 2.21.0
-          - 2.20.5
-          - 2.19.3
-          - 2.18.2
-          - 2.3.17
+          - 2.24.9
+          - 2.23.3
+          - 2.22.3
+          - 2.21.4
+          - 2.20.8
+          - 2.19.6
+          - 2.18.8
+          - 2.3.18
     runs-on: ${{ matrix.os }}
     steps:
       - uses: divnix/[email protected]
@@ -89,14 +91,16 @@ jobs:
         os:
           - ubuntu-22.04
           - ubuntu-20.04
-          - macos-12
-          - macos-11
+          - macos-13
         nix_version:
-          - 2.21.0
-          - 2.20.5
-          - 2.19.3
-          - 2.18.2
-          - 2.3.17
+          - 2.24.9
+          - 2.23.3
+          - 2.22.3
+          - 2.21.4
+          - 2.20.8
+          - 2.19.6
+          - 2.18.8
+          - 2.3.18
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -134,14 +138,16 @@ jobs:
         os:
           - ubuntu-22.04
           - ubuntu-20.04
-          - macos-12
-          - macos-11
+          - macos-13
         nix_version:
-          - 2.21.0
-          - 2.20.5
-          - 2.19.3
-          - 2.18.2
-          - 2.3.17
+          - 2.24.9
+          - 2.23.3
+          - 2.22.3
+          - 2.21.4
+          - 2.20.8
+          - 2.19.6
+          - 2.18.8
+          - 2.3.18
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/action.yml b/action.yml
@@ -6,7 +6,7 @@ inputs:
 
   nix_version:
     required: true
-    default: "2.21.0"
+    default: "2.21.4"
     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,7 +3,7 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs-unstable.url = "nixpkgs/276624921a196180387832713961b1b8d06ec178";
+    nixpkgs-unstable.url = "nixpkgs/ccc0c2126893dd20963580b6478d1a10a4512185";
   };
 
   nixConfig = {
@@ -52,7 +52,11 @@
       nixVersions = system: lib.listToAttrs (map (nix: lib.nameValuePair
         nix.version nix
       ) (
-        [ nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_21
+        [
+          nixpkgs-unstable.legacyPackages.${system}.nixVersions.latest
+          nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_23
+          nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_22
+          nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_21
           nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_20
           nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_19
           nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_18