From 5bbd07663072bc25a75535afb580e09c42e26864 Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 9 Apr 2025 02:13:35 +0900 Subject: [PATCH] rustup: 1.27.1 -> 1.28.2 https://github.com/rust-lang/rustup/releases/tag/1.28.0 https://github.com/rust-lang/rustup/releases/tag/1.28.1 https://github.com/rust-lang/rustup/releases/tag/1.28.2 Signed-off-by: misilelab --- .../rust/rustup/0001-dynamically-patchelf-binaries.patch | 3 ++- pkgs/development/tools/rust/rustup/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index ecd8eb3837f9..1eb93930d0a5 100644 --- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -10,7 +10,7 @@ index dfccc661..85233f3b 100644 } "dir" => { if self.copy { -@@ -135,6 +136,175 @@ impl Package for DirectoryPackage { +@@ -135,6 +136,176 @@ impl Package for DirectoryPackage { } } @@ -53,6 +53,7 @@ index dfccc661..85233f3b 100644 +fn nix_patchelf_if_needed(dest_path: &Path) { + use std::fs::File; + use std::os::unix::fs::FileExt; ++ use tracing::{debug, warn}; + + struct ELFReader<'a> { + file: &'a mut File, diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 089a4a728c24..fdaa0bd87197 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -27,17 +27,17 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "rustup"; - version = "1.27.1"; + version = "1.28.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; tag = finalAttrs.version; - hash = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M="; + hash = "sha256-iX5hEaQwCW9MuyafjXml8jV3EDnxRNUlOoy3Cur/Iyw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-CQHpsOGofDqsbLLTcznu5a0MSthJgy27HjBk8AYA72s="; + cargoHash = "sha256-KljaAzYHbny7KHOO51MotdmNpHCKWdt6kc/FIpFN6c0="; nativeBuildInputs = [ makeBinaryWrapper