From 182357e74f4994292e9994bd6e8cd65b1a6d9e62 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:06:41 -0800 Subject: [PATCH 01/65] disable-warnings-if-gcc13: init --- pkgs/top-level/all-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cc477f792de96e..21f2ca3ba4a739a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15852,6 +15852,15 @@ with pkgs; gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc; + disable-warnings-if-gcc13 = pkg: + if (pkg.stdenv.cc.cc.isGNU or false && lib.versionAtLeast pkg.stdenv.cc.cc.version "13.0") + then pkg.overrideAttrs(previousAttrs: previousAttrs // { + env = previousAttrs.env or {} // { + NIX_CFLAGS_COMPILE = (previousAttrs.env.NIX_CFLAGS_COMPILE or "") + " -Wno-error"; + }; + }) + else pkg; + wrapNonDeterministicGcc = stdenv: ccWrapper: if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: { env = old.env // { From c3b574fa839b2a943a3d5bbc9fb29f6e561a1f00 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:06:20 -0800 Subject: [PATCH 02/65] pycrypto: disable-warnings-if-gcc13 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebf97327f53fccb..574ae2fd4d5698a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10033,7 +10033,7 @@ self: super: with self; { pycron = callPackage ../development/python-modules/pycron { }; - pycrypto = callPackage ../development/python-modules/pycrypto { }; + pycrypto = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/pycrypto { }); pycryptodome = callPackage ../development/python-modules/pycryptodome { }; From ad73ab292d9d5cf8b36499775b6174667a0a8e17 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:06:29 -0800 Subject: [PATCH 03/65] efivar: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21f2ca3ba4a739a..475a6309263c0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7948,7 +7948,7 @@ with pkgs; efibootmgr = callPackage ../tools/system/efibootmgr { }; - efivar = callPackage ../tools/system/efivar { }; + efivar = disable-warnings-if-gcc13 (callPackage ../tools/system/efivar { }); eget = callPackage ../tools/misc/eget { }; From ea98d012f599fbf1df7233a9126bb8f7ca4af4d7 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:07:16 -0800 Subject: [PATCH 04/65] btop: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 475a6309263c0eb..62667611a91f756 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27940,9 +27940,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { - stdenv = gcc12Stdenv; - }; + btop = disable-warnings-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../tools/system/btop { }); nmon = callPackage ../os-specific/linux/nmon { }; From 2f0321daa2fbf2ad7780b80275166ef357bb7265 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:07:25 -0800 Subject: [PATCH 05/65] claws-mail: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62667611a91f756..a197f56f499798f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30912,7 +30912,7 @@ with pkgs; clapper = callPackage ../applications/video/clapper { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; + claws-mail = disable-warnings-if-gcc13 (callPackage ../applications/networking/mailreaders/claws-mail { }); cligh = python3Packages.callPackage ../development/tools/github/cligh { }; From fc8b32db6ec6b546f50011ab8681bfedb0fd124c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:07:37 -0800 Subject: [PATCH 06/65] tesseract: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a197f56f499798f..587de4738bbca79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35776,9 +35776,10 @@ with pkgs; tessen = callPackage ../tools/security/tessen { }; - inherit (callPackage ../applications/graphics/tesseract { - inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; - }) + inherit (lib.mapAttrs (_: disable-warnings-if-gcc13) + (callPackage ../applications/graphics/tesseract { + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; + })) tesseract3 tesseract4 tesseract5; From 3eac13b683b87c130d4c2038d86be82755bb7baf Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:07:45 -0800 Subject: [PATCH 07/65] nixVersions: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 587de4738bbca79..dd3e7bdfd57af63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40597,11 +40597,12 @@ with pkgs; networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { }; - nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { - storeDir = config.nix.storeDir or "/nix/store"; - stateDir = config.nix.stateDir or "/nix/var"; - inherit (darwin.apple_sdk.frameworks) Security; - }); + nixVersions = builtins.mapAttrs (_: disable-warnings-if-gcc13) + (recurseIntoAttrs (callPackage ../tools/package-management/nix { + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; + inherit (darwin.apple_sdk.frameworks) Security; + })); nix = nixVersions.stable; From 25bf55c549d22f7e2de484c5e6ec71ffcc9543a7 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 18 Nov 2023 01:21:30 -0800 Subject: [PATCH 08/65] libgcc: pass --disable-plugins This is needed for gcc13 on many platforms due to errors like: ``` checking for library containing dlopen... (cached) none required checking for -fPIC -shared... yes configure: error: Building GCC with plugin support requires a host that supports -fPIC, -shared, -ldl and -rdynamic. ``` --- pkgs/development/libraries/gcc/libgcc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index c168113fa3c45da..600ca69f46d0449 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -10,6 +10,7 @@ let "--disable-intl" "--enable-threads=posix" "--with-glibc-version=${glibc.version}" + "--disable-plugin" # these are required in order to prevent inhibit_libc=true, # which will cripple libgcc's unwinder; see: From ab325321aa2730a590b640743d86f09efff7075f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 17:09:25 -0800 Subject: [PATCH 09/65] pybind: disable-warnings-if-gcc13 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 574ae2fd4d5698a..737fbcb51996613 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9917,7 +9917,7 @@ self: super: with self; { pybigwig = callPackage ../development/python-modules/pybigwig { }; - pybind11 = callPackage ../development/python-modules/pybind11 { }; + pybind11 = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/pybind11 { }); pybindgen = callPackage ../development/python-modules/pybindgen { }; From 4509adf30a7e4b09b6355d11fb89fcb42711cc94 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 1 Dec 2023 01:30:13 -0800 Subject: [PATCH 10/65] gn: apply disable-warnings-if-gcc13 --- pkgs/development/tools/build-managers/gn/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/development/tools/build-managers/gn/generic.nix index 4214bb822b994d6..bb72e4bb20b4d9a 100644 --- a/pkgs/development/tools/build-managers/gn/generic.nix +++ b/pkgs/development/tools/build-managers/gn/generic.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchgit, darwin, writeText , ninja, python3 +, disable-warnings-if-gcc13 , ... }: @@ -17,7 +18,7 @@ let #endif // OUT_LAST_COMMIT_POSITION_H_ ''; -in stdenv.mkDerivation { +in disable-warnings-if-gcc13 (stdenv.mkDerivation { pname = "gn-unstable"; inherit version; @@ -57,4 +58,4 @@ in stdenv.mkDerivation { platforms = platforms.unix; maintainers = with maintainers; [ stesie matthewbauer primeos ]; }; -} +}) From 64873c3c39088a4ab6f4a01b9fe77e658e2bcffa Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 17:26:02 -0800 Subject: [PATCH 11/65] blueprint: disable tests (time out) --- pkgs/development/compilers/blueprint/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 99b275db2aa6a7e..f52b43f49a82ab2 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: { ]; # requires xvfb-run - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.isDarwin + && false; # tests time out checkPhase = '' runHook preCheck From 09bad8ec85a9739349af884fd84e46fe7e83cf7b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 17:28:00 -0800 Subject: [PATCH 12/65] curaengine: disable warnings if gcc13 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd3e7bdfd57af63..78c1428057e1d5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35431,12 +35431,12 @@ with pkgs; slic3r = callPackage ../applications/misc/slic3r { }; - curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; + curaengine_stable = disable-warnings-if-gcc13 (callPackage ../applications/misc/curaengine/stable.nix { }); - curaengine = callPackage ../applications/misc/curaengine { + curaengine = disable-warnings-if-gcc13 (callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; protobuf = protobuf_21; - }; + }); cura = libsForQt5.callPackage ../applications/misc/cura { }; From eb1da85a3ec6badea11732f37172edd64ce1f740 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 17:34:39 -0800 Subject: [PATCH 13/65] kodi-inputstream-ffmpeg-direct: disable warnings if gcc13 --- pkgs/top-level/kodi-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 4fa6c3064558bd6..744ddcb1b396195 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -1,4 +1,5 @@ -{ config, lib, newScope, kodi, libretro }: +{ config, lib, newScope, kodi, libretro +, disable-warnings-if-gcc13 }: with lib; @@ -152,7 +153,7 @@ let self = rec { inputstream-adaptive = callPackage ../applications/video/kodi/addons/inputstream-adaptive { }; - inputstream-ffmpegdirect = callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }; + inputstream-ffmpegdirect = disable-warnings-if-gcc13 (callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }); inputstream-rtmp = callPackage ../applications/video/kodi/addons/inputstream-rtmp { }; From 95335aa2f3512c83dcf71b26f6f68e345fe26e99 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 17:35:11 -0800 Subject: [PATCH 14/65] libe57format: disable warnings if gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c1428057e1d5d..d8ac178b49687e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22710,7 +22710,7 @@ with pkgs; dwarfdump = libdwarf.bin; libdwarf_20210528 = callPackage ../development/libraries/libdwarf/20210528.nix { }; - libe57format = callPackage ../development/libraries/libe57format { }; + libe57format = disable-warnings-if-gcc13 (callPackage ../development/libraries/libe57format { }); libeatmydata = callPackage ../development/libraries/libeatmydata { }; From 30e9253cad180dd48f0ba4fb653df7d75ef046b6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 23:33:15 -0800 Subject: [PATCH 15/65] python-qt: add disable-warnings-if-gcc13 --- 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 d8ac178b49687e2..d591193d5ffb2c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24623,10 +24623,10 @@ with pkgs; pylode = callPackage ../misc/pylode { }; - python-qt = callPackage ../development/libraries/python-qt { + python-qt = disable-warnings-if-gcc13 (callPackage ../development/libraries/python-qt { python = python3; inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; - }; + }); pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; From d220d113070187a4cbe3faab909f8371b19ab4d8 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 23:33:29 -0800 Subject: [PATCH 16/65] zeroc-ice: add disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d591193d5ffb2c9..2709976988c5735 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36915,7 +36915,7 @@ with pkgs; zerobin = callPackage ../applications/networking/zerobin { }; - zeroc-ice = callPackage ../development/libraries/zeroc-ice { }; + zeroc-ice = disable-warnings-if-gcc13 (callPackage ../development/libraries/zeroc-ice { }); zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; From 6b8faecc477d2ecaaa5d49c8afcef00764ed9bbd Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 23:34:04 -0800 Subject: [PATCH 17/65] google-cloud-cpp: add disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2709976988c5735..65ccce482ec7eb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8795,7 +8795,7 @@ with pkgs; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + google-cloud-cpp = disable-warnings-if-gcc13 (callPackage ../development/libraries/google-cloud-cpp { }); google-java-format = callPackage ../development/tools/google-java-format { }; From 08e9f1fd3783f594f54f16efe888b2dc6dfd1a7f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 23:35:21 -0800 Subject: [PATCH 18/65] curl-impersonate: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65ccce482ec7eb0..fd07207ee73a8f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7351,8 +7351,11 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; - inherit (curl-impersonate) curl-impersonate-ff curl-impersonate-chrome; + curl-impersonate = + builtins.mapAttrs (_: pin-to-gcc12-if-gcc13) + (darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }); + curl-impersonate-ff = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-ff; + curl-impersonate-chrom = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome; curlie = callPackage ../tools/networking/curlie { }; From 8268a1ac2d4263b0aed514334a7dc1bd0591c4e8 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 23:36:11 -0800 Subject: [PATCH 19/65] osrm-backend: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd07207ee73a8f7..d4e03417b9e4956 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26837,7 +26837,7 @@ with pkgs; openxr-loader = callPackage ../development/libraries/openxr-loader { }; - osrm-backend = callPackage ../servers/osrm-backend { }; + osrm-backend = disable-warnings-if-gcc13 (callPackage ../servers/osrm-backend { }); oven-media-engine = callPackage ../servers/misc/oven-media-engine { }; From 5d5fd6f211f94d8b19664e0358712a65613bd8bf Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 23:36:57 -0800 Subject: [PATCH 20/65] proj: disable-warnings-if-gcc13 --- 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 d4e03417b9e4956..158253f022ff0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24575,9 +24575,9 @@ with pkgs; primesieve = callPackage ../applications/science/math/primesieve { }; - proj = callPackage ../development/libraries/proj { + proj = disable-warnings-if-gcc13 (callPackage ../development/libraries/proj { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; - }; + }); proj_7 = callPackage ../development/libraries/proj/7.nix { }; From 8ac1dd2355f147bbb89c302700bed1615cd9e347 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 23:37:13 -0800 Subject: [PATCH 21/65] gmsh: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 158253f022ff0eb..41c6b1f72f6a91e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39385,7 +39385,7 @@ with pkgs; ipopt = callPackage ../development/libraries/science/math/ipopt { }; - gmsh = callPackage ../applications/science/math/gmsh { }; + gmsh = disable-warnings-if-gcc13 (callPackage ../applications/science/math/gmsh { }); wcpg = callPackage ../development/libraries/science/math/wcpg { }; From 89c108e8755576b3586d295cbf826b4f05441684 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 23:38:25 -0800 Subject: [PATCH 22/65] intel-media-sdk: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41c6b1f72f6a91e..83878aa386578b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9446,7 +9446,7 @@ with pkgs; inql = callPackage ../tools/security/inql { }; - intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + intel-media-sdk = disable-warnings-if-gcc13 (callPackage ../development/libraries/intel-media-sdk { }); intermodal = callPackage ../tools/misc/intermodal { }; From 83327f1590ab6bd559cfa1012b337cd5992b81f2 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 00:18:13 -0800 Subject: [PATCH 23/65] waylandpp: disable-warnings-if-gcc13 --- 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 83878aa386578b2..c2b0e9a89b0b66f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25581,9 +25581,9 @@ with pkgs; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; - waylandpp = callPackage ../development/libraries/waylandpp { + waylandpp = disable-warnings-if-gcc13 (callPackage ../development/libraries/waylandpp { graphviz = graphviz-nox; - }; + }); wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; From 49e1736894732716777916e75fd61920a51ec2fd Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 00:20:09 -0800 Subject: [PATCH 24/65] gnuradio: disable-warnings-if-gcc13 --- 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 c2b0e9a89b0b66f..929d70782c4b74a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31739,12 +31739,12 @@ with pkgs; }; }; }; - gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { + gnuradio3_8 = disable-warnings-if-gcc13 (callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; }; - }; + }); gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. From 33fc174e2fef690ae4a2ce728c6498b919aae3c2 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 01:47:30 -0800 Subject: [PATCH 25/65] boringssl: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 929d70782c4b74a..f115a1887047afe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24418,7 +24418,7 @@ with pkgs; libressl = libressl_3_8; - boringssl = callPackage ../development/libraries/boringssl { }; + boringssl = disable-warnings-if-gcc13 (callPackage ../development/libraries/boringssl { }); wolfssl = darwin.apple_sdk_11_0.callPackage ../development/libraries/wolfssl { inherit (darwin.apple_sdk_11_0.frameworks) Security; From c6968a2e405a8ab9dcf5eb2cad99b0e9d0fa8d9e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 01:48:24 -0800 Subject: [PATCH 26/65] rippled: disable-warnings-if-gcc13 --- 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 f115a1887047afe..975000c1e6027d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27295,9 +27295,9 @@ with pkgs; protobuf = protobuf_21; }; - rippled = callPackage ../servers/rippled { + rippled = disable-warnings-if-gcc13 (callPackage ../servers/rippled { boost = boost177; - }; + }); rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { }; From f47afaf34811f81667466cd08d7bf8cffe70c91d Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 01:50:04 -0800 Subject: [PATCH 27/65] litecoin: disable-warnings-if-gcc13 --- 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 975000c1e6027d6..a4cda6c6cf5cebf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37133,10 +37133,10 @@ with pkgs; lightning-pool = callPackage ../applications/blockchains/lightning-pool { }; - litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin { + litecoin = disable-warnings-if-gcc13 (libsForQt5.callPackage ../applications/blockchains/litecoin { inherit (darwin.apple_sdk.frameworks) AppKit; boost = pkgs.boost177; - }; + }); litecoind = litecoin.override { withGui = false; }; livedl = callPackage ../tools/misc/livedl { }; From 59756679915a00707cb2640615c5c671743719b0 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 01:50:50 -0800 Subject: [PATCH 28/65] pcsx2: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4cda6c6cf5cebf..ec2dad4e03bf0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2787,7 +2787,7 @@ with pkgs; pcem = callPackage ../applications/emulators/pcem { }; - pcsx2 = qt6Packages.callPackage ../applications/emulators/pcsx2 { }; + pcsx2 = disable-warnings-if-gcc13 (qt6Packages.callPackage ../applications/emulators/pcsx2 { }); pcsxr = callPackage ../applications/emulators/pcsxr { }; From 63ead957f165e99902d741a8327ea5ce86356432 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 01:54:16 -0800 Subject: [PATCH 29/65] python3Packages.ecos: disable-warnings-if-gcc13 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 737fbcb51996613..ab79b6fa932d834 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3475,7 +3475,7 @@ self: super: with self; { ecoaliface = callPackage ../development/python-modules/ecoaliface { }; - ecos = callPackage ../development/python-modules/ecos { }; + ecos = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/ecos { }); ecpy = callPackage ../development/python-modules/ecpy { }; From 5c037da467d1af4250381bf772126fa836dd644b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 12:35:29 -0800 Subject: [PATCH 30/65] opencollada: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec2dad4e03bf0eb..5e32752959ef124 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24321,7 +24321,7 @@ with pkgs; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; - opencollada = callPackage ../development/libraries/opencollada { }; + opencollada = disable-warnings-if-gcc13 (callPackage ../development/libraries/opencollada { }); opencore-amr = callPackage ../development/libraries/opencore-amr { }; From 0a4ea52b6241e8319480dbc8f7903ae771989f84 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 12:36:21 -0800 Subject: [PATCH 31/65] reproc: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e32752959ef124..23a1ae6a267d28a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34274,7 +34274,7 @@ with pkgs; rep-gtk = callPackage ../development/libraries/rep-gtk { }; - reproc = callPackage ../development/libraries/reproc { }; + reproc = disable-warnings-if-gcc13 (callPackage ../development/libraries/reproc { }); sawfish = callPackage ../applications/window-managers/sawfish { }; From b40ab4620f2279c7f0d64bf4d0b6057bb86dc598 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 12:36:38 -0800 Subject: [PATCH 32/65] memorymapping: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23a1ae6a267d28a..445da4b0452325f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23916,7 +23916,7 @@ with pkgs; mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; - memorymapping = callPackage ../development/libraries/memorymapping { }; + memorymapping = disable-warnings-if-gcc13 (callPackage ../development/libraries/memorymapping { }); memorymappingHook = makeSetupHook { name = "memorymapping-hook"; propagatedBuildInputs = [ memorymapping ]; From 2ba85dbf241e3e9193d8f7798edbb0273d0393cf Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 12:39:18 -0800 Subject: [PATCH 33/65] python3Packages.fasttext: disable-warnings-if-gcc13 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab79b6fa932d834..6da9769311bea4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3889,7 +3889,7 @@ self: super: with self; { fastrlock = callPackage ../development/python-modules/fastrlock { }; - fasttext = callPackage ../development/python-modules/fasttext { }; + fasttext = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/fasttext { }); fasttext-predict = callPackage ../development/python-modules/fasttext-predict { }; From e1445fd3070174b9ff43e1c8c46ffffc30d77236 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 12:39:43 -0800 Subject: [PATCH 34/65] gmsh: disable-warnings-if-gcc13 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6da9769311bea4a..0857ec24efd66cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4570,9 +4570,9 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { enablePython = true; - }); + })); gntp = callPackage ../development/python-modules/gntp { }; From b1b000d3f872d90edb805f66973f2a2ec789688e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 12:42:01 -0800 Subject: [PATCH 35/65] usbguard: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 445da4b0452325f..b234eb0cd2e070f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28941,7 +28941,7 @@ with pkgs; upscayl = callPackage ../applications/graphics/upscayl { }; - usbguard = callPackage ../os-specific/linux/usbguard { }; + usbguard = disable-warnings-if-gcc13 (callPackage ../os-specific/linux/usbguard { }); usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { }; From 34fb823c4c96ce0ea4083fcf98310962eeacfc4e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 12:48:31 -0800 Subject: [PATCH 36/65] python3Packages.gmsh: typo fix --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0857ec24efd66cd..61bc0b9257cb509 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4570,7 +4570,7 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = pkgs.disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { enablePython = true; })); From 5390800f0b480ce5edeed6c4e794cdc582986a24 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 12:49:06 -0800 Subject: [PATCH 37/65] virtualbox: disable-warnings-if-gcc13 --- 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 b234eb0cd2e070f..7592ed4ce93ef1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36229,10 +36229,10 @@ with pkgs; virtual-ans = callPackage ../applications/audio/virtual-ans { }; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { + virtualbox = disable-warnings-if-gcc13 (libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - }; + }); virtualboxHardened = lowPrio (virtualbox.override { enableHardening = true; From 9a147505de0b25caa95991a430b5e2b0883823ba Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:31:31 -0800 Subject: [PATCH 38/65] openmw.tes3mp: disable-warnings-if-gcc13 --- pkgs/games/openmw/tes3mp.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 48454b42df29965..5662f2356833faf 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -7,13 +7,14 @@ , luajit , makeWrapper , symlinkJoin +, disable-warnings-if-gcc13 }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let # raknet could also be split into dev and lib outputs - raknet = stdenv.mkDerivation { + raknet = disable-warnings-if-gcc13 (stdenv.mkDerivation { pname = "raknet"; version = "unstable-2020-01-19"; @@ -35,7 +36,7 @@ let installPhase = '' install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a ''; - }; + }); coreScripts = stdenv.mkDerivation { pname = "corescripts"; From 259841c31f257daf7aa5388bd7e3766bf2067a6a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:35:46 -0800 Subject: [PATCH 39/65] python-qt: hit it in the head with a hammer --- pkgs/top-level/all-packages.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7592ed4ce93ef1e..755c33bb01efb5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24626,9 +24626,15 @@ with pkgs; pylode = callPackage ../misc/pylode { }; - python-qt = disable-warnings-if-gcc13 (callPackage ../development/libraries/python-qt { + python-qt = (callPackage ../development/libraries/python-qt { python = python3; - inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; + inherit (builtins.mapAttrs (_: pkg: pkg.override (previousArgs: lib.optionalAttrs (previousArgs ? stdenv) { stdenv = gcc12Stdenv; })) qt5) + qmake qttools qtwebengine qtxmlpatterns; + stdenv = gcc12Stdenv; + }) + .overrideAttrs(previousAttrs: { + NIX_CFLAGS_COMPILE = "-w"; + meta = previousAttrs.meta // { broken = true; }; }); pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; @@ -25643,6 +25649,7 @@ with pkgs; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK32; + stdenv = gcc12Stdenv; }; wtk = callPackage ../development/libraries/wtk { }; From 42b9b908848dd312314cb285960faa4b1aac2dec Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:41:42 -0800 Subject: [PATCH 40/65] vertcoind: disable-warnings-if-gcc13 --- 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 755c33bb01efb5f..8f755873c9caba4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37223,9 +37223,9 @@ with pkgs; vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { withGui = true; }; - vertcoind = callPackage ../applications/blockchains/vertcoin { + vertcoind = disable-warnings-if-gcc13 (callPackage ../applications/blockchains/vertcoin { withGui = false; - }; + }); wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; From 771db44f78d4aa53bc6eb2032333fb5cbd30fa1a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:54:38 -0800 Subject: [PATCH 41/65] wownero: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f755873c9caba4..523c9935af2120a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37231,7 +37231,7 @@ with pkgs; wasabibackend = callPackage ../applications/blockchains/wasabibackend { }; - wownero = callPackage ../applications/blockchains/wownero { }; + wownero = disable-warnings-if-gcc13 (callPackage ../applications/blockchains/wownero { }); zcash = callPackage ../applications/blockchains/zcash { inherit (darwin.apple_sdk.frameworks) Security; From 5911f2895546b20754c705572118faf35d7cf159 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:54:51 -0800 Subject: [PATCH 42/65] litecoind: disable-warnings-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 523c9935af2120a..8d70007a7a5c885 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37144,7 +37144,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; boost = pkgs.boost177; }); - litecoind = litecoin.override { withGui = false; }; + litecoind = disable-warnings-if-gcc13 (litecoin.override { withGui = false; }); livedl = callPackage ../tools/misc/livedl { }; From 7cf63c9506a5760edebb3df740fdbee81d72991a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 6 Dec 2023 12:09:18 -0800 Subject: [PATCH 43/65] pin-to-gcc12-if-gcc13: 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 8d70007a7a5c885..48dbf9fd6c7b2cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15864,6 +15864,14 @@ with pkgs; }) else pkg; + pin-to-gcc12-if-gcc13 = pkg: + if !(lib.isDerivation pkg) || !(pkg?override) then pkg else + pkg.override (previousArgs: + lib.optionalAttrs (previousArgs.stdenv.cc.cc.isGNU or false && + lib.versionAtLeast previousArgs.stdenv.cc.cc.version "13.0") { + stdenv = gcc12Stdenv; + }); + wrapNonDeterministicGcc = stdenv: ccWrapper: if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: { env = old.env // { From 2abac5bbf8810155bf8dc3cc998eeac06f47f402 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 23 Nov 2023 23:00:16 -0800 Subject: [PATCH 44/65] llvm: use gcc12Stdenv for llvmPackages<=14 libstdcxx does not build with gcc13 due to new warnings --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48dbf9fd6c7b2cb..006f255d6375e33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16672,6 +16672,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvm = targetPackages.llvmPackages_6.llvm or llvmPackages_6.llvm; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 }); llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { @@ -16679,6 +16680,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvm = targetPackages.llvmPackages_8.llvm or llvmPackages_8.llvm; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries or llvmPackages_8.libraries; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 }); llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 { @@ -16686,6 +16688,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvm = targetPackages.llvmPackages_9.llvm or llvmPackages_9.llvm; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries or llvmPackages_9.libraries; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 }); llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 { @@ -16693,6 +16696,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_10.tools; targetLlvm = targetPackages.llvmPackages_10.llvm or llvmPackages_10.llvm; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries or llvmPackages_10.libraries; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 }); llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({ @@ -16714,6 +16718,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_13.tools; targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 })); llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ @@ -16721,6 +16726,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_14.tools; targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 })); llvmPackages_15 = recurseIntoAttrs (callPackage ../development/compilers/llvm/15 ({ From bf33cd7a2b2f413425271c7a99ee16e684edd463 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 1 Dec 2023 01:30:01 -0800 Subject: [PATCH 45/65] nix_2_3: pin-to-gcc12-if-gcc13 --- pkgs/tools/package-management/nix/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4652ddb76a5b475..b42487ac956a73b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -8,6 +8,7 @@ , fetchpatch2 , runCommand , Security +, pin-to-gcc12-if-gcc13 , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -151,14 +152,16 @@ let pkg; in lib.makeExtensible (self: ({ - nix_2_3 = (common { + nix_2_3 = pin-to-gcc12-if-gcc13 ((common { version = "2.3.17"; hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4="; patches = [ patch-monitorfdhup ]; maintainers = with lib.maintainers; [ flokli raitobezarius ]; - }).override { boehmgc = boehmgc-nix_2_3; }; + }).override { + boehmgc = boehmgc-nix_2_3; + }); nix_2_10 = common { version = "2.10.3"; From b9ccf1ecde4773525b0d7b64da81dcf50adadde7 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 1 Dec 2023 01:31:40 -0800 Subject: [PATCH 46/65] btor2tools: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 006f255d6375e33..33da74c33d08dae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39749,7 +39749,7 @@ with pkgs; avy = callPackage ../applications/science/logic/avy { }; - btor2tools = callPackage ../applications/science/logic/btor2tools { }; + btor2tools = pin-to-gcc12-if-gcc13 (callPackage ../applications/science/logic/btor2tools { }); boolector = callPackage ../applications/science/logic/boolector { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv; From c487794ff2e3de161c585fc81ce074fc5995c253 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 1 Dec 2023 01:32:01 -0800 Subject: [PATCH 47/65] bazel: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33da74c33d08dae..9bbe95e1468a263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18565,16 +18565,16 @@ with pkgs; bazel_self = bazel_4; }; - bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { + bazel_5 = pin-to-gcc12-if-gcc13 (callPackage ../development/tools/build-managers/bazel/bazel_5 { inherit (darwin) cctools sigtool; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_5; - }; + }); - bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { + bazel_6 = pin-to-gcc12-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { inherit (darwin) cctools; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; @@ -18583,7 +18583,7 @@ with pkgs; darwin.apple_sdk_11_0.stdenv else if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_6; - }; + }); bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; From f36569ebfb8b68aa8b5ba9bdeb776193a41a3f2f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 26 Nov 2023 17:52:39 -0800 Subject: [PATCH 48/65] binaryen: pin-to-gcc12-if-gcc13 --- 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 9bbe95e1468a263..d3f9beefc0b2266 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15581,10 +15581,10 @@ with pkgs; bigloo = callPackage ../development/compilers/bigloo { }; - binaryen = callPackage ../development/compilers/binaryen { + binaryen = pin-to-gcc12-if-gcc13 (callPackage ../development/compilers/binaryen { nodejs = nodejs-slim; inherit (python3Packages) filecheck; - }; + }); blueprint-compiler = callPackage ../development/compilers/blueprint { }; From aeaf50fd57e691d58a2f0049d861564ba620bd11 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 27 Nov 2023 01:20:34 -0800 Subject: [PATCH 49/65] bobcat: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3f9beefc0b2266..7e35eee7160ed3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20702,7 +20702,7 @@ with pkgs; else callPackage ../os-specific/linux/bionic-prebuilt { }; - bobcat = callPackage ../development/libraries/bobcat { }; + bobcat = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/bobcat { }); boehmgc = callPackage ../development/libraries/boehm-gc { }; From 984a031e7948a33bd818197a1f3ebb25e2d6477d Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 18 Nov 2023 01:23:20 -0800 Subject: [PATCH 50/65] spike: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e35eee7160ed3f..d1d0e2946d15920 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35343,7 +35343,7 @@ with pkgs; spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { }; - spike = callPackage ../applications/virtualization/spike { }; + spike = pin-to-gcc12-if-gcc13 (callPackage ../applications/virtualization/spike { }); tensorman = callPackage ../tools/misc/tensorman { }; From b9f3571c37c078443447d74b7c9025617c04964f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 18 Nov 2023 01:19:25 -0800 Subject: [PATCH 51/65] sdrpp: pin-to-gcc12-if-gcc13 --- 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 d1d0e2946d15920..ea101e2df1f282f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24966,9 +24966,9 @@ with pkgs; sdrplay = callPackage ../applications/radio/sdrplay { }; - sdrpp = callPackage ../applications/radio/sdrpp { + sdrpp = pin-to-gcc12-if-gcc13 (callPackage ../applications/radio/sdrpp { inherit (darwin.apple_sdk.frameworks) AppKit; - }; + }); sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { }; From d37357b243408c3899e770d7d7efff7f11110dc2 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:07:06 -0800 Subject: [PATCH 52/65] rocksdb: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea101e2df1f282f..4fd7c93ca73bab2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24834,7 +24834,7 @@ with pkgs; rlottie = callPackage ../development/libraries/rlottie { }; - rocksdb = callPackage ../development/libraries/rocksdb { }; + rocksdb = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/rocksdb { }); rocksdb_7_10 = rocksdb.overrideAttrs rec { pname = "rocksdb"; From d2495bd7366188d8bb4bdf7a49d4300506ffb703 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Dec 2023 17:27:30 -0800 Subject: [PATCH 53/65] crossguid: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd7c93ca73bab2..aeb64591cc77bbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20987,7 +20987,7 @@ with pkgs; crocoddyl = callPackage ../development/libraries/crocoddyl { }; - crossguid = callPackage ../development/libraries/crossguid { }; + crossguid = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/crossguid { }); cryptopp = callPackage ../development/libraries/crypto++ { }; From f11d51fd3955f7e8bf2d143c4b3218e5ac2341ff Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 13:06:55 -0800 Subject: [PATCH 54/65] libfilezilla: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aeb64591cc77bbc..8b21a32fdaa6032 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22755,9 +22755,11 @@ with pkgs; libfido2 = callPackage ../development/libraries/libfido2 {}; - libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { - inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; - }; + libfilezilla = + pin-to-gcc12-if-gcc13 + (darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { + inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; + }); libfishsound = callPackage ../development/libraries/libfishsound { }; From 678c9b2bee1c6c3b995b45c79a2fe476c24d481a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 01:51:37 -0800 Subject: [PATCH 55/65] bees: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b21a32fdaa6032..eaa587048bc1ec1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40179,7 +40179,7 @@ with pkgs; beep = callPackage ../misc/beep { }; - bees = callPackage ../tools/filesystems/bees { }; + bees = pin-to-gcc12-if-gcc13 (callPackage ../tools/filesystems/bees { }); blahaj = callPackage ../tools/misc/blahaj { }; From df242a65c9f02253d42331c20f600ae27e5caca6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 02:32:48 -0800 Subject: [PATCH 56/65] waylandpp: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaa587048bc1ec1..08f254405124beb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25603,7 +25603,7 @@ with pkgs; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; - waylandpp = disable-warnings-if-gcc13 (callPackage ../development/libraries/waylandpp { + waylandpp = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/waylandpp { graphviz = graphviz-nox; }); From 06e3a6928d2418fb9da9d9a78e5036a3e5567160 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 01:53:45 -0800 Subject: [PATCH 57/65] envoy: pin-to-gcc12-if-gcc13 --- 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 08f254405124beb..f578d2697cf62d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26388,11 +26388,11 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; - envoy = callPackage ../servers/http/envoy { + envoy = pin-to-gcc12-if-gcc13 (callPackage ../servers/http/envoy { go = go_1_20; jdk = openjdk11_headless; gn = gn1924; - }; + }); ergochat = callPackage ../servers/irc/ergochat { }; From cc3057ded9e349853cc6cc9aa87de457d1e2b7ca Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:30:07 -0800 Subject: [PATCH 58/65] v8: pin-to-gcc12-if-gcc13 --- 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 f578d2697cf62d3..bc6930bd7debf1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25475,7 +25475,7 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; - v8 = callPackage ../development/libraries/v8 ( + v8 = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/v8 ( let stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" then overrideLibcxx llvmPackages_15.stdenv @@ -25484,7 +25484,7 @@ with pkgs; { stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; } - ); + )); intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; From a0d48a484f6e79a888ff445a5077729a3ab03939 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:45:16 -0800 Subject: [PATCH 59/65] openjfx: pin-to-gcc12-if-gcc13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc6930bd7debf1b..0da3cf383d32fce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16438,7 +16438,7 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21; - openjfx = openjfx17; + openjfx = pin-to-gcc12-if-gcc13 (openjfx17.override { }); openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; From e962c0b593ce46eef5e374d31a2de14c779e11fe Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 3 Dec 2023 23:55:22 -0800 Subject: [PATCH 60/65] qgrep: pin-to-gcc12-if-gcc13 --- 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 0da3cf383d32fce..ca139a1bc40a66d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12526,9 +12526,9 @@ with pkgs; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; - qgrep = callPackage ../tools/text/qgrep { + qgrep = pin-to-gcc12-if-gcc13 (callPackage ../tools/text/qgrep { inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; - }; + }); qhull = callPackage ../development/libraries/qhull { }; From 2e952b5ed35497c773061edd1c558353099c4bf8 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 5 Dec 2023 17:57:55 -0800 Subject: [PATCH 61/65] texlive: pin-to-gcc12-if-gcc13 --- pkgs/tools/typesetting/tex/texlive/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 1a497c6affaa903..a9d6e717318fcd2 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -2,7 +2,10 @@ - source: ../../../../../doc/languages-frameworks/texlive.xml - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ -{ stdenv, lib, fetchurl, runCommand, writeShellScript, writeText, buildEnv +{ lib +#, stdenv +, gcc12Stdenv +, fetchurl, runCommand, writeShellScript, writeText, buildEnv , callPackage, ghostscript_headless, harfbuzz , makeWrapper, installShellFiles , python3, ruby, perl, tk, jdk, bash, snobol4 @@ -11,6 +14,7 @@ , useFixedHashes ? true , recurseIntoAttrs }: +let stdenv = gcc12Stdenv; in let # various binaries (compiled) bin = callPackage ./bin.nix { From e46ececd8f90cc0ba3bf68e1f8837d9ac2c1ddc3 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sun, 3 Dec 2023 18:25:44 -0600 Subject: [PATCH 62/65] rocmPackages_5: pin stdenv to GCC 12 Try reverting this on a future ROCm release. Addresses: https://github.com/NixOS/nixpkgs/issues/271943 --- pkgs/development/rocm-modules/5/default.nix | 9 +++++++-- .../development/rocm-modules/5/llvm/default.nix | 17 +++++++++-------- .../5/llvm/stage-1/clang-unwrapped.nix | 5 +++-- .../rocm-modules/5/llvm/stage-1/lld.nix | 5 +++-- .../rocm-modules/5/llvm/stage-1/llvm.nix | 2 +- .../rocm-modules/5/llvm/stage-1/runtimes.nix | 3 ++- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index d5f1c2678c4e16e..6814825b2f9b310 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -1,4 +1,5 @@ -{ callPackage +{ gcc12Stdenv # FIXME: Try removing this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943 +, callPackage , recurseIntoAttrs , symlinkJoin , fetchFromGitHub @@ -73,10 +74,11 @@ in rec { # Broken, too many errors rdc = callPackage ./rdc { inherit rocmUpdateScript rocm-smi rocm-runtime; + stdenv = gcc12Stdenv; # stdenv = llvm.rocmClangStdenv; }; - rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { }; + rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { stdenv = gcc12Stdenv; }; ## ROCm-Developer-Tools ## hip-common = callPackage ./hip-common { @@ -107,17 +109,20 @@ in rec { rocprofiler = callPackage ./rocprofiler { inherit rocmUpdateScript clr rocm-core rocm-thunk rocm-device-libs roctracer rocdbgapi rocm-smi hsa-amd-aqlprofile-bin; inherit (llvm) clang; + stdenv = gcc12Stdenv; }; # Needs GCC roctracer = callPackage ./roctracer { inherit rocmUpdateScript rocm-device-libs rocm-runtime clr; + stdenv = gcc12Stdenv; }; # Needs GCC rocgdb = callPackage ./rocgdb { inherit rocmUpdateScript; elfutils = elfutils.override { enableDebuginfod = true; }; + stdenv = gcc12Stdenv; }; rocdbgapi = callPackage ./rocdbgapi { diff --git a/pkgs/development/rocm-modules/5/llvm/default.nix b/pkgs/development/rocm-modules/5/llvm/default.nix index 9226fb87802c741..9c8919165a516f0 100644 --- a/pkgs/development/rocm-modules/5/llvm/default.nix +++ b/pkgs/development/rocm-modules/5/llvm/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ # stdenv FIXME: Try changing back to this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943 + gcc12Stdenv , callPackage , rocmUpdateScript , wrapBintoolsWith @@ -12,18 +13,18 @@ let ## Stage 1 ## # Projects - llvm = callPackage ./stage-1/llvm.nix { inherit rocmUpdateScript; }; - clang-unwrapped = callPackage ./stage-1/clang-unwrapped.nix { inherit rocmUpdateScript llvm; }; - lld = callPackage ./stage-1/lld.nix { inherit rocmUpdateScript llvm; }; + llvm = callPackage ./stage-1/llvm.nix { inherit rocmUpdateScript; stdenv = gcc12Stdenv; }; + clang-unwrapped = callPackage ./stage-1/clang-unwrapped.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; }; + lld = callPackage ./stage-1/lld.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; }; # Runtimes - runtimes = callPackage ./stage-1/runtimes.nix { inherit rocmUpdateScript llvm; }; + runtimes = callPackage ./stage-1/runtimes.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; }; ## Stage 2 ## # Helpers bintools-unwrapped = callPackage ./stage-2/bintools-unwrapped.nix { inherit llvm lld; }; bintools = wrapBintoolsWith { bintools = bintools-unwrapped; }; - rStdenv = callPackage ./stage-2/rstdenv.nix { inherit llvm clang-unwrapped lld runtimes bintools; }; + rStdenv = callPackage ./stage-2/rstdenv.nix { inherit llvm clang-unwrapped lld runtimes bintools; stdenv = gcc12Stdenv; }; in rec { inherit llvm @@ -40,8 +41,8 @@ in rec { ## Stage 3 ## # Helpers - clang = callPackage ./stage-3/clang.nix { inherit llvm lld clang-unwrapped bintools libc libunwind libcxxabi libcxx compiler-rt; }; - rocmClangStdenv = overrideCC stdenv clang; + clang = callPackage ./stage-3/clang.nix { inherit llvm lld clang-unwrapped bintools libc libunwind libcxxabi libcxx compiler-rt; stdenv = gcc12Stdenv; }; + rocmClangStdenv = overrideCC gcc12Stdenv clang; # Projects clang-tools-extra = callPackage ./stage-3/clang-tools-extra.nix { inherit rocmUpdateScript llvm clang-unwrapped; stdenv = rocmClangStdenv; }; diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix index 113313f4e06654b..5a61732ffd2d40b 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix @@ -1,10 +1,11 @@ -{ callPackage +{ stdenv +, callPackage , rocmUpdateScript , llvm }: callPackage ../base.nix rec { - inherit rocmUpdateScript; + inherit stdenv rocmUpdateScript; targetName = "clang-unwrapped"; targetDir = "clang"; extraBuildInputs = [ llvm ]; diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix index a7b042eabfe6554..5ca8bca25a33856 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix @@ -1,10 +1,11 @@ -{ callPackage +{ stdenv +, callPackage , rocmUpdateScript , llvm }: callPackage ../base.nix rec { - inherit rocmUpdateScript; + inherit stdenv rocmUpdateScript; buildMan = false; # No man pages to build targetName = "lld"; targetDir = targetName; diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix index 51959ec8bc3256f..82bd55411a246f9 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix @@ -4,7 +4,7 @@ }: callPackage ../base.nix { - inherit rocmUpdateScript; + inherit stdenv rocmUpdateScript; requiredSystemFeatures = [ "big-parallel" ]; isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344 } diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix index 5f6f278ab10e437..0364a02e6e59b40 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix @@ -1,11 +1,12 @@ { lib +, stdenv , callPackage , rocmUpdateScript , llvm }: callPackage ../base.nix rec { - inherit rocmUpdateScript; + inherit stdenv rocmUpdateScript; buildDocs = false; buildMan = false; buildTests = false; From aa259f57d3694db9f051248fddac09d15d6db75b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 14:11:12 -0800 Subject: [PATCH 63/65] spirv-llvm-translator: disable-warnings-if-gcc13 --- pkgs/development/compilers/spirv-llvm-translator/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index f19501a6d7d8287..b99019a0f3d7edb 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -7,6 +7,7 @@ , llvm , spirv-headers , spirv-tools +, disable-warnings-if-gcc13 }: let @@ -37,7 +38,7 @@ let hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s="; } else throw "Incompatible LLVM version."; in -stdenv.mkDerivation { +disable-warnings-if-gcc13 (stdenv.mkDerivation { pname = "SPIRV-LLVM-Translator"; inherit (branch) version; @@ -91,4 +92,4 @@ stdenv.mkDerivation { platforms = platforms.unix; maintainers = with maintainers; [ gloaming ]; }; -} +}) From d58aa2e7e7944814c2cae5109e1e19e1185f3ff9 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 4 Dec 2023 20:44:22 -0800 Subject: [PATCH 64/65] rocmPackages_5.llvm: use gcc12Stdenv if stdenv.cc.cc.isGNU>=13 --- pkgs/development/rocm-modules/5/llvm/base.nix | 8 ++++++++ pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index 82de9e6f3665ca8..4fae8fbf506d021 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -1,5 +1,6 @@ { lib , stdenv +, gcc12Stdenv , fetchFromGitHub , rocmUpdateScript , pkg-config @@ -44,6 +45,13 @@ , isBroken ? false }: +let stdenv' = stdenv; in +let stdenv = + if stdenv'.cc.cc.isGNU or false && lib.versionAtLeast stdenv'.cc.cc.version "13.0" + then gcc12Stdenv + else stdenv'; +in + let llvmNativeTarget = if stdenv.isx86_64 then "X86" diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix b/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix index 45d369a6541c3e8..3820d45a2b814d0 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix @@ -12,6 +12,7 @@ overrideCC stdenv (wrapCCWith rec { inherit bintools; libcxx = runtimes; cc = clang-unwrapped; + gccForLibs = stdenv.cc.cc; extraPackages = [ llvm From 195e99083c124b1ca2cc731d8f6650eb25150b1e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 17 Nov 2023 03:32:47 -0800 Subject: [PATCH 65/65] default-gcc-version: 12 -> 13 --- 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 ca139a1bc40a66d..0c46a0ed3af0422 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15850,7 +15850,9 @@ with pkgs; default-gcc-version = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 - else 12; + else if stdenv.buildPlatform.isDarwin then 12 # unable to test + else if stdenv.buildPlatform.isAarch64 then 12 # unable to test + else 13; gcc = pkgs.${"gcc${toString default-gcc-version}"}; gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc;