diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-01-26 10:58:59 -0800 |
|---|---|---|
| committer | Bernardo Meurer <bernardo@meurer.org> | 2022-01-26 10:58:59 -0800 |
| commit | c1d240ffcb119c201ef1f59d4cd6e5136071a308 (patch) | |
| tree | f21183f22466d708088462d0380b1860447bfde4 /pkgs/tools/package-management/nix | |
| parent | 3e049210ef271658194875df81b58e0d43bac10f (diff) | |
| download | nixpkgs-c1d240ffcb119c201ef1f59d4cd6e5136071a308.tar nixpkgs-c1d240ffcb119c201ef1f59d4cd6e5136071a308.tar.gz nixpkgs-c1d240ffcb119c201ef1f59d4cd6e5136071a308.tar.bz2 nixpkgs-c1d240ffcb119c201ef1f59d4cd6e5136071a308.tar.lz nixpkgs-c1d240ffcb119c201ef1f59d4cd6e5136071a308.tar.xz nixpkgs-c1d240ffcb119c201ef1f59d4cd6e5136071a308.tar.zst nixpkgs-c1d240ffcb119c201ef1f59d4cd6e5136071a308.zip | |
nixVersions: keep attrset chronologically sorted
Diffstat (limited to 'pkgs/tools/package-management/nix')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 3d9f393e76d..38bf1933f85 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -44,11 +44,20 @@ let inherit storeDir stateDir confDir; }; in rec { - stable = nix_2_6; + nix_2_3 = buildNix rec { + version = "2.3.16"; + src = fetchurl { + url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"; + sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; + }; + boehmgc = boehmgc_nix_2_3; + }; - nix_2_6 = buildNix { - version = "2.6.0"; - sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; + nix_2_4 = buildNix { + version = "2.4"; + sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k="; + # https://github.com/NixOS/nix/pull/5537 + patches = [ ./patches/install-nlohmann_json-headers.patch ]; }; nix_2_5 = buildNix { @@ -58,21 +67,13 @@ in rec { patches = [ ./patches/install-nlohmann_json-headers.patch ]; }; - nix_2_4 = buildNix { - version = "2.4"; - sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k="; - # https://github.com/NixOS/nix/pull/5537 - patches = [ ./patches/install-nlohmann_json-headers.patch ]; + nix_2_6 = buildNix { + version = "2.6.0"; + sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; }; - nix_2_3 = buildNix rec { - version = "2.3.16"; - src = fetchurl { - url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"; - sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; - }; - boehmgc = boehmgc_nix_2_3; - }; + # FIXME: nix_2_6 is broken on aarch64-darwin for now. + stable = nix_2_5; unstable = lib.lowPrio (buildNix rec { version = "2.7"; |