diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 2e890f2fb76..9d415eed0b4 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,16 +1,16 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2015-07-01"; + shortVersion = "2015-07-28"; isRelease = false; - # src rev for master on 2015-07-01 - srcRev = "bf3c979ec"; - srcSha = "1xp2fjffz5bwxfs37w80bdhy9lv091ps7xbnsvxid2i91rbxfrkk"; - snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b"; - snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c"; - snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f"; - snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae"; - snapshotDate = "2015-05-24"; - snapshotRev = "ba0e1cd"; + # src rev for 2015-07-28's nightly channel + srcRev = "8b835572b"; + srcSha = "1qrw0vszr1zipsbp7gcm8kik73d2bfxwv6mniv81ygn9i7v76wfz"; + snapshotHashLinux686 = "93f6216a35d3bed3cedf244c9aff4cd716336bd9"; + snapshotHashLinux64 = "d8f4967fc71a153c925faecf95a7feadf7e463a4"; + snapshotHashDarwin686 = "29852c4d4b5a851f16d627856a279cae5bf9bd01"; + snapshotHashDarwin64 = "1a20259899321062a0325edb1d22990f05d18708"; + snapshotDate = "2015-07-17"; + snapshotRev = "d4432b3"; patches = [ ./patches/head.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch index d7bede68682..ace22c825f9 100644 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ b/pkgs/development/compilers/rustc/patches/head.patch @@ -1,11 +1,11 @@ diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs -index a42f861..bda4bde 100644 +index 39e4291..b352bd1 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs -@@ -172,8 +172,8 @@ impl Default for TargetOptions { - /// incomplete, and if used for compilation, will certainly not work. +@@ -179,8 +179,8 @@ impl Default for TargetOptions { fn default() -> TargetOptions { TargetOptions { + data_layout: String::new(), - linker: "cc".to_string(), - ar: "ar".to_string(), + linker: "@ccPath@".to_string(), // ignore-tidy-linelength