movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #332809 from alyssais/rustup-1.27.1

Browse source 
rustup: 1.26.0 -> 1.27.1
This commit is contained in:
Emily 2024-08-12 19:16:00 +01:00 • committed by GitHub
commit 730aa60b27
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2510 deletions
Download patch file Download diff file Expand all files Collapse all files

2503
pkgs/development/tools/rust/rustup/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

14
pkgs/development/tools/rust/rustup/default.nix
View file

@ -23,18 +23,16 @@ in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rustup"; pname = "rustup";
version = "1.26.0"; version = "1.27.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang"; owner = "rust-lang";
repo = "rustup"; repo = "rustup";
rev = version; rev = version;
sha256 = "sha256-rdhG9MdjWyvoaMGdjgFyCfQaoV48QtAZE7buA5TkDKg="; sha256 = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M=";
}; };
cargoLock = { cargoHash = "sha256-iQoMPV97V9WJqT+qVtNpQtW5g+Jyl+U2uA+JEoRYTQA=";
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; nativeBuildInputs = [ makeBinaryWrapper pkg-config ];
@ -45,7 +43,7 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "no-self-update" ]; buildFeatures = [ "no-self-update" ];
checkFeatures = [ ]; checkFeatures = [ "test" ];
patches = lib.optionals stdenv.isLinux [ patches = lib.optionals stdenv.isLinux [
(runCommand "0001-dynamically-patchelf-binaries.patch" (runCommand "0001-dynamically-patchelf-binaries.patch"
@ -62,7 +60,9 @@ rustPlatform.buildRustPackage rec {
'') '')
]; ];
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; # Random tests fail nondeterministically on macOS.
# TODO: Investigate this.
doCheck = !stdenv.isDarwin;
# skip failing tests # skip failing tests
checkFlags = [ checkFlags = [