pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #21489 from retrry/master

rustc, cargo, rustRegistry updates

authored by Rushmore Mushambi and committed by GitHub b86d256e 9d0a9bc9

+22 -19
unified split
+1
pkgs/applications/networking/dyndns/cfdyndns/default.nix
··· 27 license = stdenv.lib.licenses.mit; 28 maintainers = with maintainers; [ colemickens ]; 29 platforms = with platforms; linux; 30 }; 31 }
··· 27 license = stdenv.lib.licenses.mit; 28 maintainers = with maintainers; [ colemickens ]; 29 platforms = with platforms; linux; 30 + broken = true; 31 }; 32 }
+1
pkgs/applications/version-management/pijul/default.nix
··· 33 license = licenses.gpl3; 34 platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb 35 maintainers = with maintainers; [ puffnfresh ]; 36 }; 37 }
··· 33 license = licenses.gpl3; 34 platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb 35 maintainers = with maintainers; [ puffnfresh ]; 36 + broken = true; 37 }; 38 }
+6 -6
pkgs/development/compilers/rust/bootstrap.nix
··· 14 then "x86_64-apple-darwin" 15 else abort "missing boostrap url for platform ${stdenv.system}"; 16 17 - # fetch hashes by running `print-hashes.sh 1.12.1` 18 bootstrapHash = 19 if stdenv.system == "i686-linux" 20 - then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3" 21 else if stdenv.system == "x86_64-linux" 22 - then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c" 23 else if stdenv.system == "i686-darwin" 24 - then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69" 25 else if stdenv.system == "x86_64-darwin" 26 - then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011" 27 else throw "missing boostrap hash for platform ${stdenv.system}"; 28 29 needsPatchelf = stdenv.isLinux; ··· 33 sha256 = bootstrapHash; 34 }; 35 36 - version = "1.12.1"; 37 in 38 39 rec {
··· 14 then "x86_64-apple-darwin" 15 else abort "missing boostrap url for platform ${stdenv.system}"; 16 17 + # fetch hashes by running `print-hashes.sh 1.13.0` 18 bootstrapHash = 19 if stdenv.system == "i686-linux" 20 + then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439" 21 else if stdenv.system == "x86_64-linux" 22 + then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d" 23 else if stdenv.system == "i686-darwin" 24 + then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023" 25 else if stdenv.system == "x86_64-darwin" 26 + then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe" 27 else throw "missing boostrap hash for platform ${stdenv.system}"; 28 29 needsPatchelf = stdenv.isLinux; ··· 33 sha256 = bootstrapHash; 34 }; 35 36 + version = "1.13.0"; 37 in 38 39 rec {
+2 -2
pkgs/development/compilers/rust/cargo.nix
··· 24 LIBGIT2_SYS_USE_PKG_CONFIG=1; 25 26 configurePhase = '' 27 - ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo 28 ''; 29 30 buildPhase = "make"; ··· 60 cargo test 61 ''; 62 63 - # Disable check phase as there are failures (author_prefers_cargo test fails) 64 doCheck = false; 65 66 meta = with stdenv.lib; {
··· 24 LIBGIT2_SYS_USE_PKG_CONFIG=1; 25 26 configurePhase = '' 27 + ./configure --enable-optimize --prefix=$out 28 ''; 29 30 buildPhase = "make"; ··· 60 cargo test 61 ''; 62 63 + # Disable check phase as there are failures (4 tests fail) 64 doCheck = false; 65 66 meta = with stdenv.lib; {
+7 -7
pkgs/development/compilers/rust/default.nix
··· 7 8 rec { 9 rustc = callPackage ./rustc.nix { 10 - shortVersion = "1.13"; 11 isRelease = true; 12 forceBundledLLVM = false; 13 configureFlags = [ "--release-channel=stable" ]; 14 - srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f"; 15 - srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; 16 17 patches = [ 18 ./patches/disable-lockfile-check-stable.patch ··· 25 }; 26 27 cargo = callPackage ./cargo.nix rec { 28 - version = "0.14.0"; 29 - srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; 30 - srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; 31 - depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; 32 33 inherit rustc; # the rustc that will be wrapped by cargo 34 inherit rustPlatform; # used to build cargo
··· 7 8 rec { 9 rustc = callPackage ./rustc.nix { 10 + shortVersion = "1.14"; 11 isRelease = true; 12 forceBundledLLVM = false; 13 configureFlags = [ "--release-channel=stable" ]; 14 + srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730"; 15 + srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx"; 16 17 patches = [ 18 ./patches/disable-lockfile-check-stable.patch ··· 25 }; 26 27 cargo = callPackage ./cargo.nix rec { 28 + version = "0.15.0"; 29 + srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1"; 30 + srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5"; 31 + depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h"; 32 33 inherit rustc; # the rustc that will be wrapped by cargo 34 inherit rustPlatform; # used to build cargo
+2 -1
pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
··· 11 index 2839bbd..50142ff 100644 12 --- a/src/tools/tidy/src/main.rs 13 +++ b/src/tools/tidy/src/main.rs 14 - @@ -47,7 +47,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 21 if bad { 22 panic!("some tidy checks failed");
··· 11 index 2839bbd..50142ff 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 panic!("some tidy checks failed");
+3 -3
pkgs/top-level/rust-packages.nix
··· 7 { runCommand, fetchFromGitHub, git }: 8 9 let 10 - version = "2016-12-16"; 11 - rev = "1da5a7d0cd31d72324481760067bde5cf2e07be5"; 12 - sha256 = "0kbh3aq738sqns8w6yfia17fwrk98g6m763wqsqwhnrg2ndqrp8d"; 13 14 src = fetchFromGitHub { 15 inherit rev;
··· 7 { runCommand, fetchFromGitHub, git }: 8 9 let 10 + version = "2016-12-28"; 11 + rev = "3399254d4a021d07736944b339a8794eddcda517"; 12 + sha256 = "1vbixbgzv21anqayz8ya0x1qlzndb7fpdf9dyh4yyscl1kaibvg9"; 13 14 src = fetchFromGitHub { 15 inherit rev;