various: unpin old GCCs (#434139)

authored by Emily and committed by GitHub 2ad04a35 64a6e040

+43 -50
+14
pkgs/by-name/am/amdvlk/package.nix
··· 85 86 cmakeDir = "../drivers/xgl"; 87 88 installPhase = '' 89 runHook preInstall 90
··· 85 86 cmakeDir = "../drivers/xgl"; 87 88 + cmakeFlags = [ 89 + # There is some incredibly cursed issue with 90 + # `directx-shader-compiler` flagging up compiler errors only on 91 + # `i686-linux` and only when it has been compiled with a recent 92 + # GCC. Since few 32‐bit games are going to use ray tracing anyway, 93 + # we just disable it for now. Arch has done this since 2022. 94 + # 95 + # See: 96 + # * <https://github.com/NixOS/nixpkgs/issues/216294> 97 + # * <https://github.com/GPUOpen-Drivers/gpurt/issues/5> 98 + # * <https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-amdvlk/-/commit/905d9bc2cf4a003b3d367537b5e120d9771cce16> 99 + (lib.cmakeBool "VKI_RAY_TRACING" (!(stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit))) 100 + ]; 101 + 102 installPhase = '' 103 runHook preInstall 104
+14
pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch
···
··· 1 + Submodule Plugin/modules/JUCE contains modified content 2 + 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 3 + index 06c0a729d..119f146b8 100644 4 + --- a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h 5 + +++ b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h 6 + @@ -23,6 +23,8 @@ 7 + ============================================================================== 8 + */ 9 + 10 + +#include <utility> 11 + + 12 + namespace juce 13 + { 14 +
+6 -6
pkgs/by-name/ch/chow-tape-model/package.nix
··· 32 pkg-config, 33 python3, 34 sqlite, 35 - gcc11Stdenv, 36 webkitgtk_4_0, 37 }: 38 - let 39 - # JUCE version in submodules is incompatible with GCC12 40 - # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2 41 - stdenv = gcc11Stdenv; 42 - in 43 stdenv.mkDerivation (finalAttrs: { 44 pname = "chow-tape-model"; 45 version = "2.11.4"; ··· 51 hash = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; 52 fetchSubmodules = true; 53 }; 54 55 nativeBuildInputs = [ 56 pkg-config
··· 32 pkg-config, 33 python3, 34 sqlite, 35 + stdenv, 36 webkitgtk_4_0, 37 }: 38 stdenv.mkDerivation (finalAttrs: { 39 pname = "chow-tape-model"; 40 version = "2.11.4"; ··· 46 hash = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; 47 fetchSubmodules = true; 48 }; 49 + 50 + patches = [ 51 + # Fix the old JUCE submodule for GCC ≥ 12 52 + ./fix-juce-gcc-12.patch 53 + ]; 54 55 nativeBuildInputs = [ 56 pkg-config
-8
pkgs/development/compilers/llvm/default.nix
··· 5 buildPackages, 6 targetPackages, 7 stdenv, 8 - gcc12Stdenv, 9 pkgs, 10 recurseIntoAttrs, 11 # This is the default binutils, but with *this* version of LLD rather ··· 81 ; 82 } 83 // packageSetArgs # Allow overrides. 84 - // { 85 - stdenv = 86 - if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then 87 - gcc12Stdenv 88 - else 89 - stdenv; # does not build with gcc13 90 - } 91 ) 92 ) 93 );
··· 5 buildPackages, 6 targetPackages, 7 stdenv, 8 pkgs, 9 recurseIntoAttrs, 10 # This is the default binutils, but with *this* version of LLD rather ··· 80 ; 81 } 82 // packageSetArgs # Allow overrides. 83 ) 84 ) 85 );
+4 -7
pkgs/development/interpreters/falcon/default.nix
··· 11 12 stdenv.mkDerivation { 13 pname = "falcon"; 14 - version = "unstable-2018-10-23"; 15 16 src = fetchFromGitHub { 17 owner = "falconpl"; 18 repo = "falcon"; 19 - rev = "637e2d5cd950a874496042993c02ab7d17c1b688"; 20 - sha256 = "iCyvvZJjXb1CR396EJ6GiP6d4e7iAc6QQlAOQoAfehg="; 21 }; 22 - 23 - # -Wnarrowing is enabled by default in recent GCC versions, 24 - # causing compilation to fail. 25 - env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; 26 27 nativeBuildInputs = [ 28 cmake ··· 39 license = licenses.gpl2Only; 40 maintainers = with maintainers; [ pSub ]; 41 platforms = with platforms; unix; 42 }; 43 }
··· 11 12 stdenv.mkDerivation { 13 pname = "falcon"; 14 + version = "0-unstable-2023-11-19"; 15 16 src = fetchFromGitHub { 17 owner = "falconpl"; 18 repo = "falcon"; 19 + rev = "fc403c6e8c1f3d8c2a5a6ebce5db6f1b3e355808"; 20 + hash = "sha256-0yLhwDVFNbfiW23hNxrvItCCkyaOvEbFSg1ZQuJvhIs="; 21 }; 22 23 nativeBuildInputs = [ 24 cmake ··· 35 license = licenses.gpl2Only; 36 maintainers = with maintainers; [ pSub ]; 37 platforms = with platforms; unix; 38 + broken = stdenv.cc.isClang; 39 }; 40 }
+1 -5
pkgs/tools/typesetting/tex/texlive/default.nix
··· 5 */ 6 { 7 lib, 8 - #, stdenv 9 - gcc12Stdenv, 10 fetchpatch, 11 fetchurl, 12 runCommand, ··· 45 recurseIntoAttrs, 46 nixfmt, 47 }: 48 - let 49 - stdenv = gcc12Stdenv; 50 - in 51 let 52 # various binaries (compiled) 53 bin = callPackage ./bin.nix {
··· 5 */ 6 { 7 lib, 8 + stdenv, 9 fetchpatch, 10 fetchurl, 11 runCommand, ··· 44 recurseIntoAttrs, 45 nixfmt, 46 }: 47 let 48 # various binaries (compiled) 49 bin = callPackage ./bin.nix {
+3 -23
pkgs/top-level/all-packages.nix
··· 2740 2741 diffutils = callPackage ../tools/text/diffutils { }; 2742 2743 - dmd = callPackage ../by-name/dm/dmd/package.nix ( 2744 - { 2745 - } 2746 - // lib.optionalAttrs stdenv.hostPlatform.isLinux { 2747 - # https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123 2748 - stdenv = gcc11Stdenv; 2749 - } 2750 - ); 2751 - 2752 dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; 2753 2754 dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; ··· 5466 haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); 5467 inherit (haxePackages) hxcpp; 5468 5469 - falcon = callPackage ../development/interpreters/falcon { 5470 - stdenv = gcc10Stdenv; 5471 - }; 5472 5473 dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { }); 5474 ··· 6795 inherit (darwin) sigtool; 6796 buildJdk = jdk11_headless; 6797 runJdk = jdk11_headless; 6798 - stdenv = 6799 - if stdenv.cc.isClang then 6800 - llvmPackages_17.stdenv 6801 - else if stdenv.cc.isGNU then 6802 - gcc12Stdenv 6803 - else 6804 - stdenv; 6805 bazel_self = bazel_6; 6806 }; 6807 ··· 10007 10008 diod = callPackage ../servers/diod { lua = lua5_1; }; 10009 10010 - directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { 10011 - # https://github.com/NixOS/nixpkgs/issues/216294 10012 - stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv; 10013 - }; 10014 10015 dodgy = with python3Packages; toPythonApplication dodgy; 10016
··· 2740 2741 diffutils = callPackage ../tools/text/diffutils { }; 2742 2743 dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; 2744 2745 dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; ··· 5457 haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); 5458 inherit (haxePackages) hxcpp; 5459 5460 + falcon = callPackage ../development/interpreters/falcon { }; 5461 5462 dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { }); 5463 ··· 6784 inherit (darwin) sigtool; 6785 buildJdk = jdk11_headless; 6786 runJdk = jdk11_headless; 6787 + stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv; 6788 bazel_self = bazel_6; 6789 }; 6790 ··· 9990 9991 diod = callPackage ../servers/diod { lua = lua5_1; }; 9992 9993 + directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { }; 9994 9995 dodgy = with python3Packages; toPythonApplication dodgy; 9996
+1 -1
pkgs/top-level/python-packages.nix
··· 7253 enablePython = true; 7254 enableRtk = false; 7255 stdenv = 7256 - if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv else stdenv; 7257 } 7258 ); 7259
··· 7253 enablePython = true; 7254 enableRtk = false; 7255 stdenv = 7256 + if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc13Stdenv else stdenv; 7257 } 7258 ); 7259