various: unpin old GCCs (#434139)

Emily 2ad04a35 64a6e040

Changed files
+43 -50
pkgs
by-name
am
amdvlk
ch
development
compilers
interpreters
falcon
tools
typesetting
tex
texlive
top-level
+14
pkgs/by-name/am/amdvlk/package.nix
···
cmakeDir = "../drivers/xgl";
+
cmakeFlags = [
+
# There is some incredibly cursed issue with
+
# `directx-shader-compiler` flagging up compiler errors only on
+
# `i686-linux` and only when it has been compiled with a recent
+
# GCC. Since few 32‐bit games are going to use ray tracing anyway,
+
# we just disable it for now. Arch has done this since 2022.
+
#
+
# See:
+
# * <https://github.com/NixOS/nixpkgs/issues/216294>
+
# * <https://github.com/GPUOpen-Drivers/gpurt/issues/5>
+
# * <https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-amdvlk/-/commit/905d9bc2cf4a003b3d367537b5e120d9771cce16>
+
(lib.cmakeBool "VKI_RAY_TRACING" (!(stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit)))
+
];
+
installPhase = ''
runHook preInstall
+14
pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch
···
+
Submodule Plugin/modules/JUCE contains modified content
+
diff --git a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h
+
index 06c0a729d..119f146b8 100644
+
--- a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h
+
+++ b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h
+
@@ -23,6 +23,8 @@
+
==============================================================================
+
*/
+
+
+#include <utility>
+
+
+
namespace juce
+
{
+
+6 -6
pkgs/by-name/ch/chow-tape-model/package.nix
···
pkg-config,
python3,
sqlite,
-
gcc11Stdenv,
+
stdenv,
webkitgtk_4_0,
}:
-
let
-
# JUCE version in submodules is incompatible with GCC12
-
# See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2
-
stdenv = gcc11Stdenv;
-
in
stdenv.mkDerivation (finalAttrs: {
pname = "chow-tape-model";
version = "2.11.4";
···
hash = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM=";
fetchSubmodules = true;
};
+
+
patches = [
+
# Fix the old JUCE submodule for GCC ≥ 12
+
./fix-juce-gcc-12.patch
+
];
nativeBuildInputs = [
pkg-config
-8
pkgs/development/compilers/llvm/default.nix
···
buildPackages,
targetPackages,
stdenv,
-
gcc12Stdenv,
pkgs,
recurseIntoAttrs,
# This is the default binutils, but with *this* version of LLD rather
···
;
}
// packageSetArgs # Allow overrides.
-
// {
-
stdenv =
-
if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then
-
gcc12Stdenv
-
else
-
stdenv; # does not build with gcc13
-
}
)
)
);
+4 -7
pkgs/development/interpreters/falcon/default.nix
···
stdenv.mkDerivation {
pname = "falcon";
-
version = "unstable-2018-10-23";
+
version = "0-unstable-2023-11-19";
src = fetchFromGitHub {
owner = "falconpl";
repo = "falcon";
-
rev = "637e2d5cd950a874496042993c02ab7d17c1b688";
-
sha256 = "iCyvvZJjXb1CR396EJ6GiP6d4e7iAc6QQlAOQoAfehg=";
+
rev = "fc403c6e8c1f3d8c2a5a6ebce5db6f1b3e355808";
+
hash = "sha256-0yLhwDVFNbfiW23hNxrvItCCkyaOvEbFSg1ZQuJvhIs=";
};
-
-
# -Wnarrowing is enabled by default in recent GCC versions,
-
# causing compilation to fail.
-
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
nativeBuildInputs = [
cmake
···
license = licenses.gpl2Only;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; unix;
+
broken = stdenv.cc.isClang;
};
}
+1 -5
pkgs/tools/typesetting/tex/texlive/default.nix
···
*/
{
lib,
-
#, stdenv
-
gcc12Stdenv,
+
stdenv,
fetchpatch,
fetchurl,
runCommand,
···
recurseIntoAttrs,
nixfmt,
}:
-
let
-
stdenv = gcc12Stdenv;
-
in
let
# various binaries (compiled)
bin = callPackage ./bin.nix {
+3 -23
pkgs/top-level/all-packages.nix
···
diffutils = callPackage ../tools/text/diffutils { };
-
dmd = callPackage ../by-name/dm/dmd/package.nix (
-
{
-
}
-
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
-
# https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123
-
stdenv = gcc11Stdenv;
-
}
-
);
-
dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
···
haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
inherit (haxePackages) hxcpp;
-
falcon = callPackage ../development/interpreters/falcon {
-
stdenv = gcc10Stdenv;
-
};
+
falcon = callPackage ../development/interpreters/falcon { };
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { });
···
inherit (darwin) sigtool;
buildJdk = jdk11_headless;
runJdk = jdk11_headless;
-
stdenv =
-
if stdenv.cc.isClang then
-
llvmPackages_17.stdenv
-
else if stdenv.cc.isGNU then
-
gcc12Stdenv
-
else
-
stdenv;
+
stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv;
bazel_self = bazel_6;
};
···
diod = callPackage ../servers/diod { lua = lua5_1; };
-
directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {
-
# https://github.com/NixOS/nixpkgs/issues/216294
-
stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv;
-
};
+
directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { };
dodgy = with python3Packages; toPythonApplication dodgy;
+1 -1
pkgs/top-level/python-packages.nix
···
enablePython = true;
enableRtk = false;
stdenv =
-
if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv else stdenv;
+
if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc13Stdenv else stdenv;
);