diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
| commit | 5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3 (patch) | |
| tree | c999ad66361e4c4c5d3ad5443bf575422c41150d /pkgs/applications/networking | |
| parent | ccc8c73ea00321318e9ac2cb75879f57bef328a7 (diff) | |
| parent | e7297363c95415aa2376130583d6c74a85714ab5 (diff) | |
| download | nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.gz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.bz2 nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.lz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.xz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.zst nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.zip | |
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 0ffc7a1fb6f0..1ad30335b94d 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -61,6 +61,9 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ pythonProtobuf ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=class-memaccess"; + preConfigure = '' # https://issues.apache.org/jira/browse/MESOS-6616 configureFlagsArray+=( diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index df2665d8ce8f..ef298883b1b4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : let - version = "1.3.0"; + version = "1.3.1"; in stdenv.mkDerivation rec { pname = "telegram-purple"; @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/majn/telegram-purple"; - rev = "0340e4f14b2480782db4e5b9242103810227c522"; - sha256 = "1xb7hrgisbpx00dsrm5yz934bdd7nfzicd7k855iynk3hjzqj7k5"; + rev = "v${version}"; + sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin libwebp libgcrypt gettext ]; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 0792aefe25f5..249fdc958c80 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" "-Wno-error=format-truncation" ]; meta = { description = "An IRC proxy (bouncer)"; |