cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "patchelf: use 0.13.x on aarch64+musl"

Browse source 
This reverts commit e22d0b49a9.

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.
This commit is contained in:
Alyssa Ross 2024-01-25 18:21:30 +01:00
parent 26a9e8a0c6
commit f84fc97618
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/misc/patchelf/0.13.nix
View file

@ -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";

1
pkgs/top-level/aliases.nix
View file

@ -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

10
pkgs/top-level/all-packages.nix
View file

@ -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 { });