From 0323c98ce767eb7f7b33a60bd53b606333ab0a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 4 Apr 2022 15:36:21 -0500 Subject: [PATCH 01/13] =?UTF-8?q?apsw:=203.37.0-r1=20=E2=86=92=203.38.1-r1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/apsw/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 5adee7244dd3..8ff78f7ad636 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.37.0-r1"; + version = "3.38.1-r1"; format = "setuptools"; disabled = isPyPy; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "0p6rlbk7p6hj5mbmk1a8phazw3ym6hf5103zkxzg4p1jgjgi0xpl"; + hash = "sha256-pbb6wCu1T1mPlgoydB1Y1AKv+kToGkdVUjiom2vTqf4="; }; buildInputs = [ @@ -43,11 +43,12 @@ buildPythonPackage rec { disabledTests = [ "testCursor" + "testdb" + "testLargeObjects" "testLoadExtension" "testShell" "testVFS" "testVFSWithWAL" - "testdb" ] ++ lib.optionals stdenv.isDarwin [ # This is https://github.com/rogerbinns/apsw/issues/277 but # because we use pytestCheckHook we need to blacklist the test From e432bbad7885d4c7880794858252d33af57cd90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 09:47:08 -0500 Subject: [PATCH 02/13] armips: use gcc10Stdenv armips is currently only built on x86_64-linux in hydra, has no recent releases (last one 0.11 from 2020) and uses -Werror by default. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f813eb941757..e14f2f0f46d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11902,7 +11902,9 @@ with pkgs; algol68g = callPackage ../development/compilers/algol68g { }; - armips = callPackage ../development/compilers/armips { }; + armips = callPackage ../development/compilers/armips { + stdenv = gcc10Stdenv; + }; arachne-pnr = callPackage ../development/compilers/arachne-pnr { }; From 065409f697056980c6b8a1e1dcd9e21b58bdd443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 09:53:55 -0500 Subject: [PATCH 03/13] archiveopteryx: fix build on gcc11 with extra flags --- pkgs/servers/mail/archiveopteryx/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 4cc612ef89a1..85a0756a1188 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings ''; - # fix build on gcc7+ + # fix build on gcc7+ and gcc11+ NIX_CFLAGS_COMPILE = builtins.toString [ + "-std=c++11" # c++17+ has errors "-Wno-error=builtin-declaration-mismatch" - "-Wno-error=implicit-fallthrough" "-Wno-error=deprecated-copy" + "-Wno-error=implicit-fallthrough" + "-Wno-error=mismatched-new-delete" + "-Wno-error=nonnull" ]; buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; From 89ec69946c1652103349dd3c2c84697828b6b203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 10:44:09 -0500 Subject: [PATCH 04/13] bazel_4: use gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e14f2f0f46d8..25551b466929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14543,7 +14543,10 @@ with pkgs; buildJdk = jdk11_headless; buildJdkName = "java11"; runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + stdenv = + if stdenv.cc.isClang then llvmPackages.stdenv + else if stdenv.cc.isGNU then gcc10Stdenv + else stdenv; bazel_self = bazel_4; }; From d320445a8ccbcff2ae8764e7c6147e91e59fb475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 10:48:55 -0500 Subject: [PATCH 05/13] belle-sip: add extra Wno-error flag needed by gcc11 --- pkgs/development/libraries/belle-sip/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 4032734416e4..e1b517f66bf5 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -30,9 +30,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" ]; NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=cast-function-type" "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" - "-Wno-error=cast-function-type" + "-Wno-error=stringop-overflow" ]; propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ]; From f30a85492cc7d495bdc3afd17e5f8dbfd32fd4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 10:27:49 -0500 Subject: [PATCH 06/13] bpp: use gcc10Stdenv - bpp-core - bpp-phyl - bpp-popgen - bpp-seq - bppsuite --- pkgs/top-level/all-packages.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25551b466929..2d391abe344e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32210,15 +32210,25 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - bpp-core = callPackage ../development/libraries/science/biology/bpp-core { }; + bpp-core = callPackage ../development/libraries/science/biology/bpp-core { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; - bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { }; + bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; - bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { }; + bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; - bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { }; + bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; - bppsuite = callPackage ../applications/science/biology/bppsuite { }; + bppsuite = callPackage ../applications/science/biology/bppsuite { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; cd-hit = callPackage ../applications/science/biology/cd-hit { inherit (llvmPackages) openmp; From 6833a14e6bedba7d07b45d9ccba5686080d3ce75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 11:07:31 -0500 Subject: [PATCH 07/13] clucene-core: use `-std=c++11` --- pkgs/development/libraries/clucene-core/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 6f0eb8dfff00..c767e9f1d2f9 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + meta = with lib; { description = "Core library for full-featured text search engine"; longDescription = '' From 8a9d5e296b12810f7a5a2684c412e1188172a6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 11:14:41 -0500 Subject: [PATCH 08/13] cmtk: add `-std=c++11` to fix build on gcc11 --- pkgs/applications/science/biology/cmtk/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index b6286d11c8cb..36db47ad168a 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + (lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing") + ]; meta = with lib; { description = "Computational Morphometry Toolkit "; From e7fd0ebfa91bf3a1b4411ff76d891dd1c133644f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 11:16:26 -0500 Subject: [PATCH 09/13] cpp-ipfs-api: add `-Wno-error` flag to fix build on gcc11 --- pkgs/development/libraries/cpp-ipfs-api/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 839ddb9b76fb..315a477e72ad 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { buildInputs = [ curl ]; propagatedBuildInputs = [ nlohmann_json ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=range-loop-construct" + ]; + meta = with lib; { description = "IPFS C++ API client library"; homepage = "https://github.com/vasild/cpp-ipfs-api"; From 001e5336d98576432345142600eced5e9c9e7bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 11:18:00 -0500 Subject: [PATCH 10/13] cromfs: use gcc10Stdenv --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d391abe344e..66792963aff9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4621,7 +4621,9 @@ with pkgs; createrepo_c = callPackage ../tools/package-management/createrepo_c { }; - cromfs = callPackage ../tools/archivers/cromfs { }; + cromfs = callPackage ../tools/archivers/cromfs { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; cron = callPackage ../tools/system/cron { }; From cc4c52b4b81d33dafc2cba61b506c27af8b6c6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 11:44:06 -0500 Subject: [PATCH 11/13] drumgizmo: use gcc10Stdenv --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66792963aff9..cf82e171f225 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25400,7 +25400,9 @@ with pkgs; droopy = python3Packages.callPackage ../applications/networking/droopy { }; - drumgizmo = callPackage ../applications/audio/drumgizmo { }; + drumgizmo = callPackage ../applications/audio/drumgizmo { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; dsf2flac = callPackage ../applications/audio/dsf2flac { }; From 5ea7a84ceb8996e1726c03d119a735080b1110ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 11:46:12 -0500 Subject: [PATCH 12/13] fwbuilder: add `Wno-error` for gcc11 --- pkgs/tools/security/fwbuilder/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/security/fwbuilder/default.nix b/pkgs/tools/security/fwbuilder/default.nix index 66d7a5a7537a..398e552ffe42 100644 --- a/pkgs/tools/security/fwbuilder/default.nix +++ b/pkgs/tools/security/fwbuilder/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=misleading-indentation" + ]; + meta = with lib; { description = "GUI Firewall Management Application"; homepage = "https://github.com/fwbuilder/fwbuilder"; From 75e732b70902eb57cf87870113896f8bf306b20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 11:53:31 -0500 Subject: [PATCH 13/13] gnuapl: add extra `-Wno-error` for gcc11 --- pkgs/development/interpreters/gnu-apl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 0f666dd9af5d..836a09961faf 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -11,14 +11,16 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; - # Needed with GCC 8 NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [ + # Needed with GCC 8 "-Wno-error=int-in-bool-context" "-Wno-error=class-memaccess" "-Wno-error=restrict" "-Wno-error=format-truncation" # Needed with GCC 10 "-Wno-error=maybe-uninitialized" + # Needed with GCC 11 + "-Wno-error=misleading-indentation" ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = lib.optionalString stdenv.isDarwin ''