From bd4bddc0d75efa5b9ad82e392fc0d66871679af8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 6 Aug 2024 21:46:10 +0200 Subject: [PATCH] rustup: 1.26.0 -> 1.27.1 Required to build with Rust 1.80. Link: https://github.com/rust-lang/rust/issues/127343 --- pkgs/development/tools/rust/rustup/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 81ee5aed5af7..b59d9d08ef23 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -23,16 +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="; }; - cargoHash = "sha256-CRqRSsDNWfVHOgmZGMOD7z44tzEEFqGxHo7z7IExVn8="; + cargoHash = "sha256-iQoMPV97V9WJqT+qVtNpQtW5g+Jyl+U2uA+JEoRYTQA="; nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "no-self-update" ]; - checkFeatures = [ ]; + checkFeatures = [ "test" ]; patches = lib.optionals stdenv.isLinux [ (runCommand "0001-dynamically-patchelf-binaries.patch" @@ -60,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 = [