BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rustc: 1.7.0 -> 1.8.0

Browse source
This commit is contained in:
Tadas Barzdzius 2016-04-20 12:39:44 +03:00
parent fe901d1372
commit 9450a6826f
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/compilers/rustc/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, callPackage }:
callPackage ./generic.nix {
shortVersion = "1.7.0";
shortVersion = "1.8.0";
isRelease = true;
forceBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];
srcSha = "05f4v6sfmvkwsv6a7jp9sxsm84s0gdvqyf2wwdi1ilg9k8nxzgd4";
srcSha = "1s03aymmhhrndq29sv9cs8s4p1sg8qvq8ds6lyp6s4ny8nyvdpzy";
/* Rust is bootstrapped from an earlier built version. We need
to fetch these earlier versions, which vary per platform.
@ -15,12 +15,12 @@ callPackage ./generic.nix {
for the tagged release and not a snapshot in the current HEAD.
*/
snapshotHashLinux686 = "a09c4a4036151d0cb28e265101669731600e01f2";
snapshotHashLinux64 = "97e2a5eb8904962df8596e95d6e5d9b574d73bf4";
snapshotHashDarwin686 = "ca52d2d3ba6497ed007705ee3401cf7efc136ca1";
snapshotHashDarwin64 = "3c44ffa18f89567c2b81f8d695e711c86d81ffc7";
snapshotDate = "2015-12-18";
snapshotRev = "3391630";
snapshotHashLinux686 = "5f194aa7628c0703f0fd48adc4ec7f3cc64b98c7";
snapshotHashLinux64 = "d29b7607d13d64078b6324aec82926fb493f59ba";
snapshotHashDarwin686 = "4c8e42dd649e247f3576bf9dfa273327b4907f9c";
snapshotHashDarwin64 = "411a41363f922d1d93fa62ff2fedf5c35e9cccb2";
snapshotDate = "2016-02-17";
snapshotRev = "4d3eebf";
patches = [ ./patches/remove-uneeded-git.patch ]
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

5
pkgs/development/compilers/rustc/generic.nix
View file

@ -62,7 +62,7 @@ let version = if isRelease then
meta = with stdenv.lib; {
homepage = http://www.rust-lang.org/;
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ];
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux ++ platforms.darwin;
};
@ -164,7 +164,8 @@ with stdenv.lib; stdenv.mkDerivation {
buildInputs = [ ncurses ]
++ optional (!forceBundledLLVM) llvmShared;
enableParallelBuilding = false; # missing files during linking, occasionally
# https://github.com/rust-lang/rust/issues/30181
# enableParallelBuilding = false; # missing files during linking, occasionally
outputs = [ "out" "doc" ];
setOutputFlags = false;