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

Merge pull request #7511 from Havvy/rustc-1.0.0-beta2

Browse Source 
Rustc 1.0.0 beta2
This commit is contained in:
Georges Dubus 2015-04-22 14:25:26 +02:00
commit d10fb7c7be
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/rustc/1.0.0-beta.nix
View File

@ -1,8 +1,8 @@
{ stdenv, callPackage }: { stdenv, callPackage }:
callPackage ./makeRustcDerivation.nix { callPackage ./makeRustcDerivation.nix {
shortVersion = "1.0.0-beta"; shortVersion = "1.0.0-beta.2";
isRelease = true; isRelease = true;
srcSha = "94248e30487723ac6f6c34a0db5a21085c0b1338e6a32bd12b159e1d2cd80451"; srcSha = "0wcpp6fg7cc75bj5b6dcz5dhgps6xw09n75qiapmd12qxjzj17wn";
snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
@ -12,4 +12,5 @@ callPackage ./makeRustcDerivation.nix {
patches = [ patches = [
./patches/beta.patch ./patches/beta.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
configureFlags = [ "--release-channel=beta" ];
} }

4
pkgs/development/compilers/rustc/makeRustcDerivation.nix
View File

@ -6,6 +6,7 @@
, snapshotHashLinux686, snapshotHashLinux64 , snapshotHashLinux686, snapshotHashLinux64
, snapshotHashDarwin686, snapshotHashDarwin64 , snapshotHashDarwin686, snapshotHashDarwin64
, snapshotDate, snapshotRev , snapshotDate, snapshotRev
, configureFlags ? []
, patches , patches
}: }:
@ -113,7 +114,8 @@ stdenv.mkDerivation {
'' else ""); '' else "");
}; };
configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ] configureFlags = configureFlags
++ [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang"; ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
inherit patches; inherit patches;