Skip to content

Commit

Permalink
Add Nix 2.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rickynils committed Oct 10, 2022
1 parent 4af62fa commit 233b0cc
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-10.15]
nix_version:
- 2.11.0
- 2.10.3
- 2.9.2
- 2.9.1
Expand Down Expand Up @@ -80,6 +81,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-10.15]
nix_version:
- 2.11.0
- 2.10.3
- 2.9.2
- 2.9.1
Expand All @@ -96,6 +98,8 @@ jobs:
- 2.3.7
- 2.2.2
include:
- nix_version: 2.11.0
nix_conf: experimental-features = nix-command flakes
- nix_version: 2.10.3
nix_conf: experimental-features = nix-command flakes
- nix_version: 2.9.2
Expand Down
16 changes: 16 additions & 0 deletions flake.lock

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

9 changes: 6 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs-nix-2_11_0.url = "nixpkgs/6e56024e67fb31c07d3531965d6c9210e638e84b";
nixpkgs-nix-2_10_3.url = "nixpkgs/ed0e38f28d60055832397382c4ca471d2bc1b173";
nixpkgs-nix-2_9_2.url = "nixpkgs/8404dc74ef972c37009be6b20086ab7bd5e45f21";
nixpkgs-nix-2_9_1.url = "nixpkgs/0e51dce7781574bbe5c99f649ae8bf157c268d76";
Expand All @@ -28,6 +29,7 @@
outputs = {
self,
flake-utils,
nixpkgs-nix-2_11_0,
nixpkgs-nix-2_10_3,
nixpkgs-nix-2_9_2,
nixpkgs-nix-2_9_1,
Expand All @@ -51,14 +53,14 @@

let

inherit (nixpkgs-nix-2_10_3) lib;
inherit (nixpkgs-nix-2_11_0) lib;

preferRemoteBuild = drv: drv.overrideAttrs (_: {
preferLocalBuild = false;
allowSubstitutes = true;
});

pkgs = import nixpkgs-nix-2_10_3 {
pkgs = import nixpkgs-nix-2_11_0 {
inherit system;
overlays = [
(self: super: super.prefer-remote-fetch self super)
Expand All @@ -82,7 +84,8 @@
nixVersions = system: lib.listToAttrs (map (nix: lib.nameValuePair
nix.version nix
) (
[ nixpkgs-nix-2_10_3.legacyPackages.${system}.nix
[ nixpkgs-nix-2_11_0.legacyPackages.${system}.nix
nixpkgs-nix-2_10_3.legacyPackages.${system}.nix
nixpkgs-nix-2_9_2.legacyPackages.${system}.nix
nixpkgs-nix-2_9_1.legacyPackages.${system}.nix
nixpkgs-nix-2_8_1.legacyPackages.${system}.nix
Expand Down

0 comments on commit 233b0cc

Please sign in to comment.