rustcMaster: 2015-12-09 -> 2016-01-10

This commit is contained in:
Nikolay Amiantov 2016-01-10 20:25:07 +03:00
parent 893f376587
commit cdb5f269e2

View File

@ -2,11 +2,11 @@
{ stdenv, callPackage }: { stdenv, callPackage }:
callPackage ./generic.nix { callPackage ./generic.nix {
shortVersion = "2015-12-09"; shortVersion = "2016-01-10";
isRelease = false; isRelease = false;
forceBundledLLVM = true; forceBundledLLVM = false;
srcRev = "462ec0576"; srcRev = "d70ab2bdf16c22b9f3ff0230089b44855e3f1593";
srcSha = "1mci0hxwnqb24j4k68rgffqk8ccznz2iddfmyhi8wxa094hqgghp"; srcSha = "13ssis1bdgg8sdkgrvxcbd1qcfmf7q6bv4akfxrjgdm44l1n1l97";
/* Rust is bootstrapped from an earlier built version. We need /* Rust is bootstrapped from an earlier built version. We need
to fetch these earlier versions, which vary per platform. to fetch these earlier versions, which vary per platform.
@ -15,12 +15,12 @@ callPackage ./generic.nix {
with the set you want at the top. with the set you want at the top.
*/ */
snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216"; snapshotHashLinux686 = "a09c4a4036151d0cb28e265101669731600e01f2";
snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f"; snapshotHashLinux64 = "97e2a5eb8904962df8596e95d6e5d9b574d73bf4";
snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d"; snapshotHashDarwin686 = "ca52d2d3ba6497ed007705ee3401cf7efc136ca1";
snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2"; snapshotHashDarwin64 = "3c44ffa18f89567c2b81f8d695e711c86d81ffc7";
snapshotDate = "2015-08-11"; snapshotDate = "2015-12-18";
snapshotRev = "1af31d4"; snapshotRev = "3391630";
patches = [ ./patches/remove-uneeded-git.patch ] patches = [ ./patches/remove-uneeded-git.patch ]
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;