From c55a655dd9ac0ab6578d4ed7c9655d1e3a315f5f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Jan 2019 15:39:26 +0100 Subject: [PATCH 01/64] gcc: bump default to version 8 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50f06c190882a..66ac0bd074e9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6752,8 +6752,8 @@ in gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; - gccFun = callPackage ../development/compilers/gcc/7; - gcc = gcc7; + gccFun = callPackage ../development/compilers/gcc/8; + gcc = gcc8; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { From d746fb8c6b88fbfca75ccc7579f14e9d91ffcbd1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Jan 2019 15:39:49 +0100 Subject: [PATCH 02/64] libglvnd: fix build with gcc8 --- pkgs/development/libraries/libglvnd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 15efdd4fd4e44..3ad5309a5f23c 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -27,7 +27,8 @@ in stdenv.mkDerivation rec { "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # FHS paths are added so that non-NixOS applications can find vendor files. "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" - ] ++ lib.optional stdenv.cc.isClang "-Wno-error"; + "-Wno-error" + ]; # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; From 5a95030f7de174e797c8fcf357057dbcef7b7037 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Jan 2019 15:40:18 +0100 Subject: [PATCH 03/64] libomxil-bellagio: fix build with gcc8 --- pkgs/development/libraries/libomxil-bellagio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 68302acac29fc..6ed82a79aca40 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { patches = [ ./fedora-fixes.patch ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ]; + doCheck = false; # fails meta = with stdenv.lib; { From 05bda149c6351a5aaf05034f3f1df8703abc5fc5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Jan 2019 15:40:42 +0100 Subject: [PATCH 04/64] dhcp: fix build with gcc8 --- pkgs/tools/networking/dhcp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 6c7f335891f5d..ec88a1316bd8f 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" "-Wno-error=format-truncation" ]; installFlags = [ "DESTDIR=\${out}" ]; From 80c04b8adceb1e3c2d401b3cd242f3c43cf4aec1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 09:25:21 +0100 Subject: [PATCH 05/64] iasl: 20181213 -> 20190108 --- pkgs/development/compilers/iasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 7b0b1f2fb4174..422abd3cbedef 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iasl-${version}"; - version = "20181213"; + version = "20190108"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w"; + sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; }; NIX_CFLAGS_COMPILE = "-O3"; From 2bf5d9dad1faaf4ba1373fbacceecbe257c2c281 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 03:55:19 +0100 Subject: [PATCH 06/64] pfixtools: fix build with gcc8 --- pkgs/servers/mail/postfix/pfixtools.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 8c00bcdbee250..bf59bd8d5eea6 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation { --replace /bin/bash ${bash}/bin/bash; ''; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=unused-result" "-Wno-error=nonnull-compare" + "-Wno-error=format-truncation" + ]; makeFlags = "DESTDIR=$(out) prefix="; From 49f468ed29d8b3c2b58aaf15e2932059476c2b14 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 03:57:52 +0100 Subject: [PATCH 07/64] blobfuse: fix build with gcc8 --- pkgs/tools/filesystems/blobfuse/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index b5694535e9469..3255165cdde6b 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -20,4 +22,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jbgi ]; platforms = platforms.linux; }; -} \ No newline at end of file +} From 655936b2a7f719ed63d2e6e89d0c6c8f41b926b0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:05:32 +0100 Subject: [PATCH 08/64] liboping: fix build with gcc8 --- pkgs/development/libraries/liboping/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index ca026811d69b0..ff8f200a3bba5 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + buildInputs = [ ncurses perl ]; configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no"; From 924a26c598493e0e4700b215bb02a0afa750cdc4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:13:32 +0100 Subject: [PATCH 09/64] go_1_9: fix build with gcc8 --- pkgs/development/compilers/go/1.9.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index d6ae163813f3d..30bd2348acc34 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch procps ]; buildInputs = [ cacert pcre ] From 9cc6ae3ee0c4ef5d4f42f8253c95e5600b406c98 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:20:06 +0100 Subject: [PATCH 10/64] getxbook: fix build with gcc8 --- pkgs/applications/misc/getxbook/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index a77f87f6f1f16..95449088a480b 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + buildInputs = [ openssl ]; makeFlags = [ "PREFIX=$(out)" ]; From 9996a85f363ff4b0f527b040cf47f650e18ee0cf Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 04:21:03 +0100 Subject: [PATCH 11/64] llvm: add patch to fix build with gcc8 --- pkgs/development/compilers/llvm/5/llvm.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 9e181a1202bae..ae7b4f915da21 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , python , libffi @@ -40,6 +41,13 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + (fetchpatch { + url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; + name = "llvm-gcc8-type-mismatch.patch"; + sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; + }) + ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ From ce212a59217998156c3e729f4263f7768d966aa1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:35:24 +0100 Subject: [PATCH 12/64] libsepol: 2.7 -> 2.8 --- pkgs/os-specific/linux/libsepol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f16c241a0a1f2..a1dbc8efd5c92 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "libsepol-${version}"; - version = "2.7"; - se_release = "20170804"; + version = "2.8"; + se_release = "20180524"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn"; + sha256 = "1mi4kpx7b94wjphv8k2fz5b8rd7mllvq1k4ssjxg1gjjhdm93mis"; }; nativeBuildInputs = [ flex ]; From 4c4edbba3498ef9a9313301debfae4418e5ed474 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:35:40 +0100 Subject: [PATCH 13/64] libselinux: 2.7 -> 2.8 --- pkgs/os-specific/linux/libselinux/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 51e1a3220941b..9a19fcb067ad8 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -9,14 +9,14 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libselinux-${version}"; - version = "2.7"; + version = "2.8"; inherit (libsepol) se_release se_url; outputs = [ "bin" "out" "dev" "man" "py" ]; src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; - sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh"; + sha256 = "1qc7c6lzvhs9sdgqalg1rxni3a88d989hgrw5f8i1kj3fvn9dnri"; }; nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python ]; @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" - "PYSITEDIR=$(py)/${python.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" @@ -44,6 +43,10 @@ stdenv.mkDerivation rec { installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; + postInstall = '' + moveToOutput "${python.sitePackages}" "$py" + ''; + meta = removeAttrs libsepol.meta ["outputsToInstall"] // { description = "SELinux core library"; }; From a5f7fce141bdc1afded1986d186246b66485cd13 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:35:51 +0100 Subject: [PATCH 14/64] setools: 2017-11-10 -> 4.2.0, fix build with gcc8 --- pkgs/os-specific/linux/setools/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 89375563ae679..d7b0e5e09881c 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -8,18 +8,18 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "2017-11-10"; + version = "4.2.0"; src = fetchFromGitHub { - owner = "TresysTechnology"; + owner = "SELinuxProject"; repo = pname; - rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7"; - sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn"; + rev = version; + sha256 = "1bjwcvr6rjx79cdcvaxn68bdrnl4f2a8gnnqsngdxhkhwpddksjy"; }; nativeBuildInputs = [ bison flex ]; buildInputs = [ libsepol swig ]; - propagatedBuildInputs = [ enum34 libselinux networkx ] + propagatedBuildInputs = [ enum34 libselinux networkx cython ] ++ optionals withGraphics [ pyqt5 ]; checkInputs = [ tox checkpolicy ]; @@ -34,8 +34,8 @@ buildPythonApplication rec { ''; meta = { - description = "SELinux Tools"; - homepage = https://github.com/TresysTechnology/setools/wiki; + description = "SELinux Policy Analysis Tools"; + homepage = https://github.com/SELinuxProject/setools; license = licenses.gpl2; platforms = platforms.linux; }; From bb15e7c892447e1f1233cf604a3d7ab684253838 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:54:29 +0100 Subject: [PATCH 15/64] telegram-cli: fix build with gcc8 --- .../instant-messengers/telegram/telegram-cli/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix index 3e9ebf3fe93fb..4151961216b27 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { rev = "6547c0b21b977b327b3c5e8142963f4bc246187a"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ]; + buildInputs = [ libconfig libevent openssl readline zlib lua5_2 python pkgconfig jansson From 25800e75700617134cf44ccae45998931b91e3ca Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 05:34:46 +0100 Subject: [PATCH 16/64] gfortran8: init --- pkgs/top-level/all-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66ac0bd074e9c..ac02230a8dcdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6969,6 +6969,14 @@ in profiledCompiler = false; }); + gfortran8 = wrapCC (gcc8.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; From c841ae3088c5660888f3ba8ae331ef42f7ac5e7d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 05:56:49 +0100 Subject: [PATCH 17/64] openocd: fix build with gcc8 --- pkgs/development/tools/misc/openocd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index cea86f090d6a2..046006096c2db 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { "-Wno-implicit-fallthrough" "-Wno-format-truncation" "-Wno-format-overflow" + "-Wno-error=tautological-compare" ]; postInstall = '' From a407c42e5b78875cccfda998310a661b5e0f3a13 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 06:18:49 +0100 Subject: [PATCH 18/64] zookeeper_mt: fix build with gcc8 --- .../libraries/zookeeper_mt/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 58e1940a3ef4d..4f69c1c80790e 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -1,20 +1,21 @@ { stdenv, zookeeper, bash }: stdenv.mkDerivation rec { - name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}"; - - src = zookeeper.src; - - setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c"; + name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}"; - buildInputs = [ zookeeper bash ]; + src = zookeeper.src; - meta = with stdenv.lib; { - homepage = http://zookeeper.apache.org; - description = "Apache Zookeeper"; - license = licenses.asl20; - maintainers = [ maintainers.boothead ]; - platforms = platforms.unix; - }; -} + setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c"; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ]; + buildInputs = [ zookeeper bash ]; + + meta = with stdenv.lib; { + homepage = http://zookeeper.apache.org; + description = "Apache Zookeeper"; + license = licenses.asl20; + maintainers = [ maintainers.boothead ]; + platforms = platforms.unix; + }; +} From e35e1b6a7cc615f9138bdd32b039d625e6d74949 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 06:32:24 +0100 Subject: [PATCH 19/64] glibc: fix withGd build with gcc8 --- pkgs/development/libraries/glibc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 27a1267f0cfe1..0146709d3a549 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -40,6 +40,8 @@ callPackage ./common.nix { inherit stdenv; } { # limit rebuilds by only disabling pie w/musl ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; + NIX_CFLAGS_COMPILE = if withGd then "-Wno-error=stringop-truncation" else null; + # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # any program we run, because the gcc will have been placed at a new # store path than that determined when built (as a source for the From 6742a49fa02317b8879d9630c7a130b3a267b172 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 06:47:24 +0100 Subject: [PATCH 20/64] libextractor: fix build with gcc8 --- .../libraries/libextractor/default.nix | 2 ++ .../libraries/libextractor/fix-gcc8-build.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/libextractor/fix-gcc8-build.patch diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index b2d9af657a935..b44863e5d668f 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2"; }; + patches = [ ./fix-gcc8-build.patch ]; + preConfigure = '' echo "patching installation directory in \`extractor.c'..." sed -i "src/main/extractor.c" \ diff --git a/pkgs/development/libraries/libextractor/fix-gcc8-build.patch b/pkgs/development/libraries/libextractor/fix-gcc8-build.patch new file mode 100644 index 0000000000000..e04d09be89981 --- /dev/null +++ b/pkgs/development/libraries/libextractor/fix-gcc8-build.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c +index 072ffc5..a105840 100644 +--- a/src/plugins/ole2_extractor.c ++++ b/src/plugins/ole2_extractor.c +@@ -345,9 +345,8 @@ process_star_office (GsfInput *src, + gsf_input_read (src, size, (unsigned char*) buf); + if ( (buf[0] != 0x0F) || + (buf[1] != 0x0) || +- (0 != strncmp (&buf[2], +- "SfxDocumentInfo", +- strlen ("SfxDocumentInfo"))) || ++ (0 != strcmp (&buf[2], ++ "SfxDocumentInfo")) || + (buf[0x11] != 0x0B) || + (buf[0x13] != 0x00) || /* pw protected! */ + (buf[0x12] != 0x00) ) From 38bd7c2ce3e022288f71962738c6ffd10b5842d8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 07:05:22 +0100 Subject: [PATCH 21/64] netsurf.libwapcaplet: fix build with gcc8 --- pkgs/applications/misc/netsurf/libwapcaplet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix index 509cbeb4503f6..b2d1f1b673928 100644 --- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; description = "String internment library for netsurf browser"; From ebaebb6ad5e08dd1ad3e0c75e06f8ad744706f9f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 07:40:25 +0100 Subject: [PATCH 22/64] nginx: fix build with gcc8 --- pkgs/servers/http/nginx/generic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 9ea49267cf8c9..5e18106bcba82 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -58,7 +58,10 @@ stdenv.mkDerivation { ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ + "-I${libxml2.dev}/include/libxml2" + "-Wno-error=implicit-fallthrough" + ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; configurePlatforms = []; From b056848d212b216a4de5c6cf649379b7e58d605f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 07:46:39 +0100 Subject: [PATCH 23/64] libfaketime: fix build with gcc8 --- pkgs/development/libraries/libfaketime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index cc9db8f7e661e..9b088268868ed 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) ''; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation"; + checkInputs = [ perl ]; meta = with stdenv.lib; { From 4dfa6c01bfd0f2ed612ed39e950a8cdf1b866cb4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 07:48:36 +0100 Subject: [PATCH 24/64] belle-sip: fix build with gcc8 --- pkgs/development/libraries/belle-sip/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 09ca4908d7891..9c124a62601bd 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=format-truncation" + "-Wno-error=cast-function-type" + ]; propagatedBuildInputs = [ antlr3_4 libantlr3c polarssl bctoolbox ]; @@ -26,7 +30,8 @@ stdenv.mkDerivation rec { "--with-polarssl=${polarssl}" ]; - enableParallelBuilding = true; + # Fails to build with lots of parallel jobs + enableParallelBuilding = false; meta = with stdenv.lib; { homepage = http://www.linphone.org/index.php/eng; From 5ccf94ac06691947cec172b5b9aaff888b4a6901 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 07:59:59 +0100 Subject: [PATCH 25/64] libdynd: fix build with gcc8 --- pkgs/development/libraries/libdynd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 93ece69cf0564..93fbf380a34a7 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" "-Wno-error=nonnull" + "-Wno-error=tautological-compare" + "-Wno-error=class-memaccess" + "-Wno-error=parentheses" ]; buildInputs = [ cmake ]; From 6e226c1e2a932cb78bee59473edaa9f6b2d90d03 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 08:30:56 +0100 Subject: [PATCH 26/64] vtk: 7.0.0 -> 7.1.1 --- pkgs/development/libraries/vtk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index dee363f23b6a0..1f25872d08082 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -8,8 +8,8 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "7.0"; - minorVersion = "0"; + majorVersion = "7.1"; + minorVersion = "1"; version = "${majorVersion}.${minorVersion}"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; src = fetchurl { url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; - sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq"; + sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; }; buildInputs = From 26844ad497ffb2a118d64224a4d7e6adec8c3e03 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 08:35:06 +0100 Subject: [PATCH 27/64] bzrtp: fix build with gcc8 --- pkgs/development/libraries/bzrtp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 11b94a0181a19..42453848066af 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ bctoolbox sqlite ]; nativeBuildInputs = [ cmake ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + meta = with stdenv.lib; { description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol"; homepage = https://github.com/BelledonneCommunications/bzrtp; From 3ac0d5465cd26a3e7130db1aefe18b651844055e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 08:45:12 +0100 Subject: [PATCH 28/64] edk2: fix build with gcc8 --- pkgs/development/compilers/edk2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 809fc6a4cf1ab..58c4ff568addf 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -33,6 +33,7 @@ edk2 = stdenv.mkDerivation { buildInputs = [ libuuid pythonEnv ]; makeFlags = "-C BaseTools"; + NIX_CFLAGS_COMPILE = "-Wno-return-type -Wno-error=stringop-truncation"; hardeningDisable = [ "format" "fortify" ]; From 5edbf042c2e549515e8a62d6c9f48b4f9d1bf2a8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 09:43:51 +0100 Subject: [PATCH 29/64] mxnet: 1.2.1 -> 1.3.1 --- .../science/math/mxnet/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 990d3f1a5d59b..4acec03f43fdd 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, bash, cmake +{ stdenv, lib, fetchgit, bash, cmake , opencv, gtest, openblas, liblapack, perl , cudaSupport ? false, cudatoolkit, nvidia_x11 , cudnnSupport ? false, cudnn @@ -8,14 +8,12 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "1.2.1"; - - # Fetching from git does not work at the time (1.2.1) due to an - # incorrect hash in one of the submodules. The provided tarballs - # contain all necessary sources. - src = fetchurl { - url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2"; + version = "1.3.1"; + + src = fetchgit { + url = "https://github.com/apache/incubator-mxnet"; + rev = "1.3.1"; + sha256 = "06vk4q7bh17sjhnr72bzmggcqlp2injnsah5yflklg360p7vpijj"; }; nativeBuildInputs = [ cmake perl ]; @@ -44,6 +42,8 @@ stdenv.mkDerivation rec { rm "$out"/lib/*.a ''; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + enableParallelBuilding = true; meta = with stdenv.lib; { From 747370f2ff94f3859810d481f074fc5a68b68726 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 11 Jan 2019 10:12:08 +0100 Subject: [PATCH 30/64] aerospike: fix build with gcc8 --- pkgs/servers/nosql/aerospike/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index c5290709b6253..36be1479efa32 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ openssl zlib ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + preBuild = '' patchShebangs build/gen_version substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}' From 5aa663376243c94b7b8d9030b55a54c9436bb420 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 10:14:50 +0100 Subject: [PATCH 31/64] mmc-utils: 2018-03-27 -> 2018-12-14 --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 533cd90a2d3cc..772f04b27f542 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "mmc-utils-${version}"; - version = "2018-03-27"; + version = "2018-12-14"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d"; - sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn"; + rev = "aef913e31b659462fe6b9320d241676cba97f67b"; + sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7"; }; makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; From 58460bd7414ca0657f95fca6f12d1fa0805acadd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 10:23:07 +0100 Subject: [PATCH 32/64] chez: fix build with gcc8 --- pkgs/development/compilers/chez/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 5b02aed274f87..c4aef2518057c 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + /* ** We patch out a very annoying 'feature' in ./configure, which ** tries to use 'git' to update submodules. From e8870e4d8c124c61ec8a6113adfe8f101fe264b3 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 11 Jan 2019 10:28:08 +0100 Subject: [PATCH 33/64] altermime: fix build with gcc8 --- pkgs/tools/networking/altermime/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index a77fd56f67395..e9091086ed986 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { "-Wno-error=format-truncation" "-Wno-error=pointer-compare" "-Wno-error=memset-elt-size" + "-Wno-error=restrict" ]; postPatch = '' From a84cd67a2792dedab334a6214550a0c7614f61a4 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 11 Jan 2019 10:35:36 +0100 Subject: [PATCH 34/64] bip: fix build with gcc8 --- pkgs/applications/networking/irc/bip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 7c40a4e12a66d..437de45502294 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)"; From f8b1b8aa7bb9c111bd1a6f33f931defa8ad8bc22 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 11 Jan 2019 10:45:29 +0100 Subject: [PATCH 35/64] cpp-gsl: unstable -> 2.0.0 Also fixes build with gcc8 --- pkgs/development/libraries/cpp-gsl/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/cpp-gsl/default.nix b/pkgs/development/libraries/cpp-gsl/default.nix index 833275c72bd0c..bf161475fd203 100644 --- a/pkgs/development/libraries/cpp-gsl/default.nix +++ b/pkgs/development/libraries/cpp-gsl/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchFromGitHub, cmake, catch }: stdenv.mkDerivation rec { - pname = "GSL-unstable"; - version = "2017-02-15"; + pname = "GSL"; + version = "2.0.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "Microsoft"; repo = "GSL"; - rev = "c87c123d1b3e64ae2cf725584f0c004da4d90f1c"; - sha256 = "0h8py468bvxnydkjs352d7a9s8hk0ihc7msjkcnzj2d7nzp5nsc1"; + rev = "v${version}"; + sha256 = "1kxfca9ik934nkzyn34ingkyvwpc09li81cg1yc6vqcrdw51l4ri"; }; NIX_CFLAGS_COMPILE = "-Wno-error=sign-conversion"; + postPatch = '' + sed -i 's/-Wno-unknown-attributes/-Wno-error=catch-value/' tests/CMakeLists.txt + ''; nativeBuildInputs = [ cmake catch ]; meta = with stdenv.lib; { From e5b28883d2251470be3653fb6e17828d8f62240c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 09:31:18 +0100 Subject: [PATCH 36/64] gem-config: fix grpc build with gcc8 --- .../ruby-modules/gem-config/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 7fdf5c839013e..9d34a5c4698d3 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -183,7 +183,19 @@ in nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=stringop-overflow" + "-Wno-error=implicit-fallthrough" + "-Wno-error=sizeof-pointer-memaccess" + "-Wno-error=cast-function-type" + "-Wno-error=class-memaccess" + "-Wno-error=ignored-qualifiers" + ]; + dontBuild = false; + postPatch = '' + substituteInPlace Makefile \ + --replace '-Wno-invalid-source-encoding' "" + ''; }; hitimes = attrs: { From 717049279b4039a69a481ce8c491cdae70bd4467 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 10:55:26 +0100 Subject: [PATCH 37/64] xbps: fix build with gcc8 --- pkgs/tools/package-management/xbps/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index d29b46b87bed0..d7b085f4b74ee 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { name = "xbps-${version}"; @@ -15,7 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl libarchive ]; - patches = [ ./cert-paths.patch ]; + patches = [ + ./cert-paths.patch + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/void-linux/xbps/pull/38.patch"; + sha256 = "050a9chw0cxy67nm2phz67mgndarrxrv50d54m3l1s5sx83axww3"; + }) + ]; postPatch = '' # fix unprefixed ranlib (needed on cross) From a97afd643e49b5e8cab1f41bf63cf73b3759758f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 11:08:19 +0100 Subject: [PATCH 38/64] imgcat: fix build with gcc8 --- pkgs/applications/graphics/imgcat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index a98029dd5807b..635ca653bcbcb 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { name = "imgcat-${version}"; version = "2.3.0"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" ]; + buildInputs = [ autoconf automake libtool ncurses ]; preConfigure = '' From ebe500e4859fb8f9bbd3223bee9779749fd43b30 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 11:35:00 +0100 Subject: [PATCH 39/64] linbox: fix build with gcc8 --- pkgs/development/libraries/linbox/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index a9a649e2de762..6003ea7bdd256 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -53,7 +53,12 @@ stdenv.mkDerivation rec { "--enable-sage" ]; - patches = stdenv.lib.optionals withSage [ + patches = [ + (fetchpatch { + url = "https://github.com/linbox-team/linbox/commit/56be8673613fff87fb2329f71bceb0c793c00b82.patch"; + sha256 = "0lwxaxgvs17f81qnjgd03cy5lxqgpz7vap6p19dk197kmwll75ha"; + }) + ] ++ stdenv.lib.optionals withSage [ # https://trac.sagemath.org/ticket/24214#comment:39 # Will be resolved by # https://github.com/linbox-team/linbox/issues/69 From c1e29f2c6486eabf83aecdcb5e7dad28dfcfe2c4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 11:55:23 +0100 Subject: [PATCH 40/64] uri: 2017-07-16 -> 1.1.0, fix build with gcc8 --- pkgs/development/libraries/uri/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 46eac0fb88bbe..61246748ac739 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -1,15 +1,18 @@ { stdenv, fetchFromGitHub, cmake, doxygen }: -stdenv.mkDerivation { - name = "uri-2017-07-16"; +stdenv.mkDerivation rec { + name = "uri-${version}"; + version = "1.1.0"; src = fetchFromGitHub { owner = "cpp-netlib"; repo = "uri"; - rev = "ac30f19cc7a4745667a8ebd3eac68d5e70b9a4a6"; - sha256 = "0ys295ij071rilwkk3xq1p3sdzgb0gyybvd3f0cahh67kh8hyk6n"; + rev = "v${version}"; + sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=parentheses" ]; + nativeBuildInputs = [ cmake doxygen ]; cmakeFlags = [ From b47e433353f578bf173cf651b81d2aa07ca4a244 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 11:57:31 +0100 Subject: [PATCH 41/64] leatherman: 1.5.3 -> 1.5.4, fix build with gcc8 --- pkgs/development/libraries/leatherman/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index ad59674b3ed71..7e4e8af2bc109 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - buildInputs = [ boost cmake curl ruby ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=ignored-qualifiers" "-Wno-error=class-memaccess" "-Wno-error=catch-value" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost curl ruby ]; enableParallelBuilding = true; From 15facdae0b14dad89aa1583d217255b684bb9a6a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 11:58:27 +0100 Subject: [PATCH 42/64] trinity: 2018-06-08 -> 2018-09-21, fix build with gcc8 --- pkgs/os-specific/linux/trinity/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 54d9a9bafe975..1d9fef9886941 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "trinity-${version}"; - version = "1.8-git-2018-06-08"; + version = "1.8-git-2018-09-21"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "1b2d43cb383cef86a05acb2df046ce5e9b17a7fe"; - sha256 = "0dsq10vmd6ii1dnpaqhizk9p8mbd6mwgpmi13b11dxwxpcvbhlar"; + rev = "9f6f9f916da3b42cef2e7c30101ff4b0397df736"; + sha256 = "09bjclgr31dhdqhyig84263q9l59x1q3ppa89sxbmg0yn6ixrc9h"; }; # Fails on 32-bit otherwise - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.targetPlatform.is32bit [ "-Wno-error=int-to-pointer-cast" "-Wno-error=pointer-to-int-cast" "-Wno-error=incompatible-pointer-types" From 1fce5f196c89c7510aebad38a3c163d1574baa22 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 11:59:17 +0100 Subject: [PATCH 43/64] libwhereami: 0.2.0 -> 0.2.2, fix build with gcc8 --- pkgs/development/libraries/libwhereami/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 880ebcc1e468f..89b19a28e59f4 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "libwhereami-${version}"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { - sha256 = "10phq4a11m8ly6b4dc2yg3dnjzg8ad5wnjv0ilvwylnw32800pxr"; + sha256 = "084n153jaq8fmhjififk0xlx1d1i3lclnw2j3ly8bixvc392vzly"; rev = version; repo = "libwhereami"; owner = "puppetlabs"; }; - # post gcc7, upstream bug: https://tickets.puppetlabs.com/browse/FACT-1828 - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; nativeBuildInputs = [ cmake ]; From b169898d50a86e174513d0e74325453cb931d44e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 12:02:16 +0100 Subject: [PATCH 44/64] cpp-hocon: fix build with gcc8 --- pkgs/development/libraries/cpp-hocon/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index c2f3ce9b9b4a0..33b8c5519b2b3 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl leatherman ]; From a1d4b2f399acb1bfdc27c2335c305064a1867451 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 14:03:40 +0100 Subject: [PATCH 45/64] telegram-purple: 1.3.0 -> 1.3.1, fix gcc8 build --- .../pidgin-plugins/telegram-purple/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 8527593c1a20d..d71c36aaaf918 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,17 +1,19 @@ { stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : let - version = "1.3.0"; + version = "1.3.1"; in stdenv.mkDerivation rec { name = "telegram-purple-${version}"; 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 ]; From 060712299f25828c20e7a2d5421348062e3a7cfd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 14:06:32 +0100 Subject: [PATCH 46/64] libmaa: fix build with gcc8 --- pkgs/servers/dict/libmaa.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index 3c04a678def5b..c6d84c9478af8 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtool ]; # configureFlags = [ "--datadir=/var/run/current-system/share/dictd" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + meta = with stdenv.lib; { description = "Dict protocol server and client"; maintainers = [ ]; From 5a7f2c59eeb130916febd46d125bdc8e5f62a61f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 14:27:07 +0100 Subject: [PATCH 47/64] facter: fix build with gcc8 --- pkgs/tools/system/facter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 8fe8ac836ba9f..33c8967bcb0c8 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = "-fpermissive -Wno-error=catch-value"; NIX_LDFLAGS = "-lblkid"; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; From 9fcdc3e8657af1526f02d419ee903ebcae8ada89 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 14:38:28 +0100 Subject: [PATCH 48/64] zeroc_ice: fix build with gcc8 --- pkgs/development/libraries/zeroc-ice/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 063d64c690586..f9d1496b6dc2e 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" ]; + patches = [ ./makefile.patch ]; buildInputs = [ mcpp bzip2 expat openssl db5 ] From c1b8f13d170cf31e1dad3de4f958053bb703adb1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 14:39:44 +0100 Subject: [PATCH 49/64] mediastreamer2: fix build with gcc8 --- pkgs/development/libraries/mediastreamer/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 4b69d5d0aafe4..05494d1ad1a7a 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -34,8 +34,12 @@ stdenv.mkDerivation rec { openssl ]; - NIX_CFLAGS_COMPILE = " -DGIT_VERSION=\"v2.14.0\" -Wno-error=deprecated-declarations "; - NIX_LDFLAGS = " -lXext -lssl "; + NIX_CFLAGS_COMPILE = [ + "-DGIT_VERSION=\"v2.14.0\"" + "-Wno-error=deprecated-declarations" + "-Wno-error=cast-function-type" + ]; + NIX_LDFLAGS = "-lXext -lssl"; meta = with stdenv.lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; From bbc4d4868f2509f894696da8951b2d9a5bfc8f7d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 14:41:46 +0100 Subject: [PATCH 50/64] papi: fix build with gcc8 --- pkgs/development/libraries/science/benchmark/papi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index f727728943bde..e4e556ab4d6f2 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r"; }; - buildInputs = [ stdenv ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; preConfigure = '' cd src From 02db54901c5f490f894d98bc683d262befde0ae8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 15 Jan 2019 15:12:26 +0100 Subject: [PATCH 51/64] mesos: fix build with gcc8 --- pkgs/applications/networking/cluster/mesos/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 8cff2494bf8fe..faeb0a91487c3 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+=( From 17cf8e6fd71d7a508900ce3cbe6e426babdd86a9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 15 Jan 2019 17:40:36 +0100 Subject: [PATCH 52/64] emscripten: 1.37.36 -> 1.38.22 --- pkgs/development/compilers/binaryen/default.nix | 10 +++++----- pkgs/development/compilers/emscripten/default.nix | 2 +- .../emscripten/fastcomp/emscripten-fastcomp.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index fc75fe92c730f..15f6ab5a859d6 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,12 +1,12 @@ -{ stdenv, cmake, fetchFromGitHub, emscriptenRev ? null }: +{ stdenv, cmake, fetchFromGitHub, python3, emscriptenRev ? null }: let - defaultVersion = "45"; + defaultVersion = "63"; # Map from git revs to SHA256 hashes sha256s = { - "version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; - "1.37.36" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; + "version_63" = "0qd6kxiaqrwm4hsxvx4z6nv20z4arnfr1ks4zjavnw0nzn1n6m3s"; + "1.38.22" = "0qnkwyb9ylpk24gl5rdj526601z0p9wclg8rdx7b2bl1cydfa8sf"; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { inherit rev; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake python3 ]; meta = with stdenv.lib; { homepage = https://github.com/WebAssembly/binaryen; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index e03039cb5e14e..11cc22ceccfa9 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten"; - sha256 = "02p0cp86vd1mydlpq544xbydggpnrq9dhbxx7h08j235frjm5cdc"; + sha256 = "1z3mn9y3ila75yf2a111jqrhcb84cyp7wipyab5vc2yqp20ckjg1"; inherit rev; }; diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 06acebd2ba4a8..ce54778c74927 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp"; - sha256 = "04j698gmp686b5lricjakm5hyh2z2kh28m1ffkghmkyz4zkzmx98"; + sha256 = "0dqy3g5khkvhfp8c8mxw28xrayzjm41dmvajjfyb98fj10jqjzhi"; inherit rev; }; srcFL = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp-clang"; - sha256 = "1ici51mmpgg80xk3y8f376nbbfak6rz27qdy98l8lxkrymklp5g5"; + sha256 = "0hgag7dc0mk25nh8h8ji3vmq4g77r724xnsnjcvx0mvky2b0r3sc"; inherit rev; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac02230a8dcdb..4b28a5a11ad96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2462,7 +2462,7 @@ in cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; - emscriptenVersion = "1.37.36"; + emscriptenVersion = "1.38.22"; emscripten = callPackage ../development/compilers/emscripten { }; From 72e5ed73289a42301737f971126017460df5ffe0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 15 Jan 2019 18:20:58 +0100 Subject: [PATCH 53/64] mps: fix build with gcc8 --- pkgs/development/libraries/mps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 1430a3dfca156..23f271ae04b04 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-implicit-fallthrough" "-Wno-error=clobbered" + "-Wno-error=cast-function-type" ]; From 57b89bd1de4f3733f24f4bf484be4ca6b2d3fcbb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 15 Jan 2019 18:21:49 +0100 Subject: [PATCH 54/64] qpid-cpp: fix build with gcc8 --- pkgs/servers/amqp/qpid-cpp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 8446578507d83..c63b234031b7c 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -38,6 +38,8 @@ let "-Wno-error=int-in-bool-context" "-Wno-error=maybe-uninitialized" "-Wno-error=unused-function" + "-Wno-error=ignored-qualifiers" + "-Wno-error=catch-value" ]; }; From d268433ef8f3ab2277b7473ebc2df247ad0bfac2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 09:26:35 +0100 Subject: [PATCH 55/64] smpeg: fix build with gcc8 --- pkgs/development/libraries/smpeg/default.nix | 1 + pkgs/development/libraries/smpeg/libx11.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/smpeg/libx11.patch diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 7119f76c55fda..737f767ea02f1 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./format.patch ./gcc6.patch + ./libx11.patch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/smpeg/libx11.patch b/pkgs/development/libraries/smpeg/libx11.patch new file mode 100644 index 0000000000000..8611073780f35 --- /dev/null +++ b/pkgs/development/libraries/smpeg/libx11.patch @@ -0,0 +1,25 @@ +Index: smpeg-0.4.5+cvs20030824/Makefile.am +=================================================================== +--- smpeg-0.4.5+cvs20030824.orig/Makefile.am ++++ smpeg-0.4.5+cvs20030824/Makefile.am +@@ -74,7 +74,7 @@ + + # Sources for gtv + gtv_SOURCES = gtv.c gtv.h +-gtv_LDADD = @GTK_LIBS@ libsmpeg.la ++gtv_LDADD = @GTK_LIBS@ @X11_LIBS@ libsmpeg.la + + # Sources for glmovie + glmovie_SOURCES = glmovie-tile.c glmovie.c glmovie.h +Index: smpeg-0.4.5+cvs20030824/configure.in +=================================================================== +--- smpeg-0.4.5+cvs20030824.orig/configure.in ++++ smpeg-0.4.5+cvs20030824/configure.in +@@ -215,6 +215,7 @@ + CFLAGS="$CFLAGS $GTK_CFLAGS" + fi + AC_SUBST(GTK_LIBS) ++ PKG_CHECK_MODULES([X11], [x11]) + fi + AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes) + From 6823be6e2c6da5eac4858e3a3f15706a4a157cfd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 09:51:55 +0100 Subject: [PATCH 56/64] agg: fix build with gcc8 --- pkgs/development/libraries/agg/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index c0539aeed4764..69517817b5961 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake libtool freetype SDL libX11 ]; + postPatch = '' + substituteInPlace include/agg_renderer_outline_aa.h \ + --replace 'line_profile_aa& profile() {' 'const line_profile_aa& profile() {' + ''; + # fix build with new automake, from Gentoo ebuild preConfigure = '' sed -i '/^AM_C_PROTOTYPES/d' configure.in From d8800a23dc8be3f456894ad798e881685b735e4b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 10:05:14 +0100 Subject: [PATCH 57/64] chaps: fix build with gcc8 --- pkgs/tools/security/chaps/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index 3c6f52a4c7f64..4fbb0b5d948c2 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -31,8 +31,12 @@ stdenv.mkDerivation rec { sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1"; }; - # readdir_r(3) is deprecated in glibc >= 2.24 - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ + # readdir_r(3) is deprecated in glibc >= 2.24 + "-Wno-error=deprecated-declarations" + # gcc8 catching polymorphic type error + "-Wno-error=catch-value" + ]; patches = [ ./fix_absolute_path.patch ./fix_environment_variables.patch ./fix_scons.patch ./insert_prefetches.patch ]; From 6a5d713a32196e13d2da50ac5a58f2f2dd84e165 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 10:07:41 +0100 Subject: [PATCH 58/64] libselinux: use PYTHONLIBDIR instead of manual copy --- pkgs/os-specific/linux/libselinux/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 9a19fcb067ad8..a836d6baec110 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" + "PYTHONLIBDIR=$(py)/${python.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" @@ -43,10 +44,6 @@ stdenv.mkDerivation rec { installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; - postInstall = '' - moveToOutput "${python.sitePackages}" "$py" - ''; - meta = removeAttrs libsepol.meta ["outputsToInstall"] // { description = "SELinux core library"; }; From de327eccf0ca076701697d415c339047a580930c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 11:47:32 +0100 Subject: [PATCH 59/64] ants: fix build with gcc8 --- pkgs/applications/science/biology/ants/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index f54bd9af02882..3d988d553dc3a 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk, vtk }: stdenv.mkDerivation rec { _name = "ANTs"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q"; }; + patches = [ + # Fix build with gcc8 + (fetchpatch { + url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch"; + sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ itk vtk ]; From e5acf15be4996517de780e80fdcefe26ae616937 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 12:24:58 +0100 Subject: [PATCH 60/64] gnuapl: fix build with gcc8 --- pkgs/development/interpreters/gnu-apl/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index f60e5d2861404..39a2f507e630d 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -11,9 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; - # Needed with GCC 7 - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=int-in-bool-context" - + stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=null-dereference"; + # Needed with GCC 8 + NIX_CFLAGS_COMPILE = with stdenv.lib; (optionals stdenv.cc.isGNU [ + "-Wno-error=int-in-bool-context" + "-Wno-error=class-memaccess" + "-Wno-error=restrict" + "-Wno-error=format-truncation" + ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" From 4ebf07130361f8549091a5f58bb3c4c7bb8c1fb2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 12:29:17 +0100 Subject: [PATCH 61/64] gnuclad: fix build with gcc8 --- pkgs/applications/graphics/gnuclad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index b3671ead377ab..0477e53d7859c 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { From dc7f8cd171494034b113602a460754ac1cbe6a3d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 13:07:46 +0100 Subject: [PATCH 62/64] darling-dmg: 1.0.4 -> 1.0.4+git20180914 --- pkgs/tools/filesystems/darling-dmg/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index e44d0d229052c..aa0077e47316b 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,24 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } : +{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } : stdenv.mkDerivation rec { name = "darling-dmg-${version}"; - version = "1.0.4"; + version = "1.0.4+git20180914"; src = fetchFromGitHub { owner = "darlinghq"; repo = "darling-dmg"; - rev = "v${version}"; - sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk"; + rev = "97a92a6930e43cdbc9dedaee62716e3223deb027"; + sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj"; }; - patches = [ - (fetchpatch { - url = "https://github.com/darlinghq/darling-dmg/commit/cbb0092264b5c5cf3e92d6c2de23f02d859ebf44.patch"; - sha256 = "05fhgn5c09f1rva6bvbq16nhlkblrhscbf69k04ajwdh7y98sw39"; - }) - ]; - - buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ]; meta = { homepage = http://www.darlinghq.org/; From b20d37e49e9e353c341be1e0a5f3de177e1538ec Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 13:24:40 +0100 Subject: [PATCH 63/64] tengine: fix build with gcc8 --- pkgs/servers/http/tengine/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 36f326d5590bd..066f25b0f4503 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" "-Wno-error=implicit-fallthrough" + "-Wno-error=cast-function-type" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); From f959c997fd1221a3ca8bf6d5fc4a26eac2c7d3bb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 15:54:42 +0100 Subject: [PATCH 64/64] mxnet: fix build with gcc8 --- pkgs/applications/science/math/mxnet/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 4acec03f43fdd..7160769a762c3 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, bash, cmake +{ stdenv, lib, fetchgit, bash, cmake, pkgconfig , opencv, gtest, openblas, liblapack, perl , cudaSupport ? false, cudatoolkit, nvidia_x11 , cudnnSupport ? false, cudnn @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { sha256 = "06vk4q7bh17sjhnr72bzmggcqlp2injnsah5yflklg360p7vpijj"; }; - nativeBuildInputs = [ cmake perl ]; + nativeBuildInputs = [ cmake perl pkgconfig ]; buildInputs = [ opencv gtest openblas liblapack ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; - cmakeFlags = - (if cudaSupport then [ + cmakeFlags = [ "-DBLAS=open" "-DUSE_MKLDNN=0" ] + ++ (if cudaSupport then [ "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] else [ "-DUSE_CUDA=OFF" ]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b28a5a11ad96..dc357b8a337b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22025,6 +22025,7 @@ in cudaSupport = config.cudaSupport or false; cudnnSupport = cudaSupport; inherit (linuxPackages) nvidia_x11; + opencv = opencv3; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };