diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-08 16:35:34 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-11-14 00:08:48 +0000 |
| commit | fd17139b805a6eac0676d92f2655176724c119df (patch) | |
| tree | 7068197d22337fab1cef1d4e1266f3f014729c37 | |
| parent | 679a57d577ea3c5a254ef6858e63e310b43c069f (diff) | |
| download | nixpkgs-fd17139b805a6eac0676d92f2655176724c119df.tar nixpkgs-fd17139b805a6eac0676d92f2655176724c119df.tar.gz nixpkgs-fd17139b805a6eac0676d92f2655176724c119df.tar.bz2 nixpkgs-fd17139b805a6eac0676d92f2655176724c119df.tar.lz nixpkgs-fd17139b805a6eac0676d92f2655176724c119df.tar.xz nixpkgs-fd17139b805a6eac0676d92f2655176724c119df.tar.zst nixpkgs-fd17139b805a6eac0676d92f2655176724c119df.zip | |
elfutils: 0.185 -> 0.186
Dropped one upstreamed patch.
| -rw-r--r-- | pkgs/development/tools/misc/elfutils/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch | 15 |
2 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index c89dd583299..adee94dafa9 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -7,16 +7,15 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.185"; + version = "0.186"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-3I0+dKsglGXn9Wjhs7uaWhQvhlbitX0QBJpz2irmtaY="; + sha256 = "sha256-f2+5FJsWc9ONkXig0+D7ih7E9TqfTC/4lGlgmHlkEXc="; }; patches = [ ./debug-info-from-env.patch - ./musl-cdefs_h.patch (fetchpatch { name = "fix-aarch64_fregs.patch"; url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; diff --git a/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch b/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch deleted file mode 100644 index 1b5bf466217..00000000000 --- a/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -# avoids a warning about including an internal header when -# compiling with musl-libc -diff -crb --new-file a/lib/fixedsizehash.h b/lib/fixedsizehash.h -*** a/lib/fixedsizehash.h 2020-06-11 11:37:46.000000000 -0400 ---- b/lib/fixedsizehash.h 2021-01-21 05:52:59.000000000 -0500 -*************** -*** 30,36 **** - #include <errno.h> - #include <stdlib.h> - #include <string.h> -- #include <sys/cdefs.h> - - #include <system.h> - ---- 30,35 ---- |