From d3db0935606457f15c3f862c52b6dbf63487ba40 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Tue, 21 Apr 2015 20:47:24 +0000
Subject: [PATCH 1/2] rustcBeta: Update to 1.0.0beta.2

---
 pkgs/development/compilers/rustc/1.0.0-beta.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rustc/1.0.0-beta.nix b/pkgs/development/compilers/rustc/1.0.0-beta.nix
index 371f6195cd6..bdbca5bd30b 100644
--- a/pkgs/development/compilers/rustc/1.0.0-beta.nix
+++ b/pkgs/development/compilers/rustc/1.0.0-beta.nix
@@ -1,8 +1,8 @@
 { stdenv, callPackage }:
 callPackage ./makeRustcDerivation.nix {
-  shortVersion = "1.0.0-beta";
+  shortVersion = "1.0.0-beta.2";
   isRelease = true;
-  srcSha = "94248e30487723ac6f6c34a0db5a21085c0b1338e6a32bd12b159e1d2cd80451";
+  srcSha = "0wcpp6fg7cc75bj5b6dcz5dhgps6xw09n75qiapmd12qxjzj17wn";
   snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
   snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
   snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";

From d29ef454f0f29d7221ce603b79c2c40e3462fa09 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Tue, 21 Apr 2015 20:48:29 +0000
Subject: [PATCH 2/2] makeRustcDerivation: Add configurationFlags, rustcBeta:
 Add beta configuration flag

---
 pkgs/development/compilers/rustc/1.0.0-beta.nix          | 1 +
 pkgs/development/compilers/rustc/makeRustcDerivation.nix | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rustc/1.0.0-beta.nix b/pkgs/development/compilers/rustc/1.0.0-beta.nix
index bdbca5bd30b..93359fba9f7 100644
--- a/pkgs/development/compilers/rustc/1.0.0-beta.nix
+++ b/pkgs/development/compilers/rustc/1.0.0-beta.nix
@@ -12,4 +12,5 @@ callPackage ./makeRustcDerivation.nix {
   patches = [
     ./patches/beta.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+  configureFlags = [ "--release-channel=beta" ];
 }
diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
index 913e65de59a..ae3981f1add 100644
--- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix
+++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
@@ -6,6 +6,7 @@
 , snapshotHashLinux686, snapshotHashLinux64
 , snapshotHashDarwin686, snapshotHashDarwin64
 , snapshotDate, snapshotRev
+, configureFlags ? []
 
 , patches
 }:
@@ -113,7 +114,8 @@ stdenv.mkDerivation {
     '' else "");
   };
 
-  configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
+  configureFlags = configureFlags
+                ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
                 ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
 
   inherit patches;