diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2015-04-15 13:22:39 +0000 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2015-04-21 19:46:28 +0200 |
| commit | b1b4092ad5d12ee17e934c35fdd84119fce060ad (patch) | |
| tree | a946f125e62ace591dad0ddd968b1ade537d62de /pkgs | |
| parent | 1d8590afe48604fbd6ee56c9526c3a17dfb6b160 (diff) | |
| download | nixlib-b1b4092ad5d12ee17e934c35fdd84119fce060ad.tar nixlib-b1b4092ad5d12ee17e934c35fdd84119fce060ad.tar.gz nixlib-b1b4092ad5d12ee17e934c35fdd84119fce060ad.tar.bz2 nixlib-b1b4092ad5d12ee17e934c35fdd84119fce060ad.tar.lz nixlib-b1b4092ad5d12ee17e934c35fdd84119fce060ad.tar.xz nixlib-b1b4092ad5d12ee17e934c35fdd84119fce060ad.tar.zst nixlib-b1b4092ad5d12ee17e934c35fdd84119fce060ad.zip | |
rustcMaster: Update from 2015-04-13 -> 2015-04-15
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/rustc/head.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/rustc/patches/head.patch | 20 |
2 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 99012ba6d94d..00e87f30e2cd 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,9 +2,9 @@ callPackage ./makeRustcDerivation.nix { shortVersion = "1.0.0-dev"; isRelease = false; - # src rev for master on 2015/04/13 - srcRev = "0cf99c3e06e84d20d68da649c888d63c72f33971"; - srcSha = "0brnzsbxmidjnmvi36sz582k3kw6wk813y2y837zpmyxg9fjah0l"; + # src rev for master on 2015-04-15 + srcRev = "a691f1eefea586f154700be6ee1b991158f82b7f"; + srcSha = "1afypvxahhwhva9rssagm2q08wgidv6xcjrx85lqwzy6abyl1hsz"; snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch index 3cbf8717cd1d..cd2320e84dfe 100644 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ b/pkgs/development/compilers/rustc/patches/head.patch @@ -15,7 +15,7 @@ index ca59b1c..65ee7bf 100755 # do not fail if one of the above fails, as all we need is a working rustc! exit 0 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs -index ed44bf8..2b84627 100644 +index 9f5751c..c98828f 100644 --- a/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs @@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, @@ -28,10 +28,10 @@ index ed44bf8..2b84627 100644 let mut cmd = Command::new(ar); diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs -index 3087a8e..578448f 100644 +index ad77735..1764f71 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs -@@ -352,8 +352,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri +@@ -360,8 +360,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -41,3 +41,17 @@ index 3087a8e..578448f 100644 + None => "@ccPath@".to_string(), } } + +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 8b5e6f8..480ad79 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -97,7 +97,7 @@ impl<S: Strategy> Iterator for Subpaths<S> { + } + + fn _foo() { +- let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/home")).unwrap(); ++ let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/tmp")).unwrap(); + } + + fn main() {} |