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 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 ]; }; -} +}) 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: 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/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/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; 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 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 ]; }; -} +}) 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"; 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"; 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 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cc477f792de96e..0c46a0ed3af0422 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 { }; @@ -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 { }; @@ -7948,7 +7951,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 { }; @@ -8795,7 +8798,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 { }; @@ -9443,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 { }; @@ -12523,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 { }; @@ -15578,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 { }; @@ -15847,11 +15850,30 @@ 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; + 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; + + 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 // { @@ -16418,7 +16440,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; @@ -16652,6 +16674,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 { @@ -16659,6 +16682,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 { @@ -16666,6 +16690,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 { @@ -16673,6 +16698,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 ({ @@ -16694,6 +16720,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 ({ @@ -16701,6 +16728,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 ({ @@ -18539,16 +18567,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; @@ -18557,7 +18585,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; @@ -20676,7 +20704,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 { }; @@ -20961,7 +20989,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++ { }; @@ -22701,7 +22729,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 { }; @@ -22729,9 +22757,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 { }; @@ -23904,7 +23934,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 ]; @@ -24309,7 +24339,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 { }; @@ -24406,7 +24436,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; @@ -24563,9 +24593,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 { }; @@ -24614,10 +24644,16 @@ with pkgs; pylode = callPackage ../misc/pylode { }; - python-qt = 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 { }; @@ -24802,7 +24838,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"; @@ -24934,9 +24970,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 { }; @@ -25441,7 +25477,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 @@ -25450,7 +25486,7 @@ with pkgs; { stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; } - ); + )); intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; @@ -25569,9 +25605,9 @@ with pkgs; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; - waylandpp = callPackage ../development/libraries/waylandpp { + waylandpp = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/waylandpp { graphviz = graphviz-nox; - }; + }); wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; @@ -25631,6 +25667,7 @@ with pkgs; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK32; + stdenv = gcc12Stdenv; }; wtk = callPackage ../development/libraries/wtk { }; @@ -26353,11 +26390,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 { }; @@ -26825,7 +26862,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 { }; @@ -27283,9 +27320,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 { }; @@ -27931,9 +27968,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 { }; @@ -28931,7 +28966,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 { }; @@ -30905,7 +30940,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 { }; @@ -31729,12 +31764,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. @@ -34264,7 +34299,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 { }; @@ -35312,7 +35347,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 { }; @@ -35424,12 +35459,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 { }; @@ -35769,9 +35804,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; @@ -36218,10 +36254,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; @@ -36907,7 +36943,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; }; @@ -37122,11 +37158,11 @@ 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; }; + }); + litecoind = disable-warnings-if-gcc13 (litecoin.override { withGui = false; }); livedl = callPackage ../tools/misc/livedl { }; @@ -37205,15 +37241,15 @@ 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 { }; 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; @@ -39374,7 +39410,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 { }; @@ -39717,7 +39753,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; @@ -40145,7 +40181,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 { }; @@ -40589,11 +40625,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; 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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebf97327f53fccb..61bc0b9257cb509 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 { }; @@ -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 { }; @@ -4570,9 +4570,9 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = pkgs.disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { enablePython = true; - }); + })); gntp = callPackage ../development/python-modules/gntp { }; @@ -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 { }; @@ -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 { };