rust: Updates & rename `rustUnstable` to `rustNighly`.

7 files changed, 65 insertions, 21 deletions

diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix
index db19391575f..a4e55f970eb 100644
--- a/pkgs/development/compilers/rust/beta.nix
+++ b/pkgs/development/compilers/rust/beta.nix
@@ -3,13 +3,13 @@
 
 rec {
   rustc = callPackage ./rustc.nix {
-    shortVersion = "beta-2016-08-17";
+    shortVersion = "beta-2016-11-16";
     forceBundledLLVM = false;
     configureFlags = [ "--release-channel=beta" ];
-    srcRev = "822166b842e4d0b32fafc8b077fb927ec281253d";
-    srcSha = "1zkv7hyjvcj7kvbngf309skgllk6rd7727a6hkvhd3hg8jlz0d00";
+    srcRev = "e627a2e6edbc7b7fd205de8ca7c86cff76655f4d";
+    srcSha = "14sbhn6dp6rri1rpkspjlmy359zicwmyppdak52xj1kqhcjn71wa";
     patches = [
-      ./patches/disable-lockfile-check.patch
+      ./patches/disable-lockfile-check-beta.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
     inherit targets;
     inherit targetPatches;
@@ -18,10 +18,10 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "beta-2016-07-25";
-    srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
-    srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
-    depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
+    version = "0.14.0";
+    srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55";
+    srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s";
+    depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index dd2d47e940d..c090cc07d01 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -15,7 +15,7 @@ rec {
     srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp";
 
     patches = [
-      ./patches/disable-lockfile-check.patch
+      ./patches/disable-lockfile-check-stable.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 
     inherit targets;
diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/nightly.nix
index 2288a360a51..81741105e26 100644
--- a/pkgs/development/compilers/rust/head.nix
+++ b/pkgs/development/compilers/rust/nightly.nix
@@ -3,13 +3,13 @@
 
 rec {
   rustc = callPackage ./rustc.nix {
-    shortVersion = "master-1.13.0";
+    shortVersion = "nightly-2016-11-23";
     forceBundledLLVM = false;
     configureFlags = [ "--release-channel=nightly" ];
-    srcRev = "308824acecf902f2b6a9c1538bde0324804ba68e";
-    srcSha = "17zv1a27a7w6n3a22brriqx5m6i4s3nsj7mlnpliwghlbz8q7384";
+    srcRev = "d5814b03e652043be607f96e24709e06c2b55429";
+    srcSha = "0x2vr1mda0mr8q28h96zfpv0f26dyrg8jwxznlh6gk0y0mprgcbr";
     patches = [
-      ./patches/disable-lockfile-check.patch
+     ./patches/disable-lockfile-check-nightly.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
     inherit targets;
     inherit targetPatches;
@@ -18,10 +18,10 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "master-2016-07-25";
+    version = "nightly-2016-07-25";
     srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
     srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
-    depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
+    depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index eff5db9143f..47d918ddf3e 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -48,12 +48,6 @@ rec {
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/rustc"
       ''}
-
-      # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
-      # (or similar) here. It causes strange effects where rustc loads
-      # the wrong libraries in a bootstrap-build causing failures that
-      # are very hard to track dow. For details, see
-      # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
     '';
   };
 }
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch
new file mode 100644
index 00000000000..a6fe3413fd2
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch
@@ -0,0 +1,25 @@
+From 5702d7cdb2bed7ac3af3c01087b181da35f6e108 Mon Sep 17 00:00:00 2001
+From: joachim schiele <js@lastlog.de>
+Date: Thu, 24 Nov 2016 22:25:48 +0100
+Subject: [PATCH 2/2] asdf
+
+---
+ src/tools/tidy/src/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
+index cabaee5..685df94 100644
+--- a/src/tools/tidy/src/main.rs
++++ b/src/tools/tidy/src/main.rs
+@@ -48,7 +48,7 @@ fn main() {
+     errors::check(&path, &mut bad);
+     cargo::check(&path, &mut bad);
+     features::check(&path, &mut bad);
+-    cargo_lock::check(&path, &mut bad);
++    //cargo_lock::check(&path, &mut bad);
+     pal::check(&path, &mut bad);
+ 
+     if bad {
+-- 
+2.10.0
+
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch
new file mode 100644
index 00000000000..c89d22dcb1e
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch
@@ -0,0 +1,25 @@
+From ac204f8be95cdb2350a1dd893641e38528aaf01d Mon Sep 17 00:00:00 2001
+From: joachim schiele <js@lastlog.de>
+Date: Fri, 25 Nov 2016 02:17:02 +0100
+Subject: [PATCH] asdf
+
+---
+ src/tools/tidy/src/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
+index cb11fe2..c9b7d2a 100644
+--- a/src/tools/tidy/src/main.rs
++++ b/src/tools/tidy/src/main.rs
+@@ -45,7 +45,7 @@ fn main() {
+     bins::check(&path, &mut bad);
+     style::check(&path, &mut bad);
+     errors::check(&path, &mut bad);
+-    cargo::check(&path, &mut bad);
++    //cargo::check(&path, &mut bad);
+     features::check(&path, &mut bad);
+     pal::check(&path, &mut bad);
+ 
+-- 
+2.10.0
+
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
index 0c01cb1a7f1..0c01cb1a7f1 100644
--- a/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch
+++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch