diff options
| author | Tadas Barzdzius <tadas@barzdzius.lt> | 2017-02-03 15:53:09 +0200 |
|---|---|---|
| committer | Tadas Barzdzius <tadas@barzdzius.lt> | 2017-02-03 15:53:09 +0200 |
| commit | c4bb0c7bb4ea71823d013788e70013f1d824a3dc (patch) | |
| tree | aa3069161120119f388b4d65ac0e379bf189bf5b /pkgs/development/compilers/rust/default.nix | |
| parent | 5b759293e09a062373d4b2843c5bad89d5a47165 (diff) | |
| download | nixpkgs-c4bb0c7bb4ea71823d013788e70013f1d824a3dc.tar nixpkgs-c4bb0c7bb4ea71823d013788e70013f1d824a3dc.tar.gz nixpkgs-c4bb0c7bb4ea71823d013788e70013f1d824a3dc.tar.bz2 nixpkgs-c4bb0c7bb4ea71823d013788e70013f1d824a3dc.tar.lz nixpkgs-c4bb0c7bb4ea71823d013788e70013f1d824a3dc.tar.xz nixpkgs-c4bb0c7bb4ea71823d013788e70013f1d824a3dc.tar.zst nixpkgs-c4bb0c7bb4ea71823d013788e70013f1d824a3dc.zip | |
rustc, cargo: 1.14.0 -> 1.15.0, 0.15.0 -> 0.16.0
Diffstat (limited to 'pkgs/development/compilers/rust/default.nix')
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7b8d5a3d1ef..e3314732fa4 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,15 +6,14 @@ let in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.14"; + shortVersion = "1.15"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730"; - srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx"; + srcRev = "10893a9a349cdd423f2490a6984acb5b3b7c8046"; + srcSha = "0861iivb98ir9ixq2qzznfc1b2l9khlwdln5n0gf2mp1fi3w4d4f"; patches = [ - ./patches/disable-lockfile-check-stable.patch ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; @@ -25,10 +24,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.15.0"; - srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1"; - srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5"; - depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h"; + version = "0.16.0"; + srcRev = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420"; + srcSha = "117ivvs9wz848mwf8bw797n10qpn77agd353z8b0hxgbxhpribya"; + depsSha256 = "11s2xpgfhl4mb4wa2nk4mzsypr7m9daxxc7l0vraiz5cr77gk7qq"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo |