Skip to content

Commit 8806344

Browse files
qknightthe-kenny
qknight
authored and
the-kenny
committedNov 29, 2016
rust: Updates & rename rustUnstable to rustNighly.
1 parent 75f131d commit 8806344

9 files changed

+69
-24
lines changed
 

Diff for: ‎pkgs/development/compilers/rust/beta.nix

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
rec {
55
rustc = callPackage ./rustc.nix {
6-
shortVersion = "beta-2016-08-17";
6+
shortVersion = "beta-2016-11-16";
77
forceBundledLLVM = false;
88
configureFlags = [ "--release-channel=beta" ];
9-
srcRev = "822166b842e4d0b32fafc8b077fb927ec281253d";
10-
srcSha = "1zkv7hyjvcj7kvbngf309skgllk6rd7727a6hkvhd3hg8jlz0d00";
9+
srcRev = "e627a2e6edbc7b7fd205de8ca7c86cff76655f4d";
10+
srcSha = "14sbhn6dp6rri1rpkspjlmy359zicwmyppdak52xj1kqhcjn71wa";
1111
patches = [
12-
./patches/disable-lockfile-check.patch
12+
./patches/disable-lockfile-check-beta.patch
1313
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
1414
inherit targets;
1515
inherit targetPatches;
@@ -18,10 +18,10 @@ rec {
1818
};
1919

2020
cargo = callPackage ./cargo.nix rec {
21-
version = "beta-2016-07-25";
22-
srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
23-
srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
24-
depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
21+
version = "0.14.0";
22+
srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55";
23+
srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s";
24+
depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr";
2525

2626
inherit rustc; # the rustc that will be wrapped by cargo
2727
inherit rustPlatform; # used to build cargo

Diff for: ‎pkgs/development/compilers/rust/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rec {
1515
srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp";
1616

1717
patches = [
18-
./patches/disable-lockfile-check.patch
18+
./patches/disable-lockfile-check-stable.patch
1919
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
2020

2121
inherit targets;

Diff for: ‎pkgs/development/compilers/rust/head.nix renamed to ‎pkgs/development/compilers/rust/nightly.nix

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
rec {
55
rustc = callPackage ./rustc.nix {
6-
shortVersion = "master-1.13.0";
6+
shortVersion = "nightly-2016-11-23";
77
forceBundledLLVM = false;
88
configureFlags = [ "--release-channel=nightly" ];
9-
srcRev = "308824acecf902f2b6a9c1538bde0324804ba68e";
10-
srcSha = "17zv1a27a7w6n3a22brriqx5m6i4s3nsj7mlnpliwghlbz8q7384";
9+
srcRev = "d5814b03e652043be607f96e24709e06c2b55429";
10+
srcSha = "0x2vr1mda0mr8q28h96zfpv0f26dyrg8jwxznlh6gk0y0mprgcbr";
1111
patches = [
12-
./patches/disable-lockfile-check.patch
12+
./patches/disable-lockfile-check-nightly.patch
1313
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
1414
inherit targets;
1515
inherit targetPatches;
@@ -18,10 +18,10 @@ rec {
1818
};
1919

2020
cargo = callPackage ./cargo.nix rec {
21-
version = "master-2016-07-25";
21+
version = "nightly-2016-07-25";
2222
srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
2323
srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
24-
depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
24+
depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc";
2525

2626
inherit rustc; # the rustc that will be wrapped by cargo
2727
inherit rustPlatform; # used to build cargo

Diff for: ‎pkgs/development/compilers/rust/nightlyBin.nix

-6
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ rec {
4848
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
4949
"$out/bin/rustc"
5050
''}
51-
52-
# Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
53-
# (or similar) here. It causes strange effects where rustc loads
54-
# the wrong libraries in a bootstrap-build causing failures that
55-
# are very hard to track dow. For details, see
56-
# https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
5751
'';
5852
};
5953
}

Diff for: ‎pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 5702d7cdb2bed7ac3af3c01087b181da35f6e108 Mon Sep 17 00:00:00 2001
2+
From: joachim schiele <js@lastlog.de>
3+
Date: Thu, 24 Nov 2016 22:25:48 +0100
4+
Subject: [PATCH 2/2] asdf
5+
6+
---
7+
src/tools/tidy/src/main.rs | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
11+
index cabaee5..685df94 100644
12+
--- a/src/tools/tidy/src/main.rs
13+
+++ b/src/tools/tidy/src/main.rs
14+
@@ -48,7 +48,7 @@ fn main() {
15+
errors::check(&path, &mut bad);
16+
cargo::check(&path, &mut bad);
17+
features::check(&path, &mut bad);
18+
- cargo_lock::check(&path, &mut bad);
19+
+ //cargo_lock::check(&path, &mut bad);
20+
pal::check(&path, &mut bad);
21+
22+
if bad {
23+
--
24+
2.10.0
25+

Diff for: ‎pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From ac204f8be95cdb2350a1dd893641e38528aaf01d Mon Sep 17 00:00:00 2001
2+
From: joachim schiele <js@lastlog.de>
3+
Date: Fri, 25 Nov 2016 02:17:02 +0100
4+
Subject: [PATCH] asdf
5+
6+
---
7+
src/tools/tidy/src/main.rs | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
11+
index cb11fe2..c9b7d2a 100644
12+
--- a/src/tools/tidy/src/main.rs
13+
+++ b/src/tools/tidy/src/main.rs
14+
@@ -45,7 +45,7 @@ fn main() {
15+
bins::check(&path, &mut bad);
16+
style::check(&path, &mut bad);
17+
errors::check(&path, &mut bad);
18+
- cargo::check(&path, &mut bad);
19+
+ //cargo::check(&path, &mut bad);
20+
features::check(&path, &mut bad);
21+
pal::check(&path, &mut bad);
22+
23+
--
24+
2.10.0
25+

Diff for: ‎pkgs/top-level/aliases.nix

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ doNotDisplayTwice rec {
9191
rekonqWrapper = rekonq; # added 2015-01
9292
rssglx = rss-glx; #added 2015-03-25
9393
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
94+
rustUnstable = rustNightly; # added 2016-11-29
9495
rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
9596
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
9697
saneBackends = sane-backends; # added 2016-01-02

Diff for: ‎pkgs/top-level/all-packages.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -5217,16 +5217,16 @@ in
52175217
};
52185218

52195219
rust = rustStable;
5220-
rustcNightlyBin = lowPrio(callPackage ../development/compilers/rust/nightlyBin.nix {});
5221-
rustcNightlyBin-2016-11-26 = rustcNightlyBin;
5220+
rustcNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {});
52225221
rustStable = callPackage ../development/compilers/rust {};
52235222
rustBeta = callPackage ../development/compilers/rust/beta.nix {};
5224-
rustUnstable = callPackage ../development/compilers/rust/head.nix {
5223+
rustNightly = callPackage ../development/compilers/rust/nightly.nix {
52255224
rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
52265225
};
52275226

52285227
cargo = rust.cargo;
52295228
rustc = rust.rustc;
5229+
52305230
rustPlatform = recurseIntoAttrs (makeRustPlatform rust);
52315231

52325232
makeRustPlatform = rust: lib.fix (self:

0 commit comments

Comments
 (0)
Please sign in to comment.