public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #66528: glibc: 2.27 -> 2.30 (into staging)

Browse Source 
Includes update of stdenv bootstap tools (for three main platforms)
and many package fixes with new glibc.
This commit is contained in:
Vladimír Čunát
2020-02-05 13:41:09 +01:00
parent 15021db2fa 5ca088f1cc
commit 48a997cd76
65 changed files with 436 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/coz/default.nix
View File

@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
sha256 = "0val36yw987b1558iiyk3nqg0yy5k9y5wh49v91zj3cs58mmfyhc";
};
postPatch = ''
sed -i -e '/pid_t gettid/,+2d' libcoz/ccutil/thread.h
'';
postConfigure = ''
# This is currently hard-coded. Will be fixed in the next release.
sed -e "s|/usr/lib/|$out/lib/|" -i ./coz

9
pkgs/development/tools/analysis/eresi/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, which, openssl, readline }:
{ stdenv, lib, fetchFromGitHub, which, openssl, readline, fetchpatch }:
stdenv.mkDerivation rec {
pname = "eresi";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0a5a7mh2zw9lcdrl8n1mqccrc0xcgj7743l7l4kslkh722fxv625";
};
patches = [
(fetchpatch {
url = "https://github.com/thorkill/eresi/commit/a79406344cc21d594d27fa5ec5922abe9f7475e7.patch";
sha256 = "1mjjc6hj7r06iarvai7prcdvjk9g0k5vwrmkwcm7b8ivd5xzxp2z";
})
];
postPatch = ''
# Two occurences of fprintf() with only two arguments, which should really
# be fputs().

8
pkgs/development/tools/analysis/rr/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb, capnproto }:
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }:
stdenv.mkDerivation rec {
version = "5.2.0";
version = "5.3.0";
pname = "rr";
src = fetchFromGitHub {
owner = "mozilla";
repo = "rr";
rev = version;
sha256 = "19jsnm8n2smalx2z60x9d8f6g4kdm7zghwyjfvwcxnslk1vn9dkc";
sha256 = "1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64";
};
postPatch = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto
cmake libpfm zlib python3Packages.python python3Packages.pexpect which procps gdb capnproto
];
propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime
cmakeFlags = [