mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge pull request #332809 from alyssais/rustup-1.27.1
rustup: 1.26.0 -> 1.27.1
This commit is contained in:
commit
730aa60b27
2 changed files with 7 additions and 2510 deletions
2503
pkgs/development/tools/rust/rustup/Cargo.lock
generated
2503
pkgs/development/tools/rust/rustup/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -23,18 +23,16 @@ in
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustup";
|
||||
version = "1.26.0";
|
||||
version = "1.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rustup";
|
||||
rev = version;
|
||||
sha256 = "sha256-rdhG9MdjWyvoaMGdjgFyCfQaoV48QtAZE7buA5TkDKg=";
|
||||
sha256 = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
cargoHash = "sha256-iQoMPV97V9WJqT+qVtNpQtW5g+Jyl+U2uA+JEoRYTQA=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper pkg-config ];
|
||||
|
||||
|
@ -45,7 +43,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildFeatures = [ "no-self-update" ];
|
||||
|
||||
checkFeatures = [ ];
|
||||
checkFeatures = [ "test" ];
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
(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
|
||||
checkFlags = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue