pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #31175 from yrashk/rust-1.21

rust: 1.20.0 -> 1.21.0

authored by

Daiderd Jordan and committed by
GitHub 399a22e9 ccf7310e

+22 -15
unified split
+6 -6
pkgs/development/compilers/rust/bootstrap.nix
··· 3 let 4 # Note: the version MUST be one version prior to the version we're 5 # building 6 - version = "1.19.0"; 7 8 - # fetch hashes by running `print-hashes.sh 1.19.0` 9 hashes = { 10 - i686-unknown-linux-gnu = "657b78f3c1a1b4412e12f7278e20cc318022fa276a58f0d38a0d15b515e39713"; 11 - x86_64-unknown-linux-gnu = "30ff67884464d32f6bbbde4387e7557db98868e87fb2afbb77c9b7716e3bff09"; 12 - i686-apple-darwin = "bdfd2189245dc5764c9f26bdba1429c2bf9d57477d8e6e3f0ba42ea0dc63edeb"; 13 - x86_64-apple-darwin = "5c668fb60a3ba3e97dc2cb8967fc4bb9422b629155284dcb89f94d116bb17820"; 14 }; 15 16 platform =
··· 3 let 4 # Note: the version MUST be one version prior to the version we're 5 # building 6 + version = "1.20.0"; 7 8 + # fetch hashes by running `print-hashes.sh 1.20.0` 9 hashes = { 10 + i686-unknown-linux-gnu = "abe592e06616cdc2fcca56ddbe482050dd49a1fada35e2af031c64fe6eb14668"; 11 + x86_64-unknown-linux-gnu = "ca1cf3aed73ff03d065a7d3e57ecca92228d35dc36d9274a6597441319f18eb8"; 12 + i686-apple-darwin = "b3c2470f8f132d285e6c989681e251592b67071bc9d93cac8a2e6b66f7bdfcb5"; 13 + x86_64-apple-darwin = "fa1fb8896d5e327cbe6deeb50e6e9a3346de629f2e6bcbd8c10f19f3e2ed67d5"; 14 }; 15 16 platform =
+14 -7
pkgs/development/compilers/rust/cargo.nix
··· 1 { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib 2 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin 3 , version, srcSha, cargoSha256 4 - , patches ? []}: 5 6 rustPlatform.buildRustPackage rec { 7 name = "cargo-${version}"; ··· 21 22 nativeBuildInputs = [ pkgconfig ]; 23 buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] 24 - # FIXME: Use impure version of CoreFoundation because of missing symbols. 25 - # CFURLSetResourcePropertyForKey is defined in the headers but there's no 26 - # corresponding implementation in the sources from opensource.apple.com. 27 - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation libiconv ]; 28 29 LIBGIT2_SYS_USE_PKG_CONFIG=1; 30 31 postInstall = '' 32 # NOTE: We override the `http.cainfo` option usually specified in 33 # `.cargo/config`. This is an issue when users want to specify ··· 36 wrapProgram "$out/bin/cargo" \ 37 --suffix PATH : "${rustc}/bin" \ 38 --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ 39 - --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \ 40 - ${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''} 41 ''; 42 43 checkPhase = ''
··· 1 { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib 2 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin 3 , version, srcSha, cargoSha256 4 + , patches ? [] }: 5 + 6 + let 7 + inherit (darwin.apple_sdk.frameworks) CoreFoundation; 8 + in 9 10 rustPlatform.buildRustPackage rec { 11 name = "cargo-${version}"; ··· 25 26 nativeBuildInputs = [ pkgconfig ]; 27 buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] 28 + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; 29 30 LIBGIT2_SYS_USE_PKG_CONFIG=1; 31 32 + # FIXME: Use impure version of CoreFoundation because of missing symbols. 33 + # CFURLSetResourcePropertyForKey is defined in the headers but there's no 34 + # corresponding implementation in the sources from opensource.apple.com. 35 + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' 36 + export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" 37 + ''; 38 + 39 postInstall = '' 40 # NOTE: We override the `http.cainfo` option usually specified in 41 # `.cargo/config`. This is an issue when users want to specify ··· 44 wrapProgram "$out/bin/cargo" \ 45 --suffix PATH : "${rustc}/bin" \ 46 --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ 47 + --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" 48 ''; 49 50 checkPhase = ''
+2 -2
pkgs/development/compilers/rust/default.nix
··· 6 7 let 8 rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); 9 - version = "1.20.0"; 10 in 11 rec { 12 rustc = callPackage ./rustc.nix { ··· 18 19 src = fetchurl { 20 url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; 21 - sha256 = "0542y4rnzlsrricai130mqyxl8r6rd991frb4qsnwb27yigqg91a"; 22 }; 23 24 patches = [
··· 6 7 let 8 rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); 9 + version = "1.21.0"; 10 in 11 rec { 12 rustc = callPackage ./rustc.nix { ··· 18 19 src = fetchurl { 20 url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; 21 + sha256 = "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp"; 22 }; 23 24 patches = [