diff --git a/pkgs/development/tools/misc/patchelf/0.13.nix b/pkgs/development/tools/misc/patchelf/0.13.nix deleted file mode 100644 index 0111a4b065c47..0000000000000 --- a/pkgs/development/tools/misc/patchelf/0.13.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ 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"; - - src = fetchurl { - url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OeiuzNdJXVTfCU0rSnwIAQ/3d3A2+q8k8o4Hd30VmOI="; - }; - - setupHook = [ ./setup-hook.sh ]; - - # fails 8 out of 24 tests, problems when loading libc.so.6 - doCheck = stdenv.name == "stdenv-linux"; - - inherit (patchelf) meta; -} diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c1279a69ccf79..24e25e584d4ba 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -129,10 +129,8 @@ stdenv.mkDerivation rec { # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 - # On aarch64+musl, test-init.sh fails due to a segfault in diff. doCheck = (!isCross) && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") - && !(stdenv.hostPlatform.libc == "musl" && stdenv.hostPlatform.isAarch64) && !stdenv.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 35e0fb5e6b967..040f363fa55d8 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; - doCheck = !(stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl); + doCheck = true; meta = with lib; { homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a859b7e861e15..a5cb9bb7a1865 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 80d38122f626b..7b33db822cb2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19740,14 +19740,7 @@ 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 { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });