JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rustc: 1.21.0 -> 1.22.1

Browse Source 
* removed --enable-clang as it has disappeared
* removed old fixes that have been integrated in upstream
This commit is contained in:
zimbatm 2017-11-23 11:47:03 +00:00 committed by Robin Gloster
parent 6d3ff29d03
commit 8559dd0474
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/rust/bootstrap.nix
View File

@ -3,15 +3,15 @@
let
# Note: the version MUST be one version prior to the version we're
# building
version = "1.20.0";
version = "1.21.0";
# fetch hashes by running `print-hashes.sh 1.20.0`
# fetch hashes by running `print-hashes.sh 1.21.0`
hashes = {
i686-unknown-linux-gnu = "abe592e06616cdc2fcca56ddbe482050dd49a1fada35e2af031c64fe6eb14668";
x86_64-unknown-linux-gnu = "ca1cf3aed73ff03d065a7d3e57ecca92228d35dc36d9274a6597441319f18eb8";
aarch64-unknown-linux-gnu = "eaab3df489d4d8f976c4327d812b9870730eed6d0bbd52712767083d02be7472";
i686-apple-darwin = "b3c2470f8f132d285e6c989681e251592b67071bc9d93cac8a2e6b66f7bdfcb5";
x86_64-apple-darwin = "fa1fb8896d5e327cbe6deeb50e6e9a3346de629f2e6bcbd8c10f19f3e2ed67d5";
i686-unknown-linux-gnu = "b7caed0f602cdb8ef22e0bfa9125a65bec411e15c0b8901d937e43303ec7dbee";
x86_64-unknown-linux-gnu = "b41e70e018402bc04d02fde82f91bea24428e6be432f0df12ac400cfb03108e8";
aarch64-unknown-linux-gnu = "491ee6c43cc672006968d665bd34c94cc2219ef3592d93d38097c97eaaa864c3";
i686-apple-darwin = "c8b0fabeebcde66b683f3a871187e614e07305adda414c2862cb332aecb2b3bf";
x86_64-apple-darwin = "75a7f4bd7c72948030bb9e421df27e8a650dea826fb5b836cf59d23d6f985a0d";
};
platform =

4
pkgs/development/compilers/rust/default.nix
View File

@ -6,7 +6,7 @@
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
version = "1.21.0";
version = "1.22.1";
in
rec {
rustc = callPackage ./rustc.nix {
@ -18,7 +18,7 @@ rec {
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp";
sha256 = "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb";
};
patches = [

7
pkgs/development/compilers/rust/rustc.nix
View File

@ -55,7 +55,6 @@ stdenv.mkDerivation {
# ++ [ "--jemalloc-root=${jemalloc}/lib"
++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" "--default-ar=${targetPackages.stdenv.cc.bintools}/bin/ar" ]
++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ]
++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
++ optional (targets != []) "--target=${target}"
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
@ -122,12 +121,6 @@ stdenv.mkDerivation {
rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ???
'';
preConfigure = ''
# Needed flags as the upstream configure script has a broken prefix substitution
configureFlagsArray+=("--datadir=$out/share")
configureFlagsArray+=("--infodir=$out/share/info")
'';
# rustc unfortunately need cmake for compiling llvm-rt but doesn't
# use it for the normal build. This disables cmake in Nix.
dontUseCmakeConfigure = true;