pyrox.dev
Merge pull request #4401 from jagajaga/update_rust
update rust
+1
-2
pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
+1
-2
pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
···
1
1
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
2
-
index 6332485..9500a23 100644
2
+
index 1cc60fc..2e94b99 100644
3
3
--- a/src/librustc/back/link.rs
4
4
+++ b/src/librustc/back/link.rs
5
5
@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
···
35
35
+ None => "@arPath@"
36
36
};
37
37
let mut cmd = Command::new(ar);
38
-
+3
-3
pkgs/development/compilers/rustc/head.nix
+3
-3
pkgs/development/compilers/rustc/head.nix
···
18
18
19
19
*/
20
20
21
-
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-a2e7c4da9"; });
21
+
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-3edcdbb0";});
22
22
23
23
let snapshot = if stdenv.system == "i686-linux"
24
24
then "555aca74f9a268f80cab2df1147dc6406403e9e4"
···
40
40
41
41
src = fetchgit {
42
42
url = https://github.com/rust-lang/rust;
43
-
rev = "a2e7c4da9b331d337fba0b3911c6d3d7f48e8305";
44
-
sha256 = "1lpncqx3lfyjk6llfc7pd1iqxzfhj32hjqvj09zks73r4isc02n4";
43
+
rev = "3edcdbb0c01187a0cc6456ca29cd858579459b18";
44
+
sha256 = "0s125x71r0wi7m142nnynpc6vcwlmq4bh8rbysn9cg3bvj5ddgrm";
45
45
};
46
46
47
47
# We need rust to build rust. If we don't provide it, configure will try to download it.