diff options
| author | Arseniy Seroka <ars.seroka@gmail.com> | 2014-10-10 00:04:18 +0400 |
|---|---|---|
| committer | Arseniy Seroka <ars.seroka@gmail.com> | 2014-10-10 00:04:18 +0400 |
| commit | 762480b334774a7018da988bee7da7bd17c3c66f (patch) | |
| tree | 73d2ecf6e056d5d99b1b94304f2a987bc3449cde /pkgs/development/compilers | |
| parent | e73aefcf931b37c865862c743b7f1113606e9696 (diff) | |
| download | nixlib-762480b334774a7018da988bee7da7bd17c3c66f.tar nixlib-762480b334774a7018da988bee7da7bd17c3c66f.tar.gz nixlib-762480b334774a7018da988bee7da7bd17c3c66f.tar.bz2 nixlib-762480b334774a7018da988bee7da7bd17c3c66f.tar.lz nixlib-762480b334774a7018da988bee7da7bd17c3c66f.tar.xz nixlib-762480b334774a7018da988bee7da7bd17c3c66f.tar.zst nixlib-762480b334774a7018da988bee7da7bd17c3c66f.zip | |
update rustc
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/rustc/head.nix | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch index 21e6576e4e35..8701cd3c9829 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch @@ -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); - diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index f81539fad9a3..27d02a3757d3 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -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. |