From 9ce7ca3096259bd2a36439a2aed588bebb85167d Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Tue, 26 Dec 2023 18:07:03 +0100 Subject: [PATCH 1/2] libdwarf: 0.4.2 -> 0.9.0 Changelog: https://www.prevanders.net/libdwarfdoc/index.html#dwsec_changes Fixes #276728. --- pkgs/development/libraries/libdwarf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 0f96083100c2..87316733874b 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,8 +1,8 @@ { callPackage, zlib }: callPackage ./common.nix rec { - version = "0.4.2"; + version = "0.9.0"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - hash = "sha512-bSo+vwEENi3Zzs7CcpNWhPl32xGYEO6g7siMn1agQvJgpPbtO7q96Fkv4W+Yy9gbSrKHgAUUDgXI9HXfY4DRwg=="; + hash = "sha512-KC2Q38nacE62SkuhFB8q5mD+6xS78acjdzhmmOMSSSi0SmkU2OiOYUGrCINc5yOtCQqFOtV9vLQ527pXJV+1iQ=="; buildInputs = [ zlib ]; knownVulnerabilities = []; } From a9c78d1d0cb9d417498cfd3be005dcbff1f9868b Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Tue, 26 Dec 2023 18:26:01 +0100 Subject: [PATCH 2/2] libdwarf: Enable dumping of zstd compressed sections Otherwise it cannot dump objects created by our linux stdenv: $ echo 'int main() {}' > test.c $ cc -c -g test.c $ ./result-bin/bin/dwarfdump test.o ./result-bin/bin/dwarfdump ERROR: ERROR: Failure reading CU header or DIE, corrupt DWARF: DW_DLE_ZDEBUG_REQUIRES_ZLIB: zlib and zstd are missing, cannot decompress section.. Attempting to continue. --- pkgs/development/libraries/libdwarf/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 87316733874b..006933a4de03 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,8 +1,12 @@ -{ callPackage, zlib }: +{ callPackage +, zlib +, zstd +}: + callPackage ./common.nix rec { version = "0.9.0"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; hash = "sha512-KC2Q38nacE62SkuhFB8q5mD+6xS78acjdzhmmOMSSSi0SmkU2OiOYUGrCINc5yOtCQqFOtV9vLQ527pXJV+1iQ=="; - buildInputs = [ zlib ]; + buildInputs = [ zlib zstd ]; knownVulnerabilities = []; }