git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21489 from retrry/master

rustc, cargo, rustRegistry updates

commitb86d256e9c91b7d6331818186bb32302f2cb79ff authorRushmore Mushambi <rushmore@webenchanter.com> dateSat 31 Dec 2016, 04:01 (10 years ago) parent9d0a9bcd27a658
7 files changed+22−19
compare with master
unifiedsplit
pkgs/applications/networking/dyndns/cfdyndns/default.nix+1 pkgs/applications/version-management/pijul/default.nix+1 pkgs/development/compilers/rust/bootstrap.nix+6−6 pkgs/development/compilers/rust/cargo.nix+2−2 pkgs/development/compilers/rust/default.nix+7−7 pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch+2−1 pkgs/top-level/rust-packages.nix+3−3
pkgs/applications/networking/dyndns/cfdyndns/default.nix+1
@@ -27,5 +27,6 @@ buildRustPackage rec {
2727 license = stdenv.lib.licenses.mit;
2828 maintainers = with maintainers; [ colemickens ];
2929 platforms = with platforms; linux;
30+ broken = true;
3031 };
3132}
pkgs/applications/version-management/pijul/default.nix+1
@@ -33,5 +33,6 @@ buildRustPackage rec {
3333 license = licenses.gpl3;
3434 platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb
3535 maintainers = with maintainers; [ puffnfresh ];
36+ broken = true;
3637 };
3738}
pkgs/development/compilers/rust/bootstrap.nix+6−6
@@ -14,16 +14,16 @@ let
1414 then "x86_64-apple-darwin"
1515 else abort "missing boostrap url for platform ${stdenv.system}";
1616
17− # fetch hashes by running `print-hashes.sh 1.12.1`
17+ # fetch hashes by running `print-hashes.sh 1.13.0`
1818 bootstrapHash =
1919 if stdenv.system == "i686-linux"
20− then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3"
20+ then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439"
2121 else if stdenv.system == "x86_64-linux"
22− then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c"
22+ then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d"
2323 else if stdenv.system == "i686-darwin"
24− then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69"
24+ then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023"
2525 else if stdenv.system == "x86_64-darwin"
26− then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011"
26+ then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe"
2727 else throw "missing boostrap hash for platform ${stdenv.system}";
2828
2929 needsPatchelf = stdenv.isLinux;
@@ -33,7 +33,7 @@ let
3333 sha256 = bootstrapHash;
3434 };
3535
36− version = "1.12.1";
36+ version = "1.13.0";
3737in
3838
3939rec {
pkgs/development/compilers/rust/cargo.nix+2−2
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
2424 LIBGIT2_SYS_USE_PKG_CONFIG=1;
2525
2626 configurePhase = ''
27− ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo
27+ ./configure --enable-optimize --prefix=$out
2828 '';
2929
3030 buildPhase = "make";
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
6060 cargo test
6161 '';
6262
63− # Disable check phase as there are failures (author_prefers_cargo test fails)
63+ # Disable check phase as there are failures (4 tests fail)
6464 doCheck = false;
6565
6666 meta = with stdenv.lib; {
pkgs/development/compilers/rust/default.nix+7−7
@@ -7,12 +7,12 @@ in
77
88rec {
99 rustc = callPackage ./rustc.nix {
10− shortVersion = "1.13";
10+ shortVersion = "1.14";
1111 isRelease = true;
1212 forceBundledLLVM = false;
1313 configureFlags = [ "--release-channel=stable" ];
14− srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f";
15− srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp";
14+ srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730";
15+ srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx";
1616
1717 patches = [
1818 ./patches/disable-lockfile-check-stable.patch
@@ -25,10 +25,10 @@ rec {
2525 };
2626
2727 cargo = callPackage ./cargo.nix rec {
28− version = "0.14.0";
29− srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55";
30− srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s";
31− depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr";
28+ version = "0.15.0";
29+ srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1";
30+ srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5";
31+ depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h";
3232
3333 inherit rustc; # the rustc that will be wrapped by cargo
3434 inherit rustPlatform; # used to build cargo
pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch+2−1
@@ -11,12 +11,13 @@ diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
1111index 2839bbd..50142ff 100644
1212--- a/src/tools/tidy/src/main.rs
1313+++ b/src/tools/tidy/src/main.rs
14−@@ -47,7 +47,7 @@ fn main() {
14+@@ -48,7 +48,7 @@ fn main() {
1515 errors::check(&path, &mut bad);
1616 cargo::check(&path, &mut bad);
1717 features::check(&path, &mut bad);
1818- cargo_lock::check(&path, &mut bad);
1919+ //cargo_lock::check(&path, &mut bad);
20+ pal::check(&path, &mut bad);
2021
2122 if bad {
2223 panic!("some tidy checks failed");
pkgs/top-level/rust-packages.nix+3−3
@@ -7,9 +7,9 @@
77{ runCommand, fetchFromGitHub, git }:
88
99let
10− version = "2016-12-16";
11− rev = "1da5a7d0cd31d72324481760067bde5cf2e07be5";
12− sha256 = "0kbh3aq738sqns8w6yfia17fwrk98g6m763wqsqwhnrg2ndqrp8d";
10+ version = "2016-12-28";
11+ rev = "3399254d4a021d07736944b339a8794eddcda517";
12+ sha256 = "1vbixbgzv21anqayz8ya0x1qlzndb7fpdf9dyh4yyscl1kaibvg9";
1313
1414 src = fetchFromGitHub {
1515 inherit rev;