diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-20 09:59:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-20 09:59:26 +0000 |
commit | f61e8d98ff7fbb049ddeea33742bb4b840dafbfa (patch) | |
tree | ea1215e3a4733ebc74dce764409fae5673ec7e3a /pkgs/development/compilers/rust/default.nix | |
parent | e46553bc72f1044eecbfa6dd7b6ac61231ebd77a (diff) | |
download | nixlib-f61e8d98ff7fbb049ddeea33742bb4b840dafbfa.tar nixlib-f61e8d98ff7fbb049ddeea33742bb4b840dafbfa.tar.gz nixlib-f61e8d98ff7fbb049ddeea33742bb4b840dafbfa.tar.bz2 nixlib-f61e8d98ff7fbb049ddeea33742bb4b840dafbfa.tar.lz nixlib-f61e8d98ff7fbb049ddeea33742bb4b840dafbfa.tar.xz nixlib-f61e8d98ff7fbb049ddeea33742bb4b840dafbfa.tar.zst nixlib-f61e8d98ff7fbb049ddeea33742bb4b840dafbfa.zip |
rust: 1.22.1 -> 1.24.0
Diffstat (limited to 'pkgs/development/compilers/rust/default.nix')
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index b5550a96a835..576e42eb08ab 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,21 +6,20 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.22.1"; -in -rec { + version = "1.24.0"; + cargoVersion = "0.24.0"; + src = fetchurl { + url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; + sha256 = "17v3jpyky8vkkgai5yd2zr8zl87qpgj6dx99gx27x1sf0kv7d0mv"; + }; +in rec { rustc = callPackage ./rustc.nix { - inherit llvm targets targetPatches targetToolchains rustPlatform version; + inherit llvm targets targetPatches targetToolchains rustPlatform version src; forceBundledLLVM = true; configureFlags = [ "--release-channel=stable" ]; - src = fetchurl { - url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb"; - }; - patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch @@ -30,10 +29,8 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.23.0"; - srcSha = "14b2n1msxma19ydchj54hd7f2zdsr524fg133dkmdn7j65f1x6aj"; - cargoSha256 = "1sj59z0w172qvjwg1ma5fr5am9dgw27086xwdnrvlrk4hffcr7y7"; - + version = cargoVersion; + inherit src; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; |