pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #145782 from trofi/update-elfutils

elfutils: 0.185 -> 0.186

Jörg Thalheim 6dba3177 5a7f6e1f

options
unified split
Changed files
+2 -18
pkgs
development
tools
misc
elfutils
default.nix
musl-cdefs_h.patch
+2 -3
pkgs/development/tools/misc/elfutils/default.nix 
···

       
7

       
 

       
# TODO: Look at the hardcoded paths to kernel, modules etc.


     

       
8

       
 

       
stdenv.mkDerivation rec {


     

       
9

       
 

       
  pname = "elfutils";


     

       
10

       
-

       
  version = "0.185";


     

       
11

       
 

       



     

       
12

       
 

       
  src = fetchurl {


     

       
13

       
 

       
    url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";


     

       
14

       
-

       
    sha256 = "sha256-3I0+dKsglGXn9Wjhs7uaWhQvhlbitX0QBJpz2irmtaY=";


     

       
15

       
 

       
  };


     

       
16

       
 

       



     

       
17

       
 

       
  patches = [


     

       
18

       
 

       
    ./debug-info-from-env.patch


     

       
19

       
-

       
    ./musl-cdefs_h.patch


     

       
20

       
 

       
    (fetchpatch {


     

       
21

       
 

       
      name = "fix-aarch64_fregs.patch";


     

       
22

       
 

       
      url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";


     
···

       
7

       
 

       
# TODO: Look at the hardcoded paths to kernel, modules etc.


     

       
8

       
 

       
stdenv.mkDerivation rec {


     

       
9

       
 

       
  pname = "elfutils";


     

       
10

       
+

       
  version = "0.186";


     

       
11

       
 

       



     

       
12

       
 

       
  src = fetchurl {


     

       
13

       
 

       
    url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";


     

       
14

       
+

       
    sha256 = "sha256-f2+5FJsWc9ONkXig0+D7ih7E9TqfTC/4lGlgmHlkEXc=";


     

       
15

       
 

       
  };


     

       
16

       
 

       



     

       
17

       
 

       
  patches = [


     

       
18

       
 

       
    ./debug-info-from-env.patch


     

       

       

       
     

       
19

       
 

       
    (fetchpatch {


     

       
20

       
 

       
      name = "fix-aarch64_fregs.patch";


     

       
21

       
 

       
      url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
-15
pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch 
···

       
1

       
-

       
# avoids a warning about including an internal header when


     

       
2

       
-

       
# compiling with musl-libc


     

       
3

       
-

       
diff -crb --new-file a/lib/fixedsizehash.h b/lib/fixedsizehash.h


     

       
4

       
-

       
*** a/lib/fixedsizehash.h	2020-06-11 11:37:46.000000000 -0400


     

       
5

       
-

       
--- b/lib/fixedsizehash.h	2021-01-21 05:52:59.000000000 -0500


     

       
6

       
-

       
***************


     

       
7

       
-

       
*** 30,36 ****


     

       
8

       
-

       
  #include <errno.h>


     

       
9

       
-

       
  #include <stdlib.h>


     

       
10

       
-

       
  #include <string.h>


     

       
11

       
-

       
- #include <sys/cdefs.h>


     

       
12

       
-

       
  


     

       
13

       
-

       
  #include <system.h>


     

       
14

       
-

       
  


     

       
15

       
-

       
--- 30,35 ----


     
···