Merge pull request #48306 from NixOS/staging-next

Merge staging-next into master
This commit is contained in:
Frederik Rietdijk
2018-10-18 11:23:04 +02:00
committed by GitHub
22 changed files with 65 additions and 298 deletions

View File

@@ -6,11 +6,11 @@
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
version = "1.29.0";
cargoVersion = "1.29.0";
version = "1.29.1";
cargoVersion = "1.29.1";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4";
sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i";
};
in rec {
rustc = callPackage ./rustc.nix {