Skip to content

Commit

Permalink
Revert "patchelf: use 0.13.x on aarch64+musl"
Browse files Browse the repository at this point in the history
This reverts commit e22d0b4.

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.
  • Loading branch information
alyssais committed Jan 25, 2024
1 parent 26a9e8a commit f84fc97
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
5 changes: 0 additions & 5 deletions pkgs/development/tools/misc/patchelf/0.13.nix
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { });

Expand Down

0 comments on commit f84fc97

Please sign in to comment.