diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-03 18:10:45 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-03 18:10:45 +0100 |
| commit | d586f5d97e8d37f43eae2fe5c98598ce1c393688 (patch) | |
| tree | e106ff9f2c3c0137ed84b0922731fbef0ed87773 /pkgs/tools | |
| parent | c94ad64ae5573f529213c4d97baf3ea67e86b6b7 (diff) | |
| parent | 729d72f9e421134b58801772f59af990e5a35fee (diff) | |
| download | nixlib-d586f5d97e8d37f43eae2fe5c98598ce1c393688.tar nixlib-d586f5d97e8d37f43eae2fe5c98598ce1c393688.tar.gz nixlib-d586f5d97e8d37f43eae2fe5c98598ce1c393688.tar.bz2 nixlib-d586f5d97e8d37f43eae2fe5c98598ce1c393688.tar.lz nixlib-d586f5d97e8d37f43eae2fe5c98598ce1c393688.tar.xz nixlib-d586f5d97e8d37f43eae2fe5c98598ce1c393688.tar.zst nixlib-d586f5d97e8d37f43eae2fe5c98598ce1c393688.zip | |
Merge branch 'nix-2.0'
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 06696a41324c..b634969c8ac0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -116,7 +116,7 @@ in rec { nix = nixStable; - nixStable = (common rec { + nix1 = (common rec { name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; @@ -124,6 +124,14 @@ in rec { }; }) // { perl-bindings = nixStable; }; + nixStable = (common rec { + name = "nix-2.0"; + src = fetchurl { + url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14"; + }; + }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; + nixUnstable = (lib.lowPrio (common rec { name = "nix-2.0${suffix}"; suffix = "pre5968_a6c0b773"; |