Merge gcc-9 into staging (#68029)

This commit is contained in:
Frederik Rietdijk
2019-12-30 16:38:38 +01:00
122 changed files with 831 additions and 1873 deletions

View File

@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
patches = [ ./gcc44.patch ];
NIX_CFLAGS_COMPILE = "-fpermissive";
meta = {
homepage = https://www.gnu.org/software/ddd;
description = "Graphical front-end for command-line debuggers";

View File

@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
libXext libXv libXrandr glib bison libunwind python3 procps
gtk-doc openssl peg ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ];
preConfigure = ''
./autogen.sh
'';

View File

@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
"-Wno-format-truncation"
"-Wno-format-overflow"
"-Wno-error=tautological-compare"
"-Wno-error=array-bounds"
];
postInstall = lib.optionalString stdenv.isLinux ''

View File

@@ -1,21 +1,17 @@
{stdenv, fetchFromGitHub, autoreconfHook, ncurses, libpcap }:
{stdenv, fetchurl, ncurses, libpcap }:
stdenv.mkDerivation rec {
version = "3.5.1";
version = "3.6.0";
pname = "sipp";
src = fetchFromGitHub {
owner = "SIPp";
repo = "sipp";
rev = "v${version}";
sha256 = "179a1fvqyk3jpxbi28l1xfw22cw9vgvxrn19w5f38w74x0jwqg5k";
src = fetchurl {
url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4";
};
patchPhase = ''
postPatch = ''
sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
sed -i -e "s|AC_CHECK_LIB(curses|AC_CHECK_LIB(ncurses|" configure.ac
echo "#define SIPP_VERSION \"v${version}\"" > include/version.h
'';
configureFlags = [
@@ -29,8 +25,6 @@ stdenv.mkDerivation rec {
buildInputs = [ncurses libpcap];
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
homepage = http://sipp.sf.net;
description = "The SIPp testing tool";