about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorGeorges Dubus <georges.dubus@gmail.com>2015-03-02 21:38:29 +0100
committerGeorges Dubus <georges.dubus@gmail.com>2015-03-02 21:38:29 +0100
commit9e59c9ad849a6f58cf4bed5b7683eb0e33eb9fc8 (patch)
treebecaf7d693eab10e15ccc3c259ecd50a990a804f /pkgs/top-level
parent229d65f3f3a24bc9c49de510381095d2c7469616 (diff)
parent5821e91bd1270dcab53337e5bc1c6ad4c79e0f23 (diff)
downloadnixlib-9e59c9ad849a6f58cf4bed5b7683eb0e33eb9fc8.tar
nixlib-9e59c9ad849a6f58cf4bed5b7683eb0e33eb9fc8.tar.gz
nixlib-9e59c9ad849a6f58cf4bed5b7683eb0e33eb9fc8.tar.bz2
nixlib-9e59c9ad849a6f58cf4bed5b7683eb0e33eb9fc8.tar.lz
nixlib-9e59c9ad849a6f58cf4bed5b7683eb0e33eb9fc8.tar.xz
nixlib-9e59c9ad849a6f58cf4bed5b7683eb0e33eb9fc8.tar.zst
nixlib-9e59c9ad849a6f58cf4bed5b7683eb0e33eb9fc8.zip
Merge pull request #6623 from woehr/master
Upgrade Rust compiler
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f64a37cb696..fba5857cfb4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4149,8 +4149,10 @@ let
     ocaml = ocaml_3_08_0;
   };
 
-  rustc       = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {};
+  rustcAlpha  = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {};
+  rustcAlpha2 = callPackage ../development/compilers/rustc/1.0.0-alpha2.nix {};
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
+  rustc = rustcAlpha2;
 
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};