nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustUnstable.rustc: master-1.11.0 -> master-1.12.0

Browse Source 
Note that tests are failing for this commit.
This commit is contained in:
Moritz Ulrich 2016-07-26 16:20:40 +02:00
parent 755be0e1ce
commit 0f25add68d
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/rust/head.nix
View File

@ -3,13 +3,14 @@
rec {
rustc = callPackage ./rustc.nix {
shortVersion = "master-1.11.0";
shortVersion = "master-1.12.0";
forceBundledLLVM = false;
srcRev = "298730e7032cd55809423773da397cd5c7d827d4";
srcSha = "0hyz5j1z75sjkgsifzgxviv3b1lhgaz8wqwvmq80xx5vd78yd0c1";
patches = [ ./patches/disable-lockfile-check.patch
./patches/use-rustc-1.9.0.patch ]
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
needsCmake = true;
srcRev = "c77f8ce7c3284441a00faed6782d08eb5a78296c";
srcSha = "11y24bm2rj7bzsf86iyx3v286ygxprch4c804qbl1w477mkhcac7";
patches = [
./patches/disable-lockfile-check.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
inherit targets;
inherit targetPatches;
inherit targetToolchains;
@ -17,10 +18,10 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
version = "2016.06.07";
srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28";
srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f";
depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
version = "master-0.13.0";
srcRev = "fb2faf29b26da39bd815b470ca73255dbfe30e42";
srcSha = "1r7wd3hp85mvmm7ivj01k65qcgb6qk1mys9mp48ww9k5cdniwcaj";
depsSha256 = "0lsf99pgl6wnl1lfk0drp5l4agrx7hzgdbps7hy3rprbf41jd6ai";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
};

4
pkgs/top-level/all-packages.nix
View File

@ -5481,7 +5481,9 @@ in
rust = rustStable;
rustStable = callPackage ../development/compilers/rust {};
rustBeta = lowPrio (callPackage ../development/compilers/rust/beta.nix {});
rustUnstable = lowPrio (callPackage ../development/compilers/rust/head.nix {});
rustUnstable = lowPrio (callPackage ../development/compilers/rust/head.nix {
rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
});
cargo = rust.cargo;
rustc = rust.rustc;