diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 8eb6c62..0c3162e 100644 --- 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/nix-cache-action@v3.0.11-nix @@ -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 index 9121478..aed0f44 100644 --- 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 index 17710ff..8574b79 100644 --- a/flake.lock +++ b/flake.lock @@ -17,16 +17,16 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1711733423, - "narHash": "sha256-C3ti1qWyAc7lFxpTlI/Dxvb8V4Qp0e+DAQg/VPJWxM0=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "276624921a196180387832713961b1b8d06ec178", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { "id": "nixpkgs", - "rev": "276624921a196180387832713961b1b8d06ec178", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index ae2e3d6..8bac2cb 100644 --- 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