diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix index 444b165cb80d..b75d39b34f57 100644 --- a/pkgs/by-name/pa/pahole/package.nix +++ b/pkgs/by-name/pa/pahole/package.nix @@ -10,15 +10,14 @@ argp-standalone, musl-obstack, nixosTests, - fetchpatch, }: stdenv.mkDerivation rec { pname = "pahole"; - version = "1.27"; + version = "1.29"; src = fetchzip { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz"; - hash = "sha256-BwA17lc2yegmOzLfoIu8OmG/PVdc+4sOGzB8Jc4ZjGM="; + hash = "sha256-ke7WIIz0ZURw3Pgmt7WNL9WPbcv5B998Rflw/8/JQ8U="; }; nativeBuildInputs = [ @@ -39,22 +38,11 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org ./threading-reproducibility.patch - # https://github.com/acmel/dwarves/issues/53 - (fetchpatch { - name = "fix-clang-btf-generation-bug.patch"; - url = "https://github.com/acmel/dwarves/commit/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch"; - hash = "sha256-Le1BAew/a/QKkYNLgSQxEvZ9mEEglUw8URwz1kiheeE="; - }) - (fetchpatch { - name = "fix-clang-btf-generation-bug-2.patch"; - url = "https://github.com/acmel/dwarves/commit/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch"; - hash = "sha256-SMIxLEBjBkprAqVNX1h7nXxAsgbwvCD/Bz7c1ekwg5w="; - }) ]; # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ - "-D__LIB=lib" + "-DCMAKE_INSTALL_LIBDIR=lib" "-DLIBBPF_EMBEDDED=OFF" ]; diff --git a/pkgs/by-name/pa/pahole/threading-reproducibility.patch b/pkgs/by-name/pa/pahole/threading-reproducibility.patch index 3c76d9c8521e..0cc9a6154407 100644 --- a/pkgs/by-name/pa/pahole/threading-reproducibility.patch +++ b/pkgs/by-name/pa/pahole/threading-reproducibility.patch @@ -1,5 +1,3 @@ -diff --git a/pahole.c b/pahole.c -index 954498d2ad4f..2b010658330c 100644 --- a/pahole.c +++ b/pahole.c @@ -3705,6 +3705,10 @@ int main(int argc, char *argv[]) @@ -10,6 +8,6 @@ index 954498d2ad4f..2b010658330c 100644 + if (getenv("SOURCE_DATE_EPOCH")) + conf_load.reproducible_build = true; + - if (languages.str && parse_languages()) - return rc; + if (show_running_kernel_vmlinux) { + const char *vmlinux = vmlinux_path__find_running_kernel();