rustc, cargo: 1.12.1 -> 1.13.0, 0.13.0 -> 0.14.0

This commit is contained in:
Tadas Barzdzius
2016-11-16 13:25:19 +02:00
parent 39297fa36b
commit 0f51eb58ee
2 changed files with 13 additions and 13 deletions
+7 -7
View File
@@ -7,12 +7,12 @@ in
rec {
rustc = callPackage ./rustc.nix {
shortVersion = "1.12.1";
shortVersion = "1.13";
isRelease = true;
forceBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];
srcRev = "d4f39402a0c2c2b94ec0375cd7f7f6d7918113cd";
srcSha = "1lpykjy96rwz4jy28rf7ijca0q9lvckgnbzvcdsrspd5rs2ywfwr";
srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f";
srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp";
patches = [
./patches/disable-lockfile-check.patch
@@ -25,10 +25,10 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
version = "0.13.0";
srcRev = "109cb7c33d426044d141457049bd0fffaca1327c";
srcSha = "0p79m7hpzjh36l4fc6a59h6r8yz6qafjcdg5v1yb7bac9m2wi7vs";
depsSha256 = "1cwp4p8b985fj8j2qmgsi2mpp51rdpwzm9qa60760nrry1fy624z";
version = "0.14.0";
srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55";
srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s";
depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo