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

Merge gcc-9 into staging (#68029)

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-12-30 16:38:38 +01:00
parent bfa5af85b7 59ab29fe88
commit 6d059becd3
122 changed files with 831 additions and 1873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/audio/trx/default.nix
View File

@@ -1,13 +1,12 @@
{ stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }:
{ stdenv, fetchurl, alsaLib, libopus, ortp, bctoolbox }:
stdenv.mkDerivation {
pname = "trx-unstable";
version = "2018-01-23";
stdenv.mkDerivation rec {
pname = "trx";
version = "0.4";
src = fetchgit {
url = "http://www.pogo.org.uk/~mark/trx.git";
rev = "66b4707a24172751a131e24d2a800496c699137f";
sha256 = "0w0960p25944b30lkc8n4lj14xgsf0fjpmxqwlz2r8wl642bqnfm";
src = fetchurl {
url = "https://www.pogo.org.uk/~mark/trx/releases/${pname}-${version}.tar.gz";
sha256 = "1wsrkbqc090px8i9p8awz38znxjcqjb1dzjjdd8xkjmiprayjhkl";
};
buildInputs = [ alsaLib libopus ortp bctoolbox ];

4
pkgs/tools/filesystems/bees/default.nix
View File

@@ -2,8 +2,8 @@
let
version = "0.6.1";
sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh";
version = "0.6.2";
sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib";
bees = stdenv.mkDerivation {
pname = "bees";

1
pkgs/tools/graphics/appleseed/default.nix
View File

@@ -33,6 +33,7 @@ in stdenv.mkDerivation rec {
"-Wno-error=class-memaccess"
"-Wno-error=maybe-uninitialized"
"-Wno-error=catch-value"
"-Wno-error=stringop-truncation"
];
cmakeFlags = [

6
pkgs/tools/misc/xsel/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation {
pname = "xsel-unstable";
version = "2018-01-10";
version = "2019-08-21";
src = fetchFromGitHub {
owner = "kfish";
repo = "xsel";
rev = "9bfc13d64b5acb92c6648c696a9d9260fcbecc65";
sha256 = "05ms34by5hxznnpvmvhgp6llvlkz0zw4sq6c4bgwr82lj140lscm";
rev = "ef01f3c72a195dbce682184c842b81b17d7d7ad1";
sha256 = "191qa6022b7nww3bicfxpgp4d9x6c8s3sgixi780383ghkxds08c";
};
nativeBuildInputs = [ autoreconfHook ];

2
pkgs/tools/networking/cjdns/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
# for flock
stdenv.lib.optional stdenv.isLinux utillinux;
CFLAGS = "-O2";
CFLAGS = "-O2 -Wno-error=stringop-truncation";
buildPhase =
stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 "
+ "bash do";

2
pkgs/tools/networking/dhcp/default.nix
View File

@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [
"-Wno-error=pointer-compare"
"-Wno-error=format-truncation"
"-Wno-error=stringop-truncation"
"-Wno-error=format-overflow"
];
installFlags = [ "DESTDIR=\${out}" ];

1
pkgs/tools/networking/libreswan/default.nix
View File

@@ -31,6 +31,7 @@ stdenv.mkDerivation {
"-Wno-error=implicit-fallthrough"
"-Wno-error=format-truncation"
"-Wno-error=pointer-compare"
"-Wno-error=stringop-truncation"
];
nativeBuildInputs = [ makeWrapper pkgconfig ];

6
pkgs/tools/networking/packetdrill/default.nix
View File

@@ -11,7 +11,11 @@ stdenv.mkDerivation {
setSourceRoot = ''
export sourceRoot=$(realpath */gtests/net/packetdrill)
'';
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
NIX_CFLAGS_COMPILE = [
"-Wno-error=unused-result"
"-Wno-error=stringop-truncation"
"-Wno-error=address-of-packed-member"
];
nativeBuildInputs = [ bison flex ];
patches = [ ./nix.patch ];
enableParallelBuilding = true;

2
pkgs/tools/networking/snabb/default.nix
View File

@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
patchPhase = ''
patchShebangs .

2
pkgs/tools/security/pbis/default.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
mkdir release
cd release
if [ $CC = gcc ]; then
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow"
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow -Wno-error=address-of-packed-member"
fi
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${stdenv.lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable"
'';

2
pkgs/tools/security/tboot/default.nix
View File

@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" "stackprotector" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
configurePhase = ''
for a in lcptools utils tb_polgen; do
substituteInPlace $a/Makefile --replace /usr/sbin /sbin

2
pkgs/tools/system/clinfo/default.nix
View File

@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ ocl-icd opencl-headers ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; {

10
pkgs/tools/system/efivar/default.nix
View File

@@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch";
sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6";
})
(fetchurl {
name = "fix-misaligned-pointer.patch";
url = "https://github.com/rhboot/efivar/commit/b98ba8921010d03f46704a476c69861515deb1ca.patch";
sha256 = "0ni9mz7y40a2wf1d1q5n9y5dhcbydxvfdhqic7zsmgnaxs3a0p27";
})
(fetchurl {
name = "fix-gcc9-error.patch";
url = "https://github.com/rhboot/efivar/commit/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch";
sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky";
})
];
nativeBuildInputs = [ pkgconfig ];

4
pkgs/tools/system/facter/default.nix
View File

@@ -14,11 +14,13 @@ stdenv.mkDerivation rec {
CXXFLAGS = "-fpermissive -Wno-error=catch-value";
NIX_LDFLAGS = "-lblkid";
cmakeFlags = [
cmakeFlags = [
"-DFACTER_RUBY=${ruby}/lib/libruby.so"
"-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby"
];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy";
nativeBuildInputs = [ cmake ];
buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];

4
pkgs/tools/system/rsyslog/default.nix
View File

@@ -30,8 +30,6 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
++ stdenv.lib.optional stdenv.isLinux systemd;
hardeningDisable = [ "format" ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
@@ -95,9 +93,7 @@ stdenv.mkDerivation rec {
(mkFlag (hadoop != null) "omhdfs")
(mkFlag (rdkafka != null) "omkafka")
(mkFlag (libmongo-client != null) "ommongodb")
(mkFlag (czmq != null) "imzmq3")
(mkFlag (czmq != null) "imczmq")
(mkFlag (czmq != null) "omzmq3")
(mkFlag (czmq != null) "omczmq")
(mkFlag (rabbitmq-c != null) "omrabbitmq")
(mkFlag (hiredis != null) "omhiredis")

3
pkgs/tools/system/vboot_reference/default.nix
View File

@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
patches = [ ./dont_static_link.patch ];
# fix build with gcc9
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
postPatch = ''
substituteInPlace Makefile \
--replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc'