From e661f4eff425e8f914fef8d76690aa0567ad765e Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Thu, 16 Dec 2021 23:55:05 +0100
Subject: [PATCH] gnu: Remove unneeded uses of custom GCC versions.

* gnu/packages/bioinformatics.scm (libmaus2, biobambam2)[native-inputs]:
Remove GCC-10.
* gnu/packages/game-development.scm (libresprite, python-pyxel)[native-inputs]: Likewise.
* gnu/packages/lua.scm (emilua)[native-inputs]: Likewise.
* gnu/packages/radio.scm (sdr++)[native-inputs]: Likewise.
* gnu/packages/wm.scm (fnott)[native-inputs]: Likewise.
* gnu/packages/text-editors.scm (kakoune)[native-inputs]: Likewise.
(scintilla)[native-inputs]: Remove GCC-9.
* gnu/packages/build-tools.scm (bear)[native-inputs]: Likewise.
* gnu/packages/cpp.scm (magic-enum)[native-inputs]: Likewise.
* gnu/packages/games.scm (openttd)[native-inputs]: Likewise.
(schiffbruch)[native-inputs]: Remove GCC-11.
* gnu/packages/music.scm (liquidsfz, geonkick)[native-inputs]: Remove GCC-9.
* gnu/packages/fcitx5.scm (fcitx5, libime, fcitx5-configtool)[native-inputs]:
Likewise.
* gnu/packages/wine.scm (dxvk32)[native-inputs]: Likewise.
* gnu/packages/ftp.scm (libfilezilla)[native-inputs]: Remove GCC-8.
* gnu/packages/image.scm (blurhash)[native-inputs]: Likewise.
* gnu/packages/jami.scm (libring)[native-inputs]: Likewise.
* gnu/packages/pdf.scm (xournalpp)[native-inputs]: Likewise.
* gnu/packages/telegram.scm (webrtc-for-telegram-desktop,
telegram-desktop)[native-inputs]: Likewise.
---
 gnu/packages/bioinformatics.scm   | 6 ++----
 gnu/packages/build-tools.scm      | 2 --
 gnu/packages/cpp.scm              | 2 --
 gnu/packages/fcitx5.scm           | 9 +++------
 gnu/packages/ftp.scm              | 2 --
 gnu/packages/game-development.scm | 6 +-----
 gnu/packages/games.scm            | 3 ---
 gnu/packages/graph.scm            | 4 +---
 gnu/packages/image.scm            | 3 +--
 gnu/packages/jami.scm             | 2 --
 gnu/packages/lua.scm              | 4 +---
 gnu/packages/music.scm            | 9 ++-------
 gnu/packages/pdf.scm              | 2 --
 gnu/packages/radio.scm            | 3 +--
 gnu/packages/telegram.scm         | 5 +----
 gnu/packages/text-editors.scm     | 7 ++-----
 gnu/packages/wine.scm             | 6 +-----
 gnu/packages/wm.scm               | 2 --
 18 files changed, 16 insertions(+), 61 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 8c3be14e65..f38364191f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11450,8 +11450,7 @@ (define-public libmaus2
     (propagated-inputs
      (list zlib))
     (native-inputs
-     (list gcc-10 ;Code has C++17 requirements
-           pkg-config))
+     (list pkg-config))
     (home-page "https://gitlab.com/german.tischler/libmaus2")
     (synopsis "Collection of data structures and algorithms useful for bioinformatics")
     (description "libmaus2 is a collection of data structures and
@@ -11494,8 +11493,7 @@ (define-public biobambam2
     (inputs
      (list libmaus2 xerces-c))
     (native-inputs
-     (list gcc-10 ;Code has C++17 requirements
-           pkg-config))
+     (list pkg-config))
     (home-page "https://gitlab.com/german.tischler/biobambam2")
     (synopsis "Tools for processing BAM files")
     (description "This package contains some tools for processing BAM files
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 4d1d66e87a..d36f7d6bb5 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -44,7 +44,6 @@ (define-module (gnu packages build-tools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages logging)
   #:use-module (gnu packages lua)
@@ -137,7 +136,6 @@ (define-public bear
        ("spdlog" ,spdlog)))
     (native-inputs
      `(("abseil-cpp" ,abseil-cpp)
-       ("gcc-9" ,gcc-9) ; for <filesystem>, #44896
        ("googletest" ,googletest)
        ("openssl" ,openssl)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 718fb20652..c3b6403e02 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1035,8 +1035,6 @@ (define-public magic-enum
                (base32
                 "1x47radgsifgz3vn2561mlvf4cq46ii33cpyqf01znm56iirwq89"))))
     (build-system cmake-build-system)
-    (native-inputs
-     (list gcc-9))
     (synopsis "C++17 header only library for compile time reflection of enums")
     (description "Magic Enum offers static reflection of enums, with
 conversions to and from strings, iteration and related functionality.")
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index d7d0c5874b..7f83d05302 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -29,7 +29,6 @@ (define-module (gnu packages fcitx5)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages enchant)
   #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -129,8 +128,7 @@ (define-public fcitx5
        ("xcb-util-wm" ,xcb-util-wm)
        ("xkeyboard-config" ,xkeyboard-config)))
     (native-inputs
-     (list gcc-9 ; for #include <charconv>
-           extra-cmake-modules pkg-config))
+     (list extra-cmake-modules pkg-config))
     (native-search-paths
      (list (search-path-specification
             (variable "FCITX_ADDON_DIRS")
@@ -177,8 +175,7 @@ (define-public libime
     (inputs
      (list fcitx5 boost))
     (native-inputs
-     (list gcc-9 ;for #include <filesystem> and ld support
-           extra-cmake-modules python))             ;needed to run test
+     (list extra-cmake-modules python))             ;needed to run test
     (home-page "https://github.com/fcitx/libime")
     (synopsis "Library for implementing generic input methods")
     (description "Libime is a library for implementing various input method
@@ -363,7 +360,7 @@ (define-public fcitx5-configtool
        ("gettext" ,gettext-minimal)
        ("iso-codes" ,iso-codes)))
     (native-inputs
-     (list gcc-9 extra-cmake-modules pkg-config))
+     (list extra-cmake-modules pkg-config))
     (home-page "https://github.com/fcitx/fcitx5-configtool")
     (synopsis "Graphical configuration tool for Fcitx 5")
     (description "Fcitx5-configtool is a graphical configuration tool
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index ee28d85602..4810f470aa 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -33,7 +33,6 @@ (define-module (gnu packages ftp)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -188,7 +187,6 @@ (define-public libfilezilla
        (list "--disable-static")))
     (native-inputs
      `(("cppunit" ,cppunit)
-       ("gcc" ,gcc-8)                   ; XXX remove when it's the default
        ("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index d7502dbc29..305c2c2819 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -70,7 +70,6 @@ (define-module (gnu packages game-development)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -1025,8 +1024,7 @@ (define-public libresprite
        ;; Tests are unmaintained
        #:tests? #f))
     (native-inputs
-     `(("gcc@10" ,gcc-10)               ; Requires 8.5 or higher
-       ("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)))
     (inputs
      `(("curl" ,curl)
        ("freetype" ,freetype)
@@ -1622,8 +1620,6 @@ (define-public python-pyxel
     (inputs
      `(("gifsicle" ,gifsicle)
        ("sdl2" ,(sdl-union (list sdl2 sdl2-image)))))
-    (native-inputs
-     (list gcc-10))                  ; for std::filesystem
     (home-page "https://github.com/kitao/pyxel")
     (synopsis "Retro game engine for Python")
     (description "Pyxel is a game engine inspired by retro gaming consoles.
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8cc879c657..f52fcea1f7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4436,7 +4436,6 @@ (define-public openttd
      `(("opengfx" ,openttd-opengfx)
        ("openmsx" ,openttd-openmsx)
        ("opensfx" ,openttd-opensfx)
-       ("gcc" ,gcc-9)                   ; for #include <charconv>
        ,@(package-native-inputs openttd-engine)))))
 
 (define openrct2-title-sequences
@@ -12404,8 +12403,6 @@ (define-public schiffbruch
       (arguments
        `(#:tests? #f                              ; no tests
          #:build-type "Release"))
-      (native-inputs
-       (list gcc-11))                    ; need C++20-compatible compiler
       (inputs
        (list sfml))
       (home-page "https://github.com/sandsmark/Schiffbruch/")
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 0beb7d12e0..09d21c6f95 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -35,7 +35,6 @@ (define-module (gnu packages graph)
   #:use-module (guix build-system r)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bioconductor)
   #:use-module (gnu packages bioinformatics)
@@ -554,8 +553,7 @@ (define-public python-graph-tool
                                      "python"))))
                             "/site-packages/"))))
     (native-inputs
-     `(("gcc-10" ,gcc-10)
-       ("ncurses" ,ncurses)
+     `(("ncurses" ,ncurses)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("boost" ,boost)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index b6378a3890..a4cec470cb 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -63,7 +63,6 @@ (define-module (gnu packages image)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gimp)
   #:use-module (gnu packages gl)
@@ -2053,7 +2052,7 @@ (define-public blurhash
         (base32 "0jy2iigarskwfhskyladbb6l92x1fb3i3vz4bvcks0za4w5hfxk5"))))
     (build-system meson-build-system)
     (native-inputs
-     (list cmake doctest gcc-8))
+     (list cmake doctest))
     (home-page "https://github.com/Nheko-Reborn/blurhash")
     (synopsis "C++ blurhash encoder/decoder")
     (description "Simple encoder and decoder for blurhashes.  Contains a
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 926cf083a2..804e3196c0 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -29,7 +29,6 @@ (define-module (gnu packages jami)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
@@ -439,7 +438,6 @@ (define-public libring
     (native-inputs
      (list autoconf
            automake
-           gcc-8 ;charconv requires GCC 8.1+
            libtool
            perl ;to generate manpages with pod2man
            pkg-config
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 85def0d8f6..ff4d4824eb 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -44,7 +44,6 @@ (define-module (gnu packages lua)
   #:use-module (gnu packages)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages build-tools)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libevent)
@@ -1127,8 +1126,7 @@ (define-public emilua
             "-Denable_manpages=false"
             "-Dversion_suffix=-guix1")))
    (native-inputs
-    (list gcc-10 ; gcc-7 is too old for our C++17 needs
-          luajit-lua52-openresty
+    (list luajit-lua52-openresty
           pkg-config
           re2c
           xxd))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1882f7ae8d..82a0e56947 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -114,7 +114,6 @@ (define-module (gnu packages music)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages game-development)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
@@ -4789,9 +4788,7 @@ (define-public liquidsfz
     (arguments
      `(#:configure-flags '("--enable-shared")))
     (native-inputs
-     (list pkg-config
-           ;; Fails with default gcc (#include <filesystem> not found).
-           gcc-9))
+     (list pkg-config))
     (inputs
      `(("jack" ,jack-2)
        ("lv2" ,lv2)
@@ -6087,9 +6084,7 @@ (define-public geonkick
            redkite
            rapidjson))
     (native-inputs
-     (list lv2
-           ;; Fails with default gcc (#include <filesystem> not found).
-           gcc-9 pkg-config sord))
+     (list lv2 pkg-config sord))
     (synopsis "Percussion synthesizer")
     (description "Geonkick is a synthesizer that can synthesize elements
 of percussion such as kicks, snares, hit-hats, shakers, claps and sticks.
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index d241b65b79..0170712971 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -65,7 +65,6 @@ (define-module (gnu packages pdf)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages game-development)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
@@ -922,7 +921,6 @@ (define-public xournalpp
            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (native-inputs
      `(("cppunit" ,cppunit)
-       ("gcc" ,gcc-8)
        ("gettext" ,gettext-minimal)
        ("help2man" ,help2man)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index cdef088a07..b40332aee8 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2004,8 +2004,7 @@ (define-public sdr++
         (base32 "1xwbz6yyca6wmzad5ykxw6i0r8jzc7i3jbzq7mhp8caiymd6knw3"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list gcc-10 ; A GCC more recent than version 7 is required.
-           pkg-config))
+     (list pkg-config))
     (inputs
      `(("airspyhf" ,airspyhf)
        ("alsa-lib" ,alsa-lib)
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 9c9c5a01a5..1f053c0bd0 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -31,7 +31,6 @@ (define-module (gnu packages telegram)
   #:use-module (gnu packages digest)
   #:use-module (gnu packages fcitx)
   #:use-module (gnu packages fcitx5)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
@@ -130,8 +129,7 @@ (define-public webrtc-for-telegram-desktop
                   (copy-recursively libyuv-from libyuv-to))
                 #t)))))
        (native-inputs
-        `(("gcc" ,gcc-9) ; keep in line with telegram-desktop
-          ("perl" ,perl)
+        `(("perl" ,perl)
           ("pkg-config" ,pkg-config)
           ("python" ,python-wrapper)
           ("yasm" ,yasm)))
@@ -370,7 +368,6 @@ (define-public telegram-desktop
             (base32 "1j3ppgfmihcjl22w5jk8jhwif10i9wbycq5zqnssn6pnhnj7di5i"))))
        ("cmake-shared" ,cmake-shared)
        ("extra-cmake-modules" ,extra-cmake-modules)
-       ("gcc" ,gcc-9)
        ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("gtk+:bin" ,gtk+ "bin")
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index f727fd1613..63fec9be8e 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -56,7 +56,6 @@ (define-module (gnu packages text-editors)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -192,8 +191,7 @@ (define-public kakoune
          (add-before 'build 'chdir
            (lambda _ (chdir "src") #t)))))
     (native-inputs
-     (list gcc-10 ; See https://github.com/mawww/kakoune/issues/4318
-           asciidoc pkg-config ruby))
+     (list asciidoc pkg-config ruby))
     (synopsis "Vim-inspired code editor")
     (description
      "Kakoune is a code editor heavily inspired by Vim, as such most of its
@@ -932,8 +930,7 @@ (define-public scintilla
                (for-each (lambda (f) (install-file f include))
                          (find-files "include/" "."))))))))
     (native-inputs
-     `(("gcc" ,gcc-9)                   ;Code has C++17 requirements
-       ("pkg-config" ,pkg-config)
+     `(("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)))
     (inputs
      (list gtk+))
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index f44a402042..15cad14219 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -43,7 +43,6 @@ (define-module (gnu packages wine)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
@@ -608,10 +607,7 @@ (define dxvk32
                                (string-append (assoc-ref %build-inputs "source")
                                               "/build-wine32.txt"))))
     (native-inputs
-     ;; Since 1.5 dxvk needs gcc-8.1.  See
-     ;; https://github.com/doitsujin/dxvk/issues/1292#issuecomment-567067373.
-     `(("gcc" ,gcc-9)
-       ("glslang" ,glslang)))
+     `(("glslang" ,glslang)))
     (inputs
      `(("wine" ,wine-staging)))
     (synopsis "Vulkan-based D3D9, D3D10 and D3D11 implementation for Wine")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 20f9abec67..c6881154fe 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -93,7 +93,6 @@ (define-module (gnu packages wm)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages gawk)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
@@ -1011,7 +1010,6 @@ (define-public fnott
      (list pkg-config
            wayland-protocols
            tllist
-           gcc-10 ;TODO: Remove when the default compiler is > GCC 7.
            scdoc))
     (inputs
      (list wlroots wayland fcft dbus libpng))