JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: 1.11.16 -> 2.0

Browse Source
This commit is contained in:
Eelco Dolstra 2018-02-22 16:40:02 +01:00
parent 847ea13be3
commit 32af695a22
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/installer/tools/nix-fallback-paths.nix
View File

@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/gy4yv67gv3j6in0lalw37j353zdmfcwm-nix-1.11.16";
i686-linux = "/nix/store/ifmyq5ryfxhhrzh62hiq65xyz1fwffga-nix-1.11.16";
aarch64-linux = "/nix/store/y9mfv3sx75mbfibf1zna1kq9v98fk2nb-nix-1.11.16";
x86_64-darwin = "/nix/store/hwpp7kia2f0in5ns2hiw41q38k30jpj2-nix-1.11.16";
x86_64-linux = "/nix/store/6p2gambjac7xdkd2a7w1dsxdk1q5cq4d-nix-2.0";
i686-linux = "/nix/store/zznnaijjk3nwx0cmpczxsvngmqzhl7r4-nix-2.0";
aarch64-linux = "/nix/store/ci96w9kxfkmlc7x2vwqiz4da0r6abxnq-nix-2.0";
x86_64-darwin = "/nix/store/xmi4fylvx4qc79ji9v5q3zfy9vfdy4sv-nix-2.0";
}

14
pkgs/tools/package-management/nix/default.nix
View File

@ -149,13 +149,21 @@ let
in rec {
nix = nixUnstable;
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";
sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c";
sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14";
};
}) // { 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 = nixStable; };

11
pkgs/top-level/all-packages.nix
View File

@ -3950,9 +3950,7 @@ with pkgs;
p7zip = callPackage ../tools/archivers/p7zip { };
packagekit = callPackage ../tools/package-management/packagekit {
nix = nixUnstable;
};
packagekit = callPackage ../tools/package-management/packagekit { };
packetdrill = callPackage ../tools/networking/packetdrill { };
@ -6815,8 +6813,6 @@ with pkgs;
mujs = callPackage ../development/interpreters/mujs { };
nix-exec = callPackage ../development/interpreters/nix-exec {
nix = nixUnstable;
git = gitMinimal;
};
@ -10350,7 +10346,7 @@ with pkgs;
};
libnghttp2 = nghttp2.lib;
nix-plugins = callPackage ../development/libraries/nix-plugins {};
nix-plugins = callPackage ../development/libraries/nix-plugins { };
nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
@ -19852,6 +19848,7 @@ with pkgs;
stateDir = config.nix.stateDir or "/nix/var";
})
nix
nix1
nixStable
nixUnstable;
@ -19861,7 +19858,7 @@ with pkgs;
nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; };
nix-bundle = callPackage ../tools/package-management/nix-bundle { };
nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate;
nix-deploy = haskell.lib.justStaticExecutables haskellPackages.nix-deploy;