From 7bd191df6a861e02d5bf2b36a03f6dc70e3e6bfd Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 4 Oct 2017 17:41:16 +0100 Subject: 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 --- pkgs/development/compilers/rust/cargo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/compilers/rust/cargo.nix') 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; }; -- cgit 1.4.1