From 8f763d0539b1f39c6cf3e86f54b2661edeb74ea9 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 1 Aug 2014 04:37:07 +0200
Subject: [PATCH] rustc: rename rust to rustc, but keep rust attr name for
 backwards compat

---
 pkgs/development/compilers/{rust => rustc}/0.11.nix        | 0
 pkgs/development/compilers/{rust => rustc}/common.nix      | 2 +-
 .../compilers/{rust => rustc}/hardcode_paths.patch         | 0
 pkgs/development/compilers/{rust => rustc}/head.nix        | 0
 .../compilers/{rust => rustc}/local_stage0.patch           | 0
 pkgs/top-level/all-packages.nix                            | 7 +++++--
 6 files changed, 6 insertions(+), 3 deletions(-)
 rename pkgs/development/compilers/{rust => rustc}/0.11.nix (100%)
 rename pkgs/development/compilers/{rust => rustc}/common.nix (97%)
 rename pkgs/development/compilers/{rust => rustc}/hardcode_paths.patch (100%)
 rename pkgs/development/compilers/{rust => rustc}/head.nix (100%)
 rename pkgs/development/compilers/{rust => rustc}/local_stage0.patch (100%)

diff --git a/pkgs/development/compilers/rust/0.11.nix b/pkgs/development/compilers/rustc/0.11.nix
similarity index 100%
rename from pkgs/development/compilers/rust/0.11.nix
rename to pkgs/development/compilers/rustc/0.11.nix
diff --git a/pkgs/development/compilers/rust/common.nix b/pkgs/development/compilers/rustc/common.nix
similarity index 97%
rename from pkgs/development/compilers/rust/common.nix
rename to pkgs/development/compilers/rustc/common.nix
index b190b937dda..7af19a40c79 100644
--- a/pkgs/development/compilers/rust/common.nix
+++ b/pkgs/development/compilers/rustc/common.nix
@@ -32,5 +32,5 @@
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
 
-  name = "rust-${version}";
+  name = "rustc-${version}";
 }
diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch
similarity index 100%
rename from pkgs/development/compilers/rust/hardcode_paths.patch
rename to pkgs/development/compilers/rustc/hardcode_paths.patch
diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rustc/head.nix
similarity index 100%
rename from pkgs/development/compilers/rust/head.nix
rename to pkgs/development/compilers/rustc/head.nix
diff --git a/pkgs/development/compilers/rust/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch
similarity index 100%
rename from pkgs/development/compilers/rust/local_stage0.patch
rename to pkgs/development/compilers/rustc/local_stage0.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a250815843..20cb2cd1cfb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3289,8 +3289,11 @@ let
 
   roadsend = callPackage ../development/compilers/roadsend { };
 
-  rust       = callPackage ../development/compilers/rust/0.11.nix {};
-  rustMaster = callPackage ../development/compilers/rust/head.nix {};
+  rustc       = callPackage ../development/compilers/rustc/0.11.nix {};
+  rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
+
+  rust = rustc;
+
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {