diff options
| author | Dmitry Belyaev <be.dmitry@gmail.com> | 2015-04-12 16:14:51 +1000 |
|---|---|---|
| committer | Dmitry Belyaev <be.dmitry@gmail.com> | 2015-04-13 15:55:39 +1000 |
| commit | 871d11c1768bf99c55c3c19533d86184c33c1758 (patch) | |
| tree | 1987697431b1a304b4e04dac71a322039bb755f2 /pkgs/development/tools | |
| parent | 7a51920367b191dab8dc185f4f9a29fd81440f8e (diff) | |
| download | nixlib-871d11c1768bf99c55c3c19533d86184c33c1758.tar nixlib-871d11c1768bf99c55c3c19533d86184c33c1758.tar.gz nixlib-871d11c1768bf99c55c3c19533d86184c33c1758.tar.bz2 nixlib-871d11c1768bf99c55c3c19533d86184c33c1758.tar.lz nixlib-871d11c1768bf99c55c3c19533d86184c33c1758.tar.xz nixlib-871d11c1768bf99c55c3c19533d86184c33c1758.tar.zst nixlib-871d11c1768bf99c55c3c19533d86184c33c1758.zip | |
Update cargoSnapshot to rustc-1.0.0-beta release
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/cargo/snapshot.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index f20f6d94f6f8..64aeb0736c17 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -2,19 +2,19 @@ /* Cargo binary snapshot */ -let snapshotDate = "2015-02-26"; +let snapshotDate = "2015-04-02"; in with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; }); let snapshotHash = if stdenv.system == "i686-linux" - then "2a28b604d09b4a76a54a05d91f7f158692427b3a" + then "ba6c162680d5509d89ba2363d7cae2047f40c034" else if stdenv.system == "x86_64-linux" - then "7367f4aca86d38e209ef7236b00175df036c03e2" + then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5" else if stdenv.system == "i686-darwin" - then "e5cabb0a4a2b4e47f7b1ae9b802e2b5d0b14eac5" + then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73" else if stdenv.system == "x86_64-darwin" - then "3026c60ddd46d2bcf1cb178fc801095dbfba5286" + then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8" else throw "no snapshot for platform ${stdenv.system}"; snapshotName = "cargo-nightly-${platform}.tar.gz"; in @@ -35,6 +35,10 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out" ./install.sh "--prefix=$out" + rm "$out/lib/rustlib/components" \ + "$out/lib/rustlib/install.log" \ + "$out/lib/rustlib/rust-installer-version" \ + "$out/lib/rustlib/uninstall.sh" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \ |