lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

rustup: 1.11.0 -> 1.13.0

+17 -18
+10 -13
pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
··· 4 4 Subject: [PATCH] nix customization: patchelf installed binaries 5 5 6 6 --- 7 - src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++- 8 - 1 file changed, 23 insertions(+), 1 deletion(-) 7 + src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++- 8 + 1 file changed, 20 insertions(+), 1 deletion(-) 9 9 10 10 diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs 11 - index 8aa63db9..4d219826 100644 11 + index 70c54dcd..f0318986 100644 12 12 --- a/src/rustup-dist/src/component/package.rs 13 13 +++ b/src/rustup-dist/src/component/package.rs 14 - @@ -99,7 +99,13 @@ impl Package for DirectoryPackage { 14 + @@ -100,7 +100,10 @@ impl Package for DirectoryPackage { 15 15 let src_path = root.join(&path); 16 16 17 17 match &*part.0 { 18 - - "file" => try!(builder.copy_file(path.clone(), &src_path)), 18 + - "file" => builder.copy_file(path.clone(), &src_path)?, 19 19 + "file" => { 20 - + try!(builder.copy_file(path.clone(), &src_path)); 21 - + nix_patchelf_if_needed( 22 - + &target.prefix().path().join(path.clone()), 23 - + &src_path, 24 - + ) 20 + + builder.copy_file(path.clone(), &src_path)?; 21 + + nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path) 25 22 + } 26 - "dir" => try!(builder.copy_dir(path.clone(), &src_path)), 23 + "dir" => builder.copy_dir(path.clone(), &src_path)?, 27 24 _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()), 28 25 } 29 - @@ -117,6 +123,22 @@ impl Package for DirectoryPackage { 26 + @@ -118,6 +121,22 @@ impl Package for DirectoryPackage { 30 27 } 31 28 } 32 29 ··· 50 47 // binaries are executable and directories readable. This shouldn't be 51 48 // necessary: the source files *should* have the right permissions, 52 49 -- 53 - 2.14.1 50 + 2.17.1 54 51
+7 -5
pkgs/development/tools/rust/rustup/default.nix
··· 4 4 5 5 rustPlatform.buildRustPackage rec { 6 6 name = "rustup-${version}"; 7 - version = "1.11.0"; 8 - 9 - cargoSha256 = "1r9mnj3x9sn16hi1r09gl5q0cnsa2g6kbjw2g115858i2a9k6hkr"; 7 + version = "1.13.0"; 10 8 11 9 src = fetchFromGitHub { 12 10 owner = "rust-lang-nursery"; 13 11 repo = "rustup.rs"; 14 12 rev = version; 15 - sha256 = "05rbgkz4fk6c1x6bpmpx108bg2qcrf6vv3yfz378s7bmr3l319iz"; 13 + sha256 = "1h0786jx64nc9q8x6fv7a5sf1xijxhn02m2pq5v2grl9ks0vxidn"; 16 14 }; 15 + 16 + cargoSha256 = "09lbm2k189sri3vwcwzv7j07ah39c8ajbpkg0kzvjsjwr7ypli8a"; 17 17 18 18 nativeBuildInputs = [ pkgconfig ]; 19 19 ··· 32 32 '') 33 33 ]; 34 34 35 + doCheck = !stdenv.isAarch64; 36 + 35 37 postInstall = '' 36 38 pushd $out/bin 37 39 mv rustup-init rustup 38 - for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt; do 40 + for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt cargo-clippy; do 39 41 ln -s rustup $link 40 42 done 41 43 popd