diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-10-03 16:55:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 16:55:07 +0200 |
| commit | 78adf2c9a5694a0855063e756a845d947858fd3f (patch) | |
| tree | c645c8adecfc767632ebbcc6d2d20c1c6b239017 /pkgs | |
| parent | 2d759f2b0a67908b758473c2213c32a4f396b437 (diff) | |
| parent | 6ad43a0bce3603b25bcadb458d39701616d245f4 (diff) | |
| download | nixlib-78adf2c9a5694a0855063e756a845d947858fd3f.tar nixlib-78adf2c9a5694a0855063e756a845d947858fd3f.tar.gz nixlib-78adf2c9a5694a0855063e756a845d947858fd3f.tar.bz2 nixlib-78adf2c9a5694a0855063e756a845d947858fd3f.tar.lz nixlib-78adf2c9a5694a0855063e756a845d947858fd3f.tar.xz nixlib-78adf2c9a5694a0855063e756a845d947858fd3f.tar.zst nixlib-78adf2c9a5694a0855063e756a845d947858fd3f.zip | |
Merge pull request #47649 from andir/staging-rustc-1.29.1
rustc: 1.29.0 -> 1.29.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 1d5de052f893..ec4514121c24 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -91,8 +91,10 @@ in stdenv.mkDerivation (args // { installPhase = args.installPhase or '' runHook preInstall - mkdir -p $out/bin - find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \; + mkdir -p $out/bin $out/lib + find target/release -maxdepth 1 -type f -executable ! \( -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin + find target/release -maxdepth 1 -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib + rmdir --ignore-fail-on-non-empty $out/lib $out/bin runHook postInstall ''; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 47415ac9177b..7d785093f9b3 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,11 +6,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.29.0"; - cargoVersion = "1.29.0"; + version = "1.29.1"; + cargoVersion = "1.29.1"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4"; + sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i"; }; in rec { rustc = callPackage ./rustc.nix { |