summary refs log tree commit diff
path: root/pkgs/development/compilers/rust/cargo.nix
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2017-10-04 17:41:16 +0100
committerzimbatm <zimbatm@zimbatm.com>2017-10-23 00:30:46 +0100
commit7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd (patch)
tree74f4cf8cc3f2b29727ccbda906ae38cf818e9d0c /pkgs/development/compilers/rust/cargo.nix
parente30e2010277da6814c6828b199c778774b3ba00a (diff)
downloadnixlib-7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd.tar
nixlib-7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd.tar.gz
nixlib-7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd.tar.bz2
nixlib-7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd.tar.lz
nixlib-7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd.tar.xz
nixlib-7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd.tar.zst
nixlib-7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd.zip
rust: 1.17.0 -> 1.20.0
simplify the boostrap hashes a bit

build with bundled llvm:

the rust project has forked the llvm compiler to solve some
issues.
With pkgs.llvm the test suite fails.

See https://github.com/rust-lang/rust/pull/43026

And PR #30088
Diffstat (limited to 'pkgs/development/compilers/rust/cargo.nix')
-rw-r--r--pkgs/development/compilers/rust/cargo.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 97977ba3ed3a..2df843faf934 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib
 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
-, version, srcRev, srcSha, depsSha256
+, version, srcSha, depsSha256
 , patches ? []}:
 
 rustPlatform.buildRustPackage rec {
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo";
-    rev = srcRev;
+    rev = version;
     sha256 = srcSha;
   };