diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-24 14:17:49 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-24 14:17:49 +0100 |
commit | 769342b37b6aef3b4d947fd1ebc7cf6c856bf948 (patch) | |
tree | bd7713697b9d39e969409911adaf24d72641a6f5 /pkgs/tools/package-management | |
parent | 9f22de722766c5e164936c1ecfbb602214c9c302 (diff) | |
parent | 9ffaa69da4673c12d730a6a9c2ab0eb1b0dab559 (diff) | |
download | nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.gz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.bz2 nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.lz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.xz nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.tar.zst nixlib-769342b37b6aef3b4d947fd1ebc7cf6c856bf948.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 45f7ab665377..d67aebb52360 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-unstable-1.12${suffix}"; - suffix = "pre5849_74f75c85"; + suffix = "pre5873_b76e282d"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "74f75c855837bce7f48491e9ce8ac03794e5b40d"; - sha256 = "1ch3v8rk1jf7yk9zd10fqgk11q63vjrk3mi2niv495zvkdjh4rf1"; + rev = "b76e282da8824b679368370e43c994e588994a9a"; + sha256 = "11clfc8fh8q8s3k4canmn36xhh3zcl2zd8wwddp4pdvdal16b5n6"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; |