Merge branch 'nix-2.0'

This commit is contained in:
Vladimír Čunát
2018-03-03 18:10:45 +01:00
31 changed files with 393 additions and 417 deletions

View File

@@ -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";