diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix index b75d39b34f57..f1c97c12cdad 100644 --- a/pkgs/by-name/pa/pahole/package.nix +++ b/pkgs/by-name/pa/pahole/package.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.29"; + version = "1.30"; src = fetchzip { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz"; - hash = "sha256-ke7WIIz0ZURw3Pgmt7WNL9WPbcv5B998Rflw/8/JQ8U="; + hash = "sha256-JF4KnI05uOlPuunJuetX/fX3ZRT6TDXdjCNG9/ufkgI="; }; nativeBuildInputs = [ @@ -35,11 +35,6 @@ stdenv.mkDerivation rec { musl-obstack ]; - patches = [ - # https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org - ./threading-reproducibility.patch - ]; - # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/by-name/pa/pahole/threading-reproducibility.patch b/pkgs/by-name/pa/pahole/threading-reproducibility.patch deleted file mode 100644 index 0cc9a6154407..000000000000 --- a/pkgs/by-name/pa/pahole/threading-reproducibility.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/pahole.c -+++ b/pahole.c -@@ -3705,6 +3705,10 @@ int main(int argc, char *argv[]) - goto out; - } - -+ /* This being set means whoever called us tries to do a reproducible build */ -+ if (getenv("SOURCE_DATE_EPOCH")) -+ conf_load.reproducible_build = true; -+ - if (show_running_kernel_vmlinux) { - const char *vmlinux = vmlinux_path__find_running_kernel(); -