Skip to content

Commit

Permalink
Merge pull request #42 from nixbuild/nix_2_2x
Browse files Browse the repository at this point in the history 
Add Nix 2.20.5 and 2.21.0
  • Loading branch information
@rickynils
rickynils committed Mar 17, 2024
2 parents 3e26077 + de77414 commit ac5ac30
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 218 deletions.
88 changes: 8 additions & 80 deletions .github/workflows/cicd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,11 @@ jobs:
- macos-12
- macos-11
nix_version:
- 2.21.0
- 2.20.5
- 2.19.3
- 2.18.1
- 2.17.1
- 2.16.2
- 2.15.3
- 2.14.1
- 2.13.6
- 2.12.1
- 2.11.1
- 2.10.3
- 2.9.2
- 2.8.1
- 2.7.0
- 2.6.1
- 2.5.1
- 2.4
- 2.3.17
- 2.2.2
- 2.1.3
- 2.0.4
exclude:
- os: macos-11
nix_version: 2.0.4
- os: macos-12
nix_version: 2.0.4
runs-on: ${{ matrix.os }}
steps:
- uses: divnix/nix-cache-action@v3.0.11-nix
Expand All @@ -95,9 +75,9 @@ jobs:
run: nix-build -v --version
- name: Add to store
run: |
file="$(mktemp)"
file="$RANDOM"
echo "$RANDOM" > "$file"
path="$(nix-store --add "$file")"
path="$(nix-store --add "./$file")"
mkdir -p ~/.cache/nix
ln -s "$path" ~/.cache/nix/test-path
Expand All @@ -112,43 +92,11 @@ jobs:
- macos-12
- macos-11
nix_version:
- 2.21.0
- 2.20.5
- 2.19.3
- 2.18.1
- 2.17.1
- 2.16.2
- 2.15.3
- 2.14.1
- 2.13.6
- 2.12.1
- 2.11.1
- 2.10.3
- 2.9.2
- 2.8.1
- 2.7.0
- 2.6.1
- 2.5.1
- 2.4
- 2.3.17
- 2.2.2
include:
- nix_version: 2.12.1
nix_conf: experimental-features = nix-command
- nix_version: 2.11.1
nix_conf: experimental-features = nix-command
- nix_version: 2.10.3
nix_conf: experimental-features = nix-command
- nix_version: 2.9.2
nix_conf: experimental-features = nix-command
- nix_version: 2.8.1
nix_conf: experimental-features = nix-command
- nix_version: 2.7.0
nix_conf: experimental-features = nix-command
- nix_version: 2.6.1
nix_conf: experimental-features = nix-command
- nix_version: 2.5.1
nix_conf: experimental-features = nix-command
- nix_version: 2.4
nix_conf: experimental-features = nix-command
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -189,31 +137,11 @@ jobs:
- macos-12
- macos-11
nix_version:
- 2.21.0
- 2.20.5
- 2.19.3
- 2.18.1
- 2.17.1
- 2.16.2
- 2.15.3
- 2.14.1
- 2.13.6
- 2.12.1
- 2.11.1
- 2.10.3
- 2.9.2
- 2.8.1
- 2.7.0
- 2.6.1
- 2.5.1
- 2.4
- 2.3.17
- 2.2.2
- 2.1.3
- 2.0.4
exclude:
- os: macos-11
nix_version: 2.0.4
- os: macos-12
nix_version: 2.0.4
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down
107 changes: 4 additions & 103 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 4 additions & 35 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,7 @@

inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs-unstable.url = "nixpkgs/627771c19dba1d4cbee75dccb402388ba8023fda";
nixpkgs-nix-2_9_2.url = "nixpkgs/593d839e8fadea1183e071186ae1b584792d4884";
nixpkgs-nix-2_5_1.url = "nixpkgs/89f196fe781c53cb50fef61d3063fa5e8d61b6e5";
nixpkgs-nix-2_4.url = "nixpkgs/e912008eef096f52f28cf87492830c54ef334eb4";
nixpkgs-nix-2_2_2.url = "nixpkgs/5399f34ad9481849720d14605ce87b81abe202e9";
nixpkgs-nix-2_2_2.flake = false;
nixpkgs-nix-2_1_3.url = "nixpkgs/2c9265c95075170ad210ed5635ecffcd36db6b84";
nixpkgs-nix-2_1_3.flake = false;
nixpkgs-nix-2_0_4.url = "nixpkgs/47b85dc5ab8243a653c20d4851a3e6c966877251";
nixpkgs-nix-2_0_4.flake = false;
nixpkgs-unstable.url = "nixpkgs/295ee8d482bc8620fa2c3757c7a95a7e824222bc";
};

nixConfig = {
Expand All @@ -25,12 +16,6 @@
self,
flake-utils,
nixpkgs-unstable,
nixpkgs-nix-2_9_2,
nixpkgs-nix-2_5_1,
nixpkgs-nix-2_4,
nixpkgs-nix-2_2_2,
nixpkgs-nix-2_1_3,
nixpkgs-nix-2_0_4
}:
let allSystems = ["x86_64-linux" "x86_64-darwin"];
in flake-utils.lib.eachSystem allSystems (system:
Expand Down Expand Up @@ -67,27 +52,11 @@
nixVersions = system: lib.listToAttrs (map (nix: lib.nameValuePair
nix.version nix
) (
[ nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_19
[ 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
nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_17
nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_16
nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_15
nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_14
nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_13
nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_12
nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_11
nixpkgs-unstable.legacyPackages.${system}.nixVersions.nix_2_10
nixpkgs-nix-2_9_2.legacyPackages.${system}.nixVersions.nix_2_9
nixpkgs-nix-2_9_2.legacyPackages.${system}.nixVersions.nix_2_8
nixpkgs-nix-2_9_2.legacyPackages.${system}.nixVersions.nix_2_7
nixpkgs-nix-2_9_2.legacyPackages.${system}.nixVersions.nix_2_6
nixpkgs-nix-2_5_1.legacyPackages.${system}.nix
nixpkgs-nix-2_4.legacyPackages.${system}.nix
nixpkgs-unstable.legacyPackages.${system}.nixVersions.minimum
(import nixpkgs-nix-2_2_2 { inherit system; }).nix
(import nixpkgs-nix-2_1_3 { inherit system; }).nix
] ++ lib.optionals (system == "x86_64-linux") [
(import nixpkgs-nix-2_0_4 { inherit system; }).nix
]
));

Expand Down

0 comments on commit ac5ac30

Please sign in to comment.