From f67b36bad67f1cf683a61cf6ac98e12d3b5a6532 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 Jan 2024 18:22:40 +0100 Subject: [PATCH] Revert "patchelf_0_13: init at 0.13.1" This reverts commit 3838a0a7e7ef2a3faebb908cbab58d75b513b51c. This was previously used on aarch64-unknown-linux-musl, but now that that platform has an up-to-date bootstrap and can build current patchelf, there's no longer any need to keep this around. --- pkgs/development/tools/misc/patchelf/0.13.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 19 deletions(-) delete mode 100644 pkgs/development/tools/misc/patchelf/0.13.nix 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 dd0eba508daa..000000000000 --- a/pkgs/development/tools/misc/patchelf/0.13.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, patchelf }: - -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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fe240c07b37..2c088ca1ead3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19739,7 +19739,6 @@ with pkgs; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; 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 { });