diff options
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r-- | pkgs/development/compilers/rust/bootstrap.nix | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 4 |
3 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 454b67b8151b..b912a9d7933c 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -14,16 +14,16 @@ let then "x86_64-apple-darwin" else abort "missing boostrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.9.0` + # fetch hashes by running `print-hashes.sh 1.12.1` bootstrapHash = if stdenv.system == "i686-linux" - then "f5a3f5d53defe827a71447b1a0e7a656394b87ee23e009d7bf73a0277c1b5ac2" + then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3" else if stdenv.system == "x86_64-linux" - then "f4ebbd6d9494cb8fa6c410cb58954e1913546c2bca8963faebc424591547d83f" + then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c" else if stdenv.system == "i686-darwin" - then "bf07182bc362985fcdd48af905cdb559e20c68518cd71dabec3c30b78ca8a94a" + then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69" else if stdenv.system == "x86_64-darwin" - then "2cdbc47438dc86ecaf35298317b77d735956eb160862e3f6d0fda0da656ecc35" + then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.11.0"; + version = "1.12.1"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7e29435b7d59..dd2d47e940d1 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -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 diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index e1bff12f398e..57480974a3f1 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -93,6 +93,10 @@ stdenv.mkDerivation { # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 rm -vr src/test/run-pass/issue-36023.rs + # Disable test getting stuck on hydra - possible fix: + # https://reviews.llvm.org/rL281650 + rm -vr src/test/run-pass/issue-36474.rs + # Useful debugging parameter # export VERBOSE=1 '' + |