~ruther/guix-local: gnu: Remove unneeded uses of custom GCC versions.

18 files changed, 16 insertions(+), 61 deletions(-)

M gnu/packages/bioinformatics.scm
M gnu/packages/build-tools.scm
M gnu/packages/cpp.scm
M gnu/packages/fcitx5.scm
M gnu/packages/ftp.scm
M gnu/packages/game-development.scm
M gnu/packages/games.scm
M gnu/packages/graph.scm
M gnu/packages/image.scm
M gnu/packages/jami.scm
M gnu/packages/lua.scm
M gnu/packages/music.scm
M gnu/packages/pdf.scm
M gnu/packages/radio.scm
M gnu/packages/telegram.scm
M gnu/packages/text-editors.scm
M gnu/packages/wine.scm
M gnu/packages/wm.scm

M gnu/packages/bioinformatics.scm => gnu/packages/bioinformatics.scm +2 -4

@@ 11450,8 11450,7 @@ contigs alone.")
     (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 @@ and many lower level support classes.
     (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

M gnu/packages/build-tools.scm => gnu/packages/build-tools.scm +0 -2

@@ 44,7 44,6 @@
   #: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 @@ makes a few sacrifices to acquire fast full and incremental build times.")
        ("spdlog" ,spdlog)))
     (native-inputs
      `(("abseil-cpp" ,abseil-cpp)
-       ("gcc-9" ,gcc-9) ; for <filesystem>, #44896
        ("googletest" ,googletest)
        ("openssl" ,openssl)
        ("pkg-config" ,pkg-config)

M gnu/packages/cpp.scm => gnu/packages/cpp.scm +0 -2

@@ 1035,8 1035,6 @@ provides a number of utilities to make coding with expected cleaner.")
                (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.")

M gnu/packages/fcitx5.scm => gnu/packages/fcitx5.scm +3 -6

@@ 29,7 29,6 @@
   #: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 @@ client.")
        ("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 @@ client.")
     (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 @@ including input methods previous bundled inside Fcitx 4:
        ("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

M gnu/packages/ftp.scm => gnu/packages/ftp.scm +0 -2

@@ 33,7 33,6 @@
   #: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 @@ as required.")
        (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

M gnu/packages/game-development.scm => gnu/packages/game-development.scm +1 -5

@@ 70,7 70,6 @@
   #: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 @@ the creation of animations, tiled graphics, texture atlases, and more.")
        ;; 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 @@ games.")
     (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.

M gnu/packages/games.scm => gnu/packages/games.scm +0 -3

@@ 4436,7 4436,6 @@ Transport Tycoon Deluxe.")
      `(("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 @@ available.")
       (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/")

M gnu/packages/graph.scm => gnu/packages/graph.scm +1 -3

@@ 35,7 35,6 @@
   #: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 @@ transformed into common image formats for display or printing.")
                                      "python"))))
                             "/site-packages/"))))
     (native-inputs
-     `(("gcc-10" ,gcc-10)
-       ("ncurses" ,ncurses)
+     `(("ncurses" ,ncurses)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("boost" ,boost)

M gnu/packages/image.scm => gnu/packages/image.scm +1 -2

@@ 63,7 63,6 @@
   #: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 @@ losslessly translates between SNG and PNG.")
         (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

M gnu/packages/jami.scm => gnu/packages/jami.scm +0 -2

@@ 29,7 29,6 @@
   #: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 @@
     (native-inputs
      (list autoconf
            automake
-           gcc-8 ;charconv requires GCC 8.1+
            libtool
            perl ;to generate manpages with pod2man
            pkg-config

M gnu/packages/lua.scm => gnu/packages/lua.scm +1 -3

@@ 44,7 44,6 @@
   #: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 @@ shell command executions.")
             "-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))

M gnu/packages/music.scm => gnu/packages/music.scm +2 -7

@@ 114,7 114,6 @@
   #: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 @@ audio samples and various soft sythesizers.  It can receive input from a MIDI ke
     (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 @@ ZaMultiComp, ZaMultiCompX2 and ZamSynth.")
            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.

M gnu/packages/pdf.scm => gnu/packages/pdf.scm +0 -2

@@ 65,7 65,6 @@
   #: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 @@ using a stylus.")
            (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)))

M gnu/packages/radio.scm => gnu/packages/radio.scm +1 -2

@@ 2004,8 2004,7 @@ various hardware.")
         (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)

M gnu/packages/telegram.scm => gnu/packages/telegram.scm +1 -4

@@ 31,7 31,6 @@
   #: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 @@
                   (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 @@ Telegram project, for its use in telegram desktop client.")
             (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")

M gnu/packages/text-editors.scm => gnu/packages/text-editors.scm +2 -5

@@ 56,7 56,6 @@
   #: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 @@ based command language.")
          (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 @@ Octave.  TeXmacs is completely extensible via Guile.")
                (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+))

M gnu/packages/wine.scm => gnu/packages/wine.scm +1 -5

@@ 43,7 43,6 @@
   #: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 @@ version)")
                                (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")

M gnu/packages/wm.scm => gnu/packages/wm.scm +0 -2

@@ 93,7 93,6 @@
   #: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 @@ experience.")
      (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))