diff options
author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-08-08 15:55:26 +0200 |
---|---|---|
committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-08-10 21:16:48 +0200 |
commit | 57a690fbe4fc046b8e7d59d0657d99451b9784e9 (patch) | |
tree | 6b57ba6aae399490998301a6ec9ff05e98676673 /pkgs/development/compilers/rust/default.nix | |
parent | 3cfe3ab6b686e3ec633323d8df8b70e782c56cdf (diff) | |
download | nixpkgs-57a690fbe4fc046b8e7d59d0657d99451b9784e9.tar nixpkgs-57a690fbe4fc046b8e7d59d0657d99451b9784e9.tar.gz nixpkgs-57a690fbe4fc046b8e7d59d0657d99451b9784e9.tar.bz2 nixpkgs-57a690fbe4fc046b8e7d59d0657d99451b9784e9.tar.lz nixpkgs-57a690fbe4fc046b8e7d59d0657d99451b9784e9.tar.xz nixpkgs-57a690fbe4fc046b8e7d59d0657d99451b9784e9.tar.zst nixpkgs-57a690fbe4fc046b8e7d59d0657d99451b9784e9.zip |
cargo: Force usage of pkgs.cacert.
Diffstat (limited to 'pkgs/development/compilers/rust/default.nix')
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index adabdd71a1d..bfab4453a34 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -23,10 +23,15 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.11.0"; - srcRev = "refs/tags/${version}"; - srcSha = "0ic2093bmwiw6vl2l9yhip87ni6dbz7dhrizy9wdx61229k16hc4"; - depsSha256 = "0690sgn6fcay7sazlmrbbn4jbhnvmznrpz5z3rvkbaifkjrg4w6d"; + # TODO: We're temporarily tracking master here as Darwin needs the + # `http.cainfo` option from .cargo/config which isn't released + # yet. + + version = "master-2016-07-25"; + srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; + srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; + depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4"; + inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; |