diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-08-08 22:20:56 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-08-10 21:16:48 +0200 |
| commit | c8f878436ebc2afe8dddff5467d771acb8f3548e (patch) | |
| tree | 803531c5c9e3cb8954ae2a8c63c92921735495d2 /pkgs | |
| parent | 57a690fbe4fc046b8e7d59d0657d99451b9784e9 (diff) | |
| download | nixpkgs-c8f878436ebc2afe8dddff5467d771acb8f3548e.tar nixpkgs-c8f878436ebc2afe8dddff5467d771acb8f3548e.tar.gz nixpkgs-c8f878436ebc2afe8dddff5467d771acb8f3548e.tar.bz2 nixpkgs-c8f878436ebc2afe8dddff5467d771acb8f3548e.tar.lz nixpkgs-c8f878436ebc2afe8dddff5467d771acb8f3548e.tar.xz nixpkgs-c8f878436ebc2afe8dddff5467d771acb8f3548e.tar.zst nixpkgs-c8f878436ebc2afe8dddff5467d771acb8f3548e.zip | |
rustBeta.cargo: cargo -> 2016-07-25.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/rust/beta.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index f2a02348a3c..130b3311cc5 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -19,10 +19,15 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "beta-0.13.0"; - srcRev = "fb2faf29b26da39bd815b470ca73255dbfe30e42"; - srcSha = "1r7wd3hp85mvmm7ivj01k65qcgb6qk1mys9mp48ww9k5cdniwcaj"; - depsSha256 = "0lsf99pgl6wnl1lfk0drp5l4agrx7hzgdbps7hy3rprbf41jd6ai"; + # TODO: We're temporarily tracking master here as Darwin needs the + # `http.cainfo` option from .cargo/config which isn't released + # yet. + + version = "beta-2016-07-25"; + srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; + srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; + depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc"; + inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; |