From 7fa4b0f2c94156dfcb177ed8fbadc8c8d1162dad Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:55:38 +0200 Subject: [PATCH 1/5] rustc: 1.13.0 -> 1.14.0 --- pkgs/development/compilers/rust/bootstrap.nix | 12 ++++++------ pkgs/development/compilers/rust/default.nix | 14 +++++++------- .../patches/disable-lockfile-check-stable.patch | 3 ++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index b912a9d7933c..93deee01e56e 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -14,16 +14,16 @@ let then "x86_64-apple-darwin" else abort "missing boostrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.12.1` + # fetch hashes by running `print-hashes.sh 1.13.0` bootstrapHash = if stdenv.system == "i686-linux" - then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3" + then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439" else if stdenv.system == "x86_64-linux" - then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c" + then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d" else if stdenv.system == "i686-darwin" - then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69" + then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023" else if stdenv.system == "x86_64-darwin" - then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011" + then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.12.1"; + version = "1.13.0"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index c090cc07d01f..4d9668da2e33 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,12 +7,12 @@ in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.13"; + shortVersion = "1.14"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f"; - srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; + srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730"; + srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx"; patches = [ ./patches/disable-lockfile-check-stable.patch @@ -25,10 +25,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.14.0"; - srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; - srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; - depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; + version = "0.15.0"; + srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1"; + srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5"; + depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch index 0c01cb1a7f19..c5009b7ba672 100644 --- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch +++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch @@ -11,12 +11,13 @@ diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index 2839bbd..50142ff 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs -@@ -47,7 +47,7 @@ fn main() { +@@ -48,7 +48,7 @@ fn main() { errors::check(&path, &mut bad); cargo::check(&path, &mut bad); features::check(&path, &mut bad); - cargo_lock::check(&path, &mut bad); + //cargo_lock::check(&path, &mut bad); + pal::check(&path, &mut bad); if bad { panic!("some tidy checks failed"); From 31ec0795f6bcad548ae6b73097ce1d045400bd78 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:56:19 +0200 Subject: [PATCH 2/5] cargo: 0.14 -> 0.15 --- pkgs/development/compilers/rust/cargo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 537764ebca2b..2b544d754d79 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG=1; configurePhase = '' - ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo + ./configure --enable-optimize --prefix=$out ''; buildPhase = "make"; @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { cargo test ''; - # Disable check phase as there are failures (author_prefers_cargo test fails) + # Disable check phase as there are failures (4 tests fail) doCheck = false; meta = with stdenv.lib; { From 38793dd995c7ab0b9b82b19f67bf930ad2a85e88 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:57:03 +0200 Subject: [PATCH 3/5] rustRegistry: 2016-12-16 -> 2016-12-28 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 29fbac38bd0e..14ef3cfef437 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-12-16"; - rev = "1da5a7d0cd31d72324481760067bde5cf2e07be5"; - sha256 = "0kbh3aq738sqns8w6yfia17fwrk98g6m763wqsqwhnrg2ndqrp8d"; + version = "2016-12-28"; + rev = "3399254d4a021d07736944b339a8794eddcda517"; + sha256 = "1vbixbgzv21anqayz8ya0x1qlzndb7fpdf9dyh4yyscl1kaibvg9"; src = fetchFromGitHub { inherit rev; From cfbbac7cb407cba2082e19581efa034034d26381 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:57:22 +0200 Subject: [PATCH 4/5] cfdyndns: mark as broken --- pkgs/applications/networking/dyndns/cfdyndns/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index d3be9c28df35..a79404e77c85 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -27,5 +27,6 @@ buildRustPackage rec { license = stdenv.lib.licenses.mit; maintainers = with maintainers; [ colemickens ]; platforms = with platforms; linux; + broken = true; }; } From d27a6588467fc80ca5ef7970509448f56bf83b16 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Thu, 29 Dec 2016 09:57:39 +0200 Subject: [PATCH 5/5] pijul: mark as broken --- pkgs/applications/version-management/pijul/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 4f1f28a7aac7..04a91a6b4a44 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -33,5 +33,6 @@ buildRustPackage rec { license = licenses.gpl3; platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb maintainers = with maintainers; [ puffnfresh ]; + broken = true; }; }