From f84fc97618ee022326c7b9778e78372aecb45574 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 Jan 2024 18:21:30 +0100 Subject: [PATCH] Revert "patchelf: use 0.13.x on aarch64+musl" This reverts commit e22d0b49a9553861cdaee9f71b37db4baf2bb992. No longer needed now that we have an up-to-date aarch64-unknown-linux-musl bootstrap. Since the original commit, patchelf_0_14 was renamed to patchelfStable. There's no longer any need for it to have a name other than "patchelf", but I've kept "patchelfStable" around as an alias in case anybody's using it. --- pkgs/development/tools/misc/patchelf/0.13.nix | 5 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 10 ++-------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/0.13.nix b/pkgs/development/tools/misc/patchelf/0.13.nix index 0111a4b065c4..dd0eba508daa 100644 --- a/pkgs/development/tools/misc/patchelf/0.13.nix +++ b/pkgs/development/tools/misc/patchelf/0.13.nix @@ -1,10 +1,5 @@ { stdenv, fetchurl, patchelf }: -# Note: this package is used for bootstrapping fetchurl, and thus -# cannot use fetchpatch! All mutable patches (generated by GitHub or -# cgit) that are needed here should be included directly in Nixpkgs as -# files. - stdenv.mkDerivation rec { pname = "patchelf"; version = "0.13.1"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8acee49ae6ae..796bc920e574 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -795,6 +795,7 @@ mapAliases ({ parity = openethereum; # Added 2020-08-01 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 + patchelfStable = patchelf; # Added 2024-01-25 pcsctools = pcsc-tools; # Added 2023-12-07 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0ca2d741d53..7fe240c07b37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19738,14 +19738,8 @@ with pkgs; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; - patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then - patchelf_0_13 - else - patchelfStable; - patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { - patchelf = patchelfStable; - }; - patchelfStable = callPackage ../development/tools/misc/patchelf { }; + patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });