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

rustBeta.rustc: beta-1.10.10 -> 1.11.0, rustBeta.cargo: 0.10.0 -> 0.12.0.

Browse Source
This commit is contained in:
Moritz Ulrich 2016-07-19 10:25:35 +02:00
parent 26d25774fa
commit 4115e94c87
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/compilers/rust/beta.nix
View File

@ -3,13 +3,15 @@
rec { rec {
rustc = callPackage ./rustc.nix { rustc = callPackage ./rustc.nix {
shortVersion = "beta-1.10.0"; shortVersion = "beta-1.11.0";
forceBundledLLVM = false; forceBundledLLVM = false;
needsCmake = true;
configureFlags = [ "--release-channel=beta" ]; configureFlags = [ "--release-channel=beta" ];
srcRev = "d18e321abeecc69e4d1bf9cafba4fba53ddf267d"; srcRev = "9333c420da0da6291740c313d5af3d620b55b8bc";
srcSha = "1ck8mbjrq0bzq5xzwgaqdilakwm2ab0xpzqibjycds62ad4yw774"; srcSha = "05z6i4s5jjw3c5ypap6kzxk81bg4dib47h51znvsvcvr0svsnkgs";
patches = [ ./patches/disable-lockfile-check.patch ] patches = [
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; ./patches/disable-lockfile-check.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
inherit targets; inherit targets;
inherit targetPatches; inherit targetPatches;
inherit targetToolchains; inherit targetToolchains;
@ -17,10 +19,10 @@ rec {
}; };
cargo = callPackage ./cargo.nix rec { cargo = callPackage ./cargo.nix rec {
version = "0.10.0"; version = "0.12.0";
srcRev = "refs/tags/${version}"; srcRev = "6c27aa6985c18d644cbf6a13d54c8ae36aeaae12";
srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2"; srcSha = "1piq13aigd0yz0ysff450bfg3z56pw0vzzbzzpcppsnnrnh8zdb2";
depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b"; depsSha256 = "1jrwzm9fd15kf2d5zb17q901hx32h711ivcwdpxpmzwq08sjlcvl";
inherit rustc; # the rustc that will be wrapped by cargo inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo inherit rustPlatform; # used to build cargo
}; };

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

@ -1,7 +1,8 @@
{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git , llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git, cmake, curl
, isRelease ? false , isRelease ? false
, needsCmake ? false
, shortVersion , shortVersion
, forceBundledLLVM ? false , forceBundledLLVM ? false
, srcSha, srcRev , srcSha, srcRev
@ -94,8 +95,15 @@ stdenv.mkDerivation {
configureFlagsArray+=("--infodir=$out/share/info") configureFlagsArray+=("--infodir=$out/share/info")
''; '';
# New -beta and -unstable unfortunately need cmake for compiling
# llvm-rt but don't use it for the normal build. This disables cmake
# in Nix.
dontUseCmakeConfigure = needsCmake;
# ps is needed for one of the test cases # ps is needed for one of the test cases
nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ]; nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ]
++ stdenv.lib.optional needsCmake [ cmake curl ];
buildInputs = [ ncurses ] ++ targetToolchains buildInputs = [ ncurses ] ++ targetToolchains
++ stdenv.lib.optional (!forceBundledLLVM) llvmShared; ++ stdenv.lib.optional (!forceBundledLLVM) llvmShared;