ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4401 from jagajaga/update_rust

Browse Source 
update rust
This commit is contained in:
Ricardo M. Correia 2014-10-10 18:49:36 +02:00
commit 922b658433
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index 6332485..9500a23 100644
index 1cc60fc..2e94b99 100644
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
@ -35,4 +35,3 @@ index 060dda5..fecf76b 100644
+ None => "@arPath@"
};
let mut cmd = Command::new(ar);

6
pkgs/development/compilers/rustc/head.nix
View File

@ -18,7 +18,7 @@ assert stdenv.gcc.gcc != null;
*/
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-a2e7c4da9"; });
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-3edcdbb0";});
let snapshot = if stdenv.system == "i686-linux"
then "555aca74f9a268f80cab2df1147dc6406403e9e4"
@ -40,8 +40,8 @@ in stdenv.mkDerivation {
src = fetchgit {
url = https://github.com/rust-lang/rust;
rev = "a2e7c4da9b331d337fba0b3911c6d3d7f48e8305";
sha256 = "1lpncqx3lfyjk6llfc7pd1iqxzfhj32hjqvj09zks73r4isc02n4";
rev = "3edcdbb0c01187a0cc6456ca29cd858579459b18";
sha256 = "0s125x71r0wi7m142nnynpc6vcwlmq4bh8rbysn9cg3bvj5ddgrm";
};
# We need rust to build rust. If we don't provide it, configure will try to download it.