gnu: yq: Update to 4.53.2.

* gnu/packages/textutils.scm (yq): Update to 4.53.2.
[native-inputs]: Remove go-gopkg-in-op-go-logging-v1; add go-golang-org-x-mod.

Change-Id: I96e86ccd6eeca08624e3b75a572205c873d88d3b

.dir-locals.el

@@ -42,11 +42,12 @@
      ;; For use with 'bug-reference-prog-mode'.  Extra bug-reference
      ;; configuration should be done in your Emacs user configuration file;
      ;; refer to (info (guix) The Perfect Setup).
-     (eval . (setq-local bug-reference-bug-regexp
-                         ;; #8545 (issues), !8545 (PRs), guix/guix#8545 and
-                         ;; guix/guix!8545
-                         (rx (group (seq (? "guix/guix") (or "#" "!"))
-                                    (group (one-or-more digit))))))
+     (eval . (setq-local
+              ;; #8545, guix/guix#8545, guix/guix!8545, but not !8545
+              bug-reference-bug-regexp
+              (rx (group (or (seq (zero-or-more "guix/guix") "#")
+                             (seq (one-or-more "guix/guix") "!"))
+                         (group (one-or-more digit))))))
      (bug-reference-url-format . "https://codeberg.org/guix/guix/issues/%s")
 
      (eval . (add-to-list 'completion-ignored-extensions ".go"))

Makefile.am

@@ -1281,14 +1281,6 @@ $(GIT_HOOKS_DIR):
 $(GIT_HOOKS_DIR)/%: etc/git/% | $(GIT_HOOKS_DIR)/
 	if [ -n "$(GIT_HOOKS_DIR)" ]; then cp "$<" "$@"; fi
 
-# Special-case the pre-push hook installation, to ensure it is always
-# up-to-date with its source.
-.PHONY: $(GIT_HOOKS_DIR)/pre-push
-$(GIT_HOOKS_DIR)/pre-push: etc/git/pre-push | $(GIT_HOOKS_DIR)
-	@if [ -n "$(GIT_HOOKS_DIR)" ]; then \
-	  cmp "--silent" "$<" "$@" || cp "$<" "$@"; \
-	fi
-
 $(GIT_CONFIG_FILE): etc/git/gitconfig
 	if [ -n "$(GIT_CONFIG_FILE)" ]; then \
 	  git config --fixed-value --replace-all include.path \

doc/guix.texi

@@ -53,7 +53,7 @@ Copyright @copyright{} 2017, 2019--2026 Maxim Cournoyer@*
 Copyright @copyright{} 2017–2022 Tobias Geerinckx-Rice@*
 Copyright @copyright{} 2017 George Clemmer@*
 Copyright @copyright{} 2017 Andy Wingo@*
-Copyright @copyright{} 2017, 2018, 2019, 2020, 2023, 2024, 2025, 2026 Arun Isaac@*
+Copyright @copyright{} 2017, 2018, 2019, 2020, 2023, 2024, 2025 Arun Isaac@*
 Copyright @copyright{} 2017 nee@*
 Copyright @copyright{} 2018 Rutger Helling@*
 Copyright @copyright{} 2018, 2021, 2023, 2025, 2026 Oleg Pykhalov@*
@@ -124,7 +124,7 @@ Copyright @copyright{} 2023 Thomas Ieong@*
 Copyright @copyright{} 2023 Saku Laesvuori@*
 Copyright @copyright{} 2023 Graham James Addis@*
 Copyright @copyright{} 2023-2025 Tomas Volf@*
-Copyright @copyright{} 2024-2026 Herman Rimm@*
+Copyright @copyright{} 2024, 2025 Herman Rimm@*
 Copyright @copyright{} 2024 Matthew Trzcinski@*
 Copyright @copyright{} 2024 Richard Sent@*
 Copyright @copyright{} 2024 Dariqq@*
@@ -16124,10 +16124,6 @@ the tag name for separating the numbers of the version.
 pre-releases; to make it also look for pre-releases, set the this
 property to @code{#t}.
 
-@item @code{stable-version-regexp}: a regular expression for matching the
-version string, if specified the updater will pick the latest version from
-matching ones when the @option{--target-version} option is omitted.
-
 @end itemize
 
 @lisp
@@ -16714,12 +16710,6 @@ guix lint @var{options} @var{package}@dots{}
 @end example
 
 If no package is given on the command line, then all packages are checked.
-To check packages in particular source files, the syntax is:
-
-@example
-guix lint @var{options} --whole-file @var{file}@dots{}
-@end example
-
 The @var{options} may be zero or more of the following:
 
 @table @code
@@ -16757,23 +16747,9 @@ Only enable the checkers that do not depend on Internet access.
 Add @var{directory} to the front of the package module search path
 (@pxref{Package Modules}).
 
-@item --whole-file
-@itemx -f
-Check the top-level package definitions in the given files; subsequent
-arguments are treated as file names rather than package names.  This
-option also enables a special checker which checks if a package
-alphabetically succeeds the one above it.
+This allows users to define their own packages and make them visible to
+the command-line tools.
 
-For example, to check if the packages in @file{gnu/packages/matrix.scm}
-are sorted alphabetically, and if the package names therein follow
-established conventions, run:
-
-@example
-guix lint -c name -f gnu/packages/matrix.scm
-@end example
-
-The previous two options allow users to define their own packages and
-make them visible to the command-line tools.
 @end table
 
 @node Invoking guix size
@@ -36765,16 +36741,13 @@ The Mumi package to use.
 Data directory to store Debbugs data from upstream Debbugs instance.
 
 @item @code{rsync-remote}
-Remote rsync path from which to download Debbugs data.
+Remote rsync path from which to download Debbugs data.  The remote is
+polled every 5 minutes, unless a previous instance of rsync is already
+running.
 
 @item @code{rsync-flags} (default: @code{'()})
 Additional flags to pass to @command{rsync}.
 
-@item @code{rsync-and-index-event} (default: @code{#~(calendar-event #:minutes '#$(iota 12 0 5))})
-Shepherd calendar event to run the rsync and indexing timer at.  By
-default, this is once every 5 minutes.  The timer job is not run if an
-earlier instance of it is still running.
-
 @item @code{mailer?} (default: @code{#true})
 Whether to enable or disable the mailer component.
 

etc/git/commit-msg

@@ -1,4 +1,5 @@
 #!/bin/sh
+# From Gerrit Code Review 3.11.1.
 #
 # Part of Gerrit Code Review (https://www.gerritcodereview.com/)
 #
@@ -69,9 +70,9 @@ dest="$1.tmp.${random}"
 
 trap 'rm -f "$dest" "$dest-2"' EXIT
 
-if ! sed -e '/>8/q' "$1" | git stripspace --strip-comments > "${dest}" ; then
-  echo "cannot strip comments from $1"
-  exit 1
+if ! cat "$1" | sed -e '/>8/q' | git stripspace --strip-comments > "${dest}" ; then
+   echo "cannot strip comments from $1"
+   exit 1
 fi
 
 if test ! -s "${dest}" ; then
@@ -90,7 +91,7 @@ else
   pattern=".*"
 fi
 
-if git interpret-trailers --no-divider --parse < "$1" | grep -q "^$token: $pattern$" ; then
+if git interpret-trailers --parse < "$1" | grep -q "^$token: $pattern$" ; then
   exit 0
 fi
 
@@ -98,7 +99,6 @@ fi
 # sentinel at the end to make sure there is one.
 # Avoid the --in-place option which only appeared in Git 2.8
 if ! git interpret-trailers \
-         --no-divider \
          --trailer "Signed-off-by: SENTINEL" < "$1" > "$dest-2" ; then
   echo "cannot insert Signed-off-by sentinel line in $1"
   exit 1
@@ -110,7 +110,6 @@ fi
 # Avoid the --in-place option which only appeared in Git 2.8
 # Avoid the --where option which only appeared in Git 2.15
 if ! git -c trailer.where=before interpret-trailers \
-         --no-divider \
          --trailer "Signed-off-by: $token: $value" < "$dest-2" |
      sed -e "s/^Signed-off-by: \($token: \)/\1/" \
          -e "/^Signed-off-by: SENTINEL/d" > "$dest" ; then

gnu/local.mk

@@ -1967,7 +1967,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mswebrtc-cmake.patch			\
   %D%/packages/patches/mtools-mformat-uninitialized.patch	\
   %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
-  %D%/packages/patches/musl-CVE-2026-40200.patch		\
+  %D%/packages/patches/musl-cross-locale.patch			\
   %D%/packages/patches/mutt-store-references.patch		\
   %D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch	\
   %D%/packages/patches/nanosvg-prusa-slicer.patch		\
@@ -1993,7 +1993,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/nhc98-c-update.patch			\
   %D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch	\
   %D%/packages/patches/nix-dont-build-html-doc.diff		\
-  %D%/packages/patches/nlohmann_json_fix_char8_t.patch		\
   %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch	\
   %D%/packages/patches/neovim-tree-sitter-grammar-path.patch	\
   %D%/packages/patches/network-manager-plugin-ownership.patch	\
@@ -2024,6 +2023,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch	\
   %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch	\
   %D%/packages/patches/ocaml-4.09-multiple-definitions.patch	\
+  %D%/packages/patches/ogs-6.5.7-netcdfconverter.patch \
   %D%/packages/patches/omake-fix-non-determinism.patch	\
   %D%/packages/patches/oneko-remove-nonfree-characters.patch	\
   %D%/packages/patches/onetbb-other-arches.patch	\
@@ -2628,7 +2628,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/x265-arm-flags.patch			\
   %D%/packages/patches/x265-4-arm-flags.patch			\
   %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\
-  %D%/packages/patches/xdmf-3.0.0-hdf5.patch \
   %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
   %D%/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch		\
   %D%/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch		\

gnu/packages/admin.scm

@@ -144,7 +144,7 @@
   #:use-module (gnu packages elf)
   #:use-module (gnu packages file)
   #:use-module (gnu packages file-systems)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
@@ -2979,7 +2979,7 @@ system is under heavy load.")
 (define-public stress-ng
   (package
     (name "stress-ng")
-    (version "0.21.01")
+    (version "0.20.01")
     (source
      (origin
        (method git-fetch)
@@ -2988,7 +2988,7 @@ system is under heavy load.")
              (commit (string-append "V" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "11w8xjm53lgnxfvg286lavqjh0il3bfr1fsgyk915167r4vlabqq"))))
+        (base32 "1jkinrxh9ppv7xfii9xlisnd2679wnj4ljq12h8y0nvwrm8fkm0b"))))
     (build-system gnu-build-system)
     (arguments
      ;; XXX The test suite seems to cause instability on the VisionFive 2
@@ -4434,7 +4434,7 @@ buffers.")
 (define-public igt-gpu-tools
   (package
     (name "igt-gpu-tools")
-    (version "2.4")
+    (version "2.3")
     (source
      (origin
        (method git-fetch)
@@ -4443,7 +4443,7 @@ buffers.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ijvfa5wamihzbl8l29sc27ml0kmgzlld83jm5mln6bb4bvny4gs"))))
+        (base32 "1vyqrsvxraib98r4i6cjmxq7nis480s2ns95v78dscygcci42i8a"))))
     (build-system meson-build-system)
     (arguments
      `(#:tests? #f              ; many of the tests try to load kernel modules
@@ -4461,7 +4461,6 @@ buffers.")
            libdrm
            libpciaccess
            libunwind
-           pciutils
            procps
            python))
     (native-inputs
@@ -7072,7 +7071,7 @@ network, which causes enabled computers to power on.")
 (define-public witr
   (package
     (name "witr")
-    (version "0.3.2")
+    (version "0.3.1")
     (source
      (origin
        (method git-fetch)
@@ -7081,7 +7080,7 @@ network, which causes enabled computers to power on.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "06vxrgd0j2v6s4snmyviwpp66hm5zai7xca9318inhyg4jw3ngg5"))))
+        (base32 "03v9n4mdvqm0knqjl4s64321i5clqpmlrlkkdb87glzb9p28sg00"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -7228,38 +7227,6 @@ has a focus on performance.  It can be used as a greeter by starting
 it from @file{~/.bashrc} for example.")
     (license license:agpl3+)))
 
-(define-public zeptofetch
-  (package
-    (name "zeptofetch")
-    (version "1.21")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.archlinux.org/gurov/zeptofetch")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1f1dm9nrp0z0prqy90csrkbk98ixp0jx76ax473qb0qsbb7ys4g7"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; No tests available.
-      #:make-flags
-      #~(list (string-append "PREFIX="
-                             #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)))) ; No configure script.
-    (home-page "https://gitlab.archlinux.org/gurov/zeptofetch")
-    (synopsis
-     "Fast, minimal system information tool for Linux.")
-    (description
-     "This package provides a system fetch tool, similar to
-@command{neofetch}, @command{fastfetch}, etc.  It is lightweight and
-has a focus on performance.")
-    (license license:gpl3+)))
-
 (define-public zzz
   (package
     (name "zzz")

gnu/packages/algebra.scm

@@ -52,7 +52,7 @@
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)

gnu/packages/apparmor.scm

@@ -22,7 +22,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages dejagnu)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages linux)

gnu/packages/assembly.scm

@@ -50,7 +50,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)

gnu/packages/astronomy.scm

@@ -66,7 +66,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages fortran-xyz)
   #:use-module (gnu packages freedesktop)

gnu/packages/audio.scm

@@ -103,7 +103,7 @@
   #:use-module (gnu packages elf)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)

gnu/packages/authentication.scm

@@ -152,8 +152,10 @@ PSKC (RFC6030) to manage secret key data.")
                (list "Test2LOFlow/curl._2lo"
                      "Test3LOFlow/curl._3lo"
                      "Test3LOFlow/fetch._3lo_cached"
+                     "Test3LOFlow/fetch._3lo_insert_expired_token_into_cache"
                      "Test3LOLoopbackFlow/curl._3lo_loopback"
                      "Test3LOLoopbackFlow/fetch._3lo_loopback_cached"
+                     "Test3LOLoopbackFlow/fetch._3lo_loopback_insert_expired_token_into_cache"
                      "TestCLI/info._invalid_token"
                      "TestSSOFlow/fetch._sso"
                      "TestSSOFlow/fetch._sso._old_interface"

gnu/packages/backup.scm

@@ -910,7 +910,6 @@ is like a time machine for your data.")
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.25
       #:install-source? #f
       #:import-path "github.com/restic/restic/cmd/restic"
       #:unpack-path "github.com/restic/restic"

gnu/packages/bioinformatics.scm

@@ -96,7 +96,7 @@
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages dlang)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gd)
@@ -6710,20 +6710,20 @@ meso, or continuum scale.")
                 "09693dmf1scdac5pyq6qyn8b4mcipvnmc370k9a5z41z81m3dcsj"))))
     (build-system gnu-build-system)
     (arguments
-     (list
-       #:test-target "test"
+     `(#:test-target "test"
        #:tests? #f ; tests require access to the web
        #:make-flags
-       #~(list "CC=gcc"
-               (string-append "prefix=" #$output))
+       ,#~(list "CC=gcc"
+                (string-append "prefix=" #$output))
        #:phases
-       #~(modify-phases %standard-phases
+       (modify-phases %standard-phases
          (delete 'configure))))
     (inputs
      (list zlib curl))
     (native-inputs
-     (list doxygen
-           python)) ;for tests
+     `(("doxygen" ,doxygen)
+       ;; Need for tests
+       ("python" ,python-2)))
     (home-page "https://github.com/dpryan79/libBigWig")
     (synopsis "C library for handling bigWig files")
     (description
@@ -17839,99 +17839,94 @@ once.  This package provides tools to perform Drop-seq analyses.")
     (license license:expat)))
 
 (define-public pigx-rnaseq
-  (let ((commit "1605b541da090e13d58dae6fed38ae8dda09f002"))
-    (package
-      (name "pigx-rnaseq")
-      (version (git-version "0.1.1" "0" commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/BIMSBbioinfo/pigx_rnaseq/")
-                       (commit commit)
-                       (recursive? #true)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1j5c0wlasmxvz9z64yga56m2hhbybl149kknsrpvmq0v2gl31rn5"))))
-      (build-system gnu-build-system)
-      (arguments
-       (list
-        #:parallel-tests? #f             ; not supported
-        #:phases
-        '(modify-phases %standard-phases
-           ;; "test.sh" runs the whole pipeline, which takes a long time and
-           ;; might fail due to OOM.  The MultiQC is also resource intensive.
-           (add-after 'unpack 'disable-resource-intensive-test
-             (lambda _
-               (substitute* "Makefile.am"
-                 (("^  tests/test_multiqc/test.sh.*") "")
-                 (("^  tests/test_hisat2/test.sh.*") "  tests/test_hisat2/test.sh\n")
-                 (("^  test.sh") ""))))
-           (add-before 'bootstrap 'autoreconf
-             (lambda _
-               (invoke "autoreconf" "-vif")))
-           (add-before 'configure 'set-PYTHONPATH
-             (lambda _
-               (setenv "PYTHONPATH" (getenv "GUIX_PYTHONPATH"))))
-           (add-before 'check 'set-timezone
-             ;; The readr package is picky about timezones.
-             (lambda* (#:key inputs #:allow-other-keys)
-               (setenv "TZ" "UTC+1")
-               (setenv "TZDIR"
-                       (search-input-directory inputs
-                                               "share/zoneinfo"))))
-           (add-before 'check 'pre-check
-             (lambda _
-               ;; Needed for tests
-               (setenv "HOME" "/tmp"))))))
-      (inputs
-       (list coreutils
-             sed
-             gzip
-             snakemake
-             megadepth
-             multiqc
-             star-for-pigx
-             hisat2
-             fastp
-             htseq
-             samtools
-             r-minimal
-             r-rmarkdown
-             r-genomeinfodb
-             r-ggplot2
-             r-ggpubr
-             r-ggrepel
-             r-gprofiler2
-             r-deseq2
-             r-dt
-             r-knitr
-             r-pheatmap
-             r-corrplot
-             r-reshape2
-             r-plotly
-             r-scales
-             r-summarizedexperiment
-             r-crosstalk
-             r-tximport
-             r-rtracklayer
-             r-rjson
-             salmon
-             pandoc
-             python-wrapper
-             python-deeptools
-             python-pyyaml))
-      (native-inputs
-       (list tzdata automake autoconf))
-      (home-page "https://bioinformatics.mdc-berlin.de/pigx/")
-      (synopsis "Analysis pipeline for RNA sequencing experiments")
-      (description "PiGX RNAseq is an analysis pipeline for preprocessing and
+  (package
+    (name "pigx-rnaseq")
+    (version "0.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/BIMSBbioinfo/pigx_rnaseq/"
+                                  "releases/download/v" version
+                                  "/pigx_rnaseq-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0mlas0srl04mvgsyydm67gg5syijf1k2f6dy7bdqqxc70fywfd08"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:parallel-tests? #f             ; not supported
+       #:phases
+       (modify-phases %standard-phases
+         ;; "test.sh" runs the whole pipeline, which takes a long time and
+         ;; might fail due to OOM.  The MultiQC is also resource intensive.
+         (add-after 'unpack 'disable-resource-intensive-test
+           (lambda _
+             (substitute* "Makefile.in"
+               (("^  tests/test_multiqc/test.sh") "")
+               (("^  test.sh") ""))))
+         (add-before 'bootstrap 'autoreconf
+           (lambda _
+             (invoke "autoreconf" "-vif")))
+         (add-before 'configure 'set-PYTHONPATH
+           (lambda _
+             (setenv "PYTHONPATH" (getenv "GUIX_PYTHONPATH"))))
+         (add-before 'check 'set-timezone
+           ;; The readr package is picky about timezones.
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "TZ" "UTC+1")
+             (setenv "TZDIR"
+                     (search-input-directory inputs
+                                             "share/zoneinfo"))))
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; Needed for tests
+             (setenv "HOME" "/tmp"))))))
+    (inputs
+     (list coreutils
+           sed
+           gzip
+           snakemake-7
+           megadepth
+           multiqc
+           star-for-pigx
+           hisat2
+           fastp
+           htseq
+           samtools
+           r-minimal
+           r-rmarkdown
+           r-genomeinfodb
+           r-ggplot2
+           r-ggpubr
+           r-ggrepel
+           r-gprofiler2
+           r-deseq2
+           r-dt
+           r-knitr
+           r-pheatmap
+           r-corrplot
+           r-reshape2
+           r-plotly
+           r-scales
+           r-summarizedexperiment
+           r-crosstalk
+           r-tximport
+           r-rtracklayer
+           r-rjson
+           salmon
+           pandoc
+           python-wrapper
+           python-deeptools
+           python-pyyaml))
+    (native-inputs
+     (list tzdata automake autoconf))
+    (home-page "https://bioinformatics.mdc-berlin.de/pigx/")
+    (synopsis "Analysis pipeline for RNA sequencing experiments")
+    (description "PiGX RNAseq is an analysis pipeline for preprocessing and
 reporting for RNA sequencing experiments.  It is easy to use and produces high
 quality reports.  The inputs are reads files from the sequencing experiment,
 and a configuration file which describes the experiment.  In addition to
 quality control of the experiment, the pipeline produces a differential
 expression report comparing samples in an easily configurable manner.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public pigx-chipseq
   (package
@@ -18002,7 +17997,7 @@ expression report comparing samples in an easily configurable manner.")
            fastqc
            bowtie
            idr
-           snakemake
+           snakemake-7
            samtools
            bedtools
            kentutils))
@@ -18020,87 +18015,80 @@ in an easily configurable manner.")
     (license license:gpl3+)))
 
 (define-public pigx-bsseq
-  (let ((commit "1b3a69bd5363fa882af4193215de7fb475bae066"))
-    (package
-      (name "pigx-bsseq")
-      (version (git-version "0.1.10" "0" commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/BIMSBbioinfo/pigx_bsseq/")
-                       (commit commit)
-                       (recursive? #true)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0r0gjfycgh1hqba7ma03bwxlvr2kz68yzclx5iba3wrxxqmivil6"))))
-      (build-system gnu-build-system)
-      (arguments
-       (list
-        ;; TODO: tests currently require 12+GB of RAM.  See
-        ;; https://github.com/BIMSBbioinfo/pigx_bsseq/issues/164
-        #:tests? #f
-        #:phases
-        '(modify-phases %standard-phases
-           ;; This file is meant for development, but it interferes with
-           ;; Makefile.
-           (add-after 'unpack 'delete-GNUmakefile
-             (lambda _ (delete-file "GNUmakefile")))
-           (add-before 'configure 'set-PYTHONPATH
-             (lambda _
-               (setenv "PYTHONPATH" (getenv "GUIX_PYTHONPATH"))))
-           (add-before 'check 'set-timezone
-             ;; The readr package is picky about timezones.
-             (lambda* (#:key inputs #:allow-other-keys)
-               (setenv "TZ" "UTC+1")
-               (setenv "TZDIR"
-                       (search-input-directory inputs
-                                               "share/zoneinfo"))))
-           (add-before 'check 'pre-check
-             (lambda _
-               ;; Needed for tests
-               (setenv "HOME" "/tmp"))))))
-      (native-inputs
-       (list tzdata-for-tests autoconf automake))
-      (inputs
-       (list coreutils
-             sed
-             grep
-             r-minimal
-             r-annotationhub
-             r-dt
-             r-genomation
-             r-ggbio
-             r-ggrepel
-             r-matrixstats
-             r-methylkit
-             r-reshape2
-             r-rtracklayer
-             r-rmarkdown
-             r-bookdown
-             r-ggplot2
-             r-ggbio
-             pandoc
-             python-wrapper
-             python-pyyaml
-             snakemake
-             bismark
-             bowtie
-             bwa-meth
-             fastqc
-             methyldackel
-             multiqc
-             trim-galore
-             cutadapt
-             samblaster
-             samtools))
-      (home-page "https://bioinformatics.mdc-berlin.de/pigx/")
-      (synopsis "Bisulfite sequencing pipeline from fastq to methylation reports")
-      (description "PiGx BSseq is a data processing pipeline for raw fastq read
+  (package
+    (name "pigx-bsseq")
+    (version "0.1.10")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/BIMSBbioinfo/pigx_bsseq/"
+                                  "releases/download/v" version
+                                  "/pigx_bsseq-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1vy3mhbrfdnjbhikwg3mgkfnwnzk96a1n27cxrr7gsffpmz9q6wa"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      ;; TODO: tests currently require 12+GB of RAM.  See
+      ;; https://github.com/BIMSBbioinfo/pigx_bsseq/issues/164
+      #:tests? #f
+      #:phases
+      '(modify-phases %standard-phases
+         (add-before 'configure 'set-PYTHONPATH
+           (lambda _
+             (setenv "PYTHONPATH" (getenv "GUIX_PYTHONPATH"))))
+         (add-before 'check 'set-timezone
+           ;; The readr package is picky about timezones.
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "TZ" "UTC+1")
+             (setenv "TZDIR"
+                     (search-input-directory inputs
+                                             "share/zoneinfo"))))
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; Needed for tests
+             (setenv "HOME" "/tmp"))))))
+    (native-inputs
+     (list tzdata-for-tests))
+    (inputs
+     (list coreutils
+           sed
+           grep
+           r-minimal
+           r-annotationhub
+           r-dt
+           r-genomation
+           r-ggbio
+           r-ggrepel
+           r-matrixstats
+           r-methylkit
+           r-reshape2
+           r-rtracklayer
+           r-rmarkdown
+           r-bookdown
+           r-ggplot2
+           r-ggbio
+           pandoc
+           python-wrapper
+           python-pyyaml
+           snakemake-7
+           bismark
+           bowtie
+           bwa-meth
+           fastqc
+           methyldackel
+           multiqc
+           trim-galore
+           cutadapt
+           samblaster
+           samtools))
+    (home-page "https://bioinformatics.mdc-berlin.de/pigx/")
+    (synopsis "Bisulfite sequencing pipeline from fastq to methylation reports")
+    (description "PiGx BSseq is a data processing pipeline for raw fastq read
 data of bisulfite experiments; it produces reports on aggregate methylation
 and coverage and can be used to produce information on differential
 methylation and segmentation.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public pigx-scrnaseq
   (package
@@ -18144,7 +18132,7 @@ methylation and segmentation.")
            python-loompy
            pandoc
            samtools
-           snakemake-6
+           snakemake-5
            star-for-pigx
            r-minimal
            r-argparser
@@ -18273,7 +18261,7 @@ based methods.")
            r-tidyr
            r-viridis
            samtools
-           snakemake
+           snakemake-7
            wget))
     (home-page "https://bioinformatics.mdc-berlin.de/pigx/")
     (synopsis "Analysis pipeline for wastewater sequencing")

gnu/packages/bison.scm

@@ -28,7 +28,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (srfi srfi-1))
 
 (define-public bison

gnu/packages/bootloaders.scm

@@ -55,7 +55,7 @@
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages firmware)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)

gnu/packages/build-tools.scm

@@ -76,7 +76,7 @@
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages re2c)
   #:use-module (gnu packages regex)
   #:use-module (gnu packages rpc)
   #:use-module (gnu packages serialization)

gnu/packages/c.scm

@@ -63,6 +63,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages perl)

gnu/packages/cdrom.scm

@@ -52,7 +52,7 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages docbook)

gnu/packages/chemistry.scm

@@ -46,7 +46,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages fortran-xyz)

gnu/packages/chicken.scm

@@ -20,113 +20,65 @@
 
 (define-module (gnu packages chicken)
   #:use-module (gnu packages)
-  #:use-module (gnu packages bash)
-  #:use-module (guix gexp)
   #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (guix build-system chicken)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix svn-download)
   #:use-module ((guix licenses)
-                #:prefix license:)
-  #:use-module (srfi srfi-1))
+                #:prefix license:))
 
-;; This package is build from pre-built C source code, provided in the CHICKEN
-;; release tarball.  Based on this bootstrap compiler, we build CHICKEN from
-;; the Scheme source, thus enabling us to (at least) patch it.
-;;
-;; See <https://issues.guix.gnu.org/22366>.
-(define-public chicken-bootstrap
-  (hidden-package
-   (package
-     (name "chicken-bootstrap")
-     (version "5.4.0")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append "https://code.call-cc.org/releases/"
-                                   version "/chicken-" version ".tar.gz"))
-               (sha256
-                (base32
-                 "0pzcrnzkjw2sa44vy59wbygvlc3nva8zisprkdnvyrqi3jk4lp9w"))))
-     (build-system gnu-build-system)
-     (arguments
-      `(#:modules ((guix build gnu-build-system)
-                   (guix build utils)
-                   (srfi srfi-1))
-
-        ;; No `configure' script; run "make check" after "make install" as
-        ;; prescribed by README.
-        #:phases
-        (modify-phases %standard-phases
-          (delete 'configure)
-          (delete 'check)
-          (add-after 'install 'check
-            (assoc-ref %standard-phases 'check)))
-
-        #:make-flags (let ((out (assoc-ref %outputs "out")))
-                       (list "PLATFORM=linux"
-                             (string-append "PREFIX=" out)
-                             (string-append "VARDIR=" out "/var/lib")))
-
-        ;; Parallel builds are not supported, as noted in README.
-        #:parallel-build? #f))
-     (native-search-paths
-      (list (search-path-specification
-             (variable "CHICKEN_REPOSITORY_PATH")
-             ;; TODO extract binary version into a module level definition.
-             (files (list "var/lib/chicken/11")))))
-     ;; Reference gcc-toolchain lazily to avoid circular module dependency
-     ;; problems.
-     (propagated-inputs (list (module-ref (resolve-interface
-                                           '(gnu packages commencement))
-                                          'gcc-toolchain)))
-     (home-page "https://www.call-cc.org/")
-     (synopsis "R5RS Scheme implementation that compiles native code via C")
-     (description
-      "CHICKEN is a compiler for the Scheme programming language.  CHICKEN
-pr oduces portable and efficient C, supports almost all of the R5RS Scheme
-la nguage standard, and includes many enhancements and extensions.")
-     (license license:bsd-3))))
-
-;; The CHICKEN compiler is itself written in CHICKEN, the CHICKEN release
-;; tarballs includes auto-generated C code to mitigate the compiler
-;; bootstrapping problem.  To be able to patch the original Scheme source,
-;; we compile from this Scheme source here using the chicken-bootstrap
-;; compiler obtained from the autogenerated C code.
-;;
-;; See <https://issues.guix.gnu.org/22366>.
 (define-public chicken
   (package
-    (inherit chicken-bootstrap)
     (name "chicken")
+    (version "5.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://code.call-cc.org/releases/"
+                                  version "/chicken-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pzcrnzkjw2sa44vy59wbygvlc3nva8zisprkdnvyrqi3jk4lp9w"))))
+    (build-system gnu-build-system)
     (arguments
-     (substitute-keyword-arguments (package-arguments chicken-bootstrap)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            ;; CHICKEN contains auto-generated C code, remove it and
-            ;; compile from the Scheme source using chicken-bootstrap.
-            (add-after 'unpack 'remove-auto-generated-code
-              (lambda _
-                (invoke "make" "spotless")))
-            ;; Invoke commands by name, not by path.
-            ;;
-            ;; See <https://codeberg.org/guix/guix/issues/8471>.
-            (add-after 'unpack 'fix-paths
-              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((sh (search-input-file inputs "/bin/sh"))
-                      (cp (search-input-file inputs "/bin/cp")))
-                  (substitute* "egg-compile.scm"
-                    (("/bin/sh") sh)
-                    (("\"cp\"") (string-append "\"" cp "\"")))
-                  (substitute* "posixunix.scm"
-                    (("/bin/sh") sh))
-                  (substitute* "chicken-install.scm"
-                    (("\"sh \"") (string-append "\"" sh " \""))))))))))
-    (inputs (list chicken-bootstrap))
-    (properties
-     (alist-delete 'hidden? (package-properties chicken-bootstrap)))))
+     `(#:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (srfi srfi-1))
+
+       ;; No `configure' script; run "make check" after "make install" as
+       ;; prescribed by README.
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'check)
+         (add-after 'install 'check
+           (assoc-ref %standard-phases 'check)))
+
+       #:make-flags (let ((out (assoc-ref %outputs "out")))
+                      (list "PLATFORM=linux"
+                            (string-append "PREFIX=" out)
+                            (string-append "VARDIR=" out "/var/lib")))
+
+       ;; Parallel builds are not supported, as noted in README.
+       #:parallel-build? #f))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "CHICKEN_REPOSITORY_PATH")
+            ;; TODO extract binary version into a module level definition.
+            (files (list "var/lib/chicken/11")))))
+    ;; Reference gcc-toolchain lazily to avoid circular module dependency
+    ;; problems.
+    (propagated-inputs (list (module-ref (resolve-interface
+                                          '(gnu packages commencement))
+                                         'gcc-toolchain)))
+    (home-page "https://www.call-cc.org/")
+    (synopsis "R5RS Scheme implementation that compiles native code via C")
+    (description
+     "CHICKEN is a compiler for the Scheme programming language.  CHICKEN
+produces portable and efficient C, supports almost all of the R5RS Scheme
+language standard, and includes many enhancements and extensions.")
+    (license license:bsd-3)))
 
 (define-public chicken-compile-file
   (package

gnu/packages/clojure.scm

@@ -23,24 +23,19 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages clojure)
+  #:use-module (gnu packages)
   #:use-module (gnu packages base)
-  #:use-module (gnu packages golang-build)
-  #:use-module (gnu packages golang-check)
-  #:use-module (gnu packages golang-xyz)
-  #:use-module (gnu packages golang)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages java)
   #:use-module (gnu packages maven)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system ant)
-  #:use-module (guix build-system clojure)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system go)
-  #:use-module (guix download)
   #:use-module (guix gexp)
-  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system ant)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system clojure))
 
 (define-public clojure-spec-alpha
   (package
@@ -1258,44 +1253,3 @@ an operation on the service. invoke takes a map and returns a map, and works
 the same way for every operation on every service.")
     (home-page "https://github.com/cognitect-labs/aws-api")
     (license license:asl2.0)))
-
-(define-public let-go
-  (package
-    (name "let-go")
-    (version "1.7.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/nooga/let-go")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "139a129fw3w9a4bcfgms60ll90vy2vmqinbmjn44zmgx4fr2adif"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:go go-1.26
-      #:install-source? #f
-      #:import-path "github.com/nooga/let-go"))
-    (native-inputs
-     (list go-github-com-davecgh-go-spew
-           go-github-com-alimpfard-line
-           go-github-com-hashicorp-go-uuid
-           go-github-com-kr-pretty
-           go-github-com-pmezard-go-difflib
-           go-github-com-stretchr-testify
-           go-github-com-zeebo-bencode
-           go-golang-org-x-sys
-           go-gopkg-in-check-v1
-           go-gopkg-in-yaml-v3))
-    (home-page "https://nooga.github.io/let-go")
-    (synopsis "Clojure dialect written in Go")
-    (description
-     "let-go is a Clojure dialect with a bytecode compiler and a stack virtual
-machine, written in the Go programming language.
-
-It is not a drop-in replacement for Clojure JVM.  It does not load JARs and
-does not aim to.  Most idiomatic Clojure code runs unmodified, but a real
-project with library dependencies will need adjustments.")
-    (license license:expat)))

gnu/packages/cluster.scm

@@ -32,7 +32,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages docbook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)

gnu/packages/cobol.scm

@@ -25,7 +25,7 @@
   #:use-module (guix gexp)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)

gnu/packages/code.scm

@@ -66,7 +66,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages emacs)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages golang-build)

gnu/packages/commencement.scm

@@ -42,7 +42,7 @@
   #:use-module (gnu packages m4)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages multiprecision)

gnu/packages/compiler-tools.scm

@@ -1,11 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2014, 2019, 2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016, 2024-2025 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017, 2020, 2021 Sergei Trofimovich <slyfox@inbox.ru>
-;;; Copyright © 2018, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
-;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2025 Alexey Abramov <levenson@mmer.org>
+;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024-2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2025 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -25,21 +22,14 @@
 
 (define-module (gnu packages compiler-tools)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages bison)
   #:use-module (gnu packages gawk)
-  #:use-module (gnu packages m4)
-  #:use-module (gnu packages man)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (srfi srfi-1))
+  #:use-module (guix packages))
 
 (define-public byacc
   (package
@@ -75,59 +65,6 @@ consist of a set of LALR(1) parsing tables and a driver routine written in the
 C programming language.")
     (license license:public-domain)))
 
-(define-public flex
-  (package
-    (name "flex")
-    (version "2.6.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/westes/flex"
-             "/releases/download/v" version "/"
-             "flex-" version ".tar.gz"))
-       (sha256
-        (base32
-         "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))))
-    (build-system gnu-build-system)
-    (arguments
-     (if (%current-target-system)
-         (list #:configure-flags
-               #~'("ac_cv_func_malloc_0_nonnull=yes"
-                   "ac_cv_func_realloc_0_nonnull=yes"))
-         '()))
-    (native-inputs
-     (list help2man
-           ;; m4 is not present in PATH when cross-building
-           m4))
-    (inputs
-     (list
-      (package
-        (inherit bison)
-        (arguments
-         ;; Disable tests, since they require flex.
-         (substitute-keyword-arguments arguments
-           ((#:tests? _ #f) #f)))
-        (inputs (modify-inputs inputs
-                  (delete "flex"))))))
-    (propagated-inputs (list m4))
-    (home-page "https://github.com/westes/flex")
-    (synopsis "Fast lexical analyser generator")
-    (description
-     "Flex is a tool for generating scanners.  A scanner, sometimes
-called a tokenizer, is a program which recognizes lexical patterns in
-text.  The flex program reads user-specified input files, or its standard
-input if no file names are given, for a description of a scanner to
-generate.  The description is in the form of pairs of regular expressions
-and C code, called rules.  Flex generates a C source file named,
-\"lex.yy.c\", which defines the function yylex().  The file \"lex.yy.c\"
-can be compiled and linked to produce an executable.  When the executable
-is run, it analyzes its input for occurrences of text matching the
-regular expressions for each rule.  Whenever it finds a match, it
-executes the corresponding C code.")
-    (license (license:non-copyleft "file://COPYING"
-                                   "See COPYING in the distribution."))))
-
 (define-public oyacc
   (package
     (name "oyacc")
@@ -175,42 +112,3 @@ besides libc.")
     (description
      "This package provides the @command{yacc} command, implemented as a
 symbolic link to the @command{oyacc} command from the same-named package.")))
-
-(define-public re2c
-  (package
-    (name "re2c")
-    (version "4.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/skvadrik/" name
-                           "/releases/download/" version "/"
-                           name "-" version ".tar.xz"))
-       (sha256
-        (base32
-         "07ysqgdm0h566a8lwnpdgycp93vz7zskzihsgah3bla0ycj2pp69"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests?
-      (not (or (%current-target-system)
-               ;; TODO: run_tests.py hangs
-               (system-hurd?)))
-      #:phases
-      (if (target-arm32?)
-          #~(modify-phases %standard-phases
-              (add-after 'unpack 'patch-sources
-                (lambda _
-                  (invoke "patch" "-p1" "--force" "--input"
-                          #$(local-file (search-patch
-                                         "re2c-Use-maximum-alignment.patch"))))))
-          #~%standard-phases)))
-    (native-inputs
-     (list python))             ; for the test driver
-    (home-page "https://re2c.org/")
-    (synopsis "Lexer generator")
-    (description
-     "@code{re2c, Regular Expressions to Code} is a flexible lexical analyser.
-Instead of using traditional table-driven approaches, it encodes a finite
-state machine directly in the code in the form of jumps and comparisons.")
-    (license license:public-domain)))

gnu/packages/compression.scm

@@ -42,7 +42,6 @@
 ;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2024, 2025 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2026 Jake Forster <jakecameron.forster@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3192,33 +3191,3 @@ exported by the zlib library.")
 ratio at the cost of high CPU/memory usage.")
     (home-page "https://github.com/byronknoll/cmix")
     (license license:gpl3)))
-
-(define-public zlib-ng
-  (package
-    (name "zlib-ng")
-    (version "2.3.3")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/zlib-ng/zlib-ng")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0g4pxy7gc1slw9n6j583hzps32mml30f08gmmg1adsq4y3dl2cny"))))
-    (build-system cmake-build-system)
-    (native-inputs (list googletest))
-    (home-page "https://github.com/zlib-ng/zlib-ng")
-    (synopsis "Fork of the zlib data compression library")
-    (description
-     "zlib-ng is a @code{zlib} replacement with optimizations for next
-generation systems.")
-    (license license:zlib)))
-
-(define-public zlib-ng-compat
-  (package/inherit zlib-ng
-    (name "zlib-ng-compat")
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags flags #~(list))
-        #~(cons "-DZLIB_COMPAT=ON" #$flags))))))

gnu/packages/coq.scm

@@ -35,7 +35,7 @@
   #:use-module (gnu packages boost)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages emacs)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ocaml)

gnu/packages/coreboot.scm

@@ -23,7 +23,7 @@
 (define-module (gnu packages coreboot)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages pciutils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cargo)

gnu/packages/cpp.scm

@@ -53,7 +53,6 @@
 ;;; Copyright © 2025 Murilo <murilo@disroot.org>
 ;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
-;;; Copyright © 2026 bdunahu <bdunahu@operationnull.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1434,9 +1433,6 @@ data transfer object.")
 (define-public nlohmann-json
   (package
     (name "nlohmann-json")
-    ;; XXX: Merge related package `nlohmann-json-no-char8-t' back into here when
-    ;; updating from 3.12.0, as the unique patch it applies will already be
-    ;; incorporated in.
     (version "3.12.0")
     (home-page "https://github.com/nlohmann/json")
     (source
@@ -1510,46 +1506,6 @@ intuitive syntax and trivial integration.")
 (define-deprecated-package json-modern-cxx
   nlohmann-json)
 
-(define-public nlohmann-json-no-char8-t
-  (package
-    ;; XXX: Version 3.12.0 does not work without char8_t support.
-    ;; OpenRCT2 compiles with -fno-char8_t, and thus requires this patch.
-    ;; See https://github.com/nlohmann/json/pull/4736
-    (inherit nlohmann-json)
-    (name "nlohmann-json-no-char8-t")
-    (version "3.12.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference (url "https://github.com/nlohmann/json")
-                           (commit (string-append "v" version))))
-       (sha256
-        (base32 "09nqq56ighr3lghhn3fs399lkllghz717j0xyp87x0giw86ayh3h"))
-       (file-name (git-file-name name version))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            ;; Delete bundled software.  Preserve doctest_compatibility.h, which
-            ;; is a wrapper library added by this package.
-            (install-file "./tests/thirdparty/doctest/doctest_compatibility.h"
-                          "/tmp")
-            (delete-file-recursively "./tests/thirdparty")
-            (install-file "/tmp/doctest_compatibility.h"
-                          "./tests/thirdparty/doctest")
-
-            ;; Adjust for the unbundled fifo_map and doctest.
-            (substitute* (find-files "./tests/" "\\.h(pp)?")
-              (("#include \"doctest\\.h\"") "#include <doctest/doctest.h>")
-              (("#include <doctest\\.h>") "#include <doctest/doctest.h>"))
-            (with-directory-excursion "tests/src"
-              (let ((files (find-files "." "\\.cpp$")))
-                (substitute* files
-                  (("#include ?\"(fifo_map.hpp)\"" all fifo-map-hpp)
-                   (string-append
-                    "#include <fifo_map/" fifo-map-hpp ">")))))))
-       (patches
-        (search-patches "nlohmann_json_fix_char8_t.patch"))))))
-
 (define-public jthread
   (let ((commit "0fa8d394254886c555d6faccd0a3de819b7d47f8")
         (revision "0"))
@@ -4524,29 +4480,6 @@ file name and location, as well as filters with friendly names (such as
        "This package provides a simple S-Expression parser for C++.")
       (license license:gpl3+))))
 
-(define-public sfl-library
-  (package
-    (name "sfl-library")
-    (version "2.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/slavenf/sfl-library")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ngy86b9y1b8a4j37c14m1jrg0q5b12jj8b0gdnpl5sjb1r2fljk"))))
-    (build-system cmake-build-system)
-    (arguments (list #:tests? #f))              ;no tests
-    (home-page "https://github.com/slavenf/sfl-library")
-    (synopsis "Header-only C++11/20 container library")
-    (description "sfl-library provides many STL-like (Standard Template Library)
-containers including vectors, associative containers, and unordered containers
-based on hash tables.  These containers are designed for C++11 and C++20
-constant expression usage.")
-    (license license:zlib)))
-
 (define-public string-view-lite
   (package
     (name "string-view-lite")

gnu/packages/databases.scm

@@ -32,7 +32,7 @@
 ;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
 ;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
-;;; Copyright © 2018, 2021-2023, 2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2018, 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us>
 ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
@@ -109,7 +109,7 @@
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages emacs)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gcc)
@@ -131,7 +131,6 @@
   #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages jemalloc)
-  #:use-module (gnu packages kerberos)
   #:use-module (gnu packages language)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libevent)
@@ -148,7 +147,6 @@
   #:use-module (gnu packages networking)
   #:use-module (gnu packages node)
   #:use-module (gnu packages onc-rpc)
-  #:use-module (gnu packages openldap)
   #:use-module (gnu packages openstack)
   #:use-module (gnu packages pantheon)
   #:use-module (gnu packages parallel)
@@ -177,7 +175,6 @@
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages ruby-check)
   #:use-module (gnu packages ruby-xyz)
-  #:use-module (gnu packages security-token)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages ssh)
@@ -1186,81 +1183,50 @@ autocompletion and syntax highlighting.")
 auto-completion and syntax highlighting.")
     (license license:bsd-3)))
 
+;; XXX When updating, check whether boost-for-mysql is still needed.
+;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past.
 (define-public mysql
   (package
     (name "mysql")
-    (version "9.7.0")
+    (version "5.7.33")
     (source (origin
               (method url-fetch)
               (uri (list (string-append
-                          "https://cdn.mysql.com/Downloads/MySQL-"
+                          "https://dev.mysql.com/get/Downloads/MySQL-"
                           (version-major+minor version) "/"
+                          name "-" version ".tar.gz")
+                         (string-append
+                          "https://downloads.mysql.com/archives/get/file/"
                           name "-" version ".tar.gz")))
               (sha256
                (base32
-                "0v9hc8yzp0f5pwl4kr1a8k7lwyf62g95klxb6avfrc2npjx79dbl"))
-              (modules '((guix build utils)
-                         (ice-9 ftw)
-                         (srfi srfi-26)))
-              (snippet
-               #~(begin
-                   (define (delete-all-but directory . preserve)
-                     (with-directory-excursion directory
-                       (let* ((pred (negate (cut member <>
-                                                 (cons* "." ".." preserve))))
-                              (items (scandir "." pred)))
-                         (for-each (cut delete-file-recursively <>) items))))
-
-                   ;; Delete bundled source libraries.
-                   (delete-all-but "extra"
-                                   ;; XXX: The build system doesn't currently
-                                   ;; support unbundling these.
-                                   "json" ;used by bundled opentelemetry
-                                   "libbacktrace"
-                                   "libcno"
-                                   "opentelemetry-cpp"
-                                   "opentelemetry-proto"
-                                   "rapidjson"
-                                   "unordered_dense"
-                                   "xxhash")))))
+                "1bb343mf7n0qg2qz497gxjsqprygrjz1q1pbz76hgqxnsy08sfxd"))))
     (build-system cmake-build-system)
     (arguments
      (list
-      #:tests? #f          ;FIXME: teach build system to use system googletest
       #:configure-flags
       #~(list "-DBUILD_CONFIG=mysql_release"
-              "-DWITH_AUTHENTICATION_LDAP=ON"
-              "-DWITH_AUTHENTICATION_WEBAUTHN=ON"
-              "-DWITH_BENCHMARK=OFF"
-              ;; XXX: BUILD_ID is disabled so that the INFO_BIN target is not
-              ;; run; this target relies on running mysqld before it is
-              ;; installed, which fails in our case.
-              "-DWITH_BUILD_ID=OFF"
-              "-DWITH_FIDO=system"
-              "-DWITH_SYSTEM_LIBS=ON"
-              "-DWITH_UNIT_TESTS=OFF"   ;avoid bundled googletest
-              "-DREPRODUCIBLE_BUILD=ON"
+              "-DWITH_SSL=system"
+              "-DWITH_ZLIB=system"
+              "-DDEFAULT_CHARSET=utf8"
+              "-DDEFAULT_COLLATION=utf8_general_ci"
               "-DMYSQL_DATADIR=/var/lib/mysql"
               "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-              "-DINSTALL_INFODIR=share/info"
+              "-DINSTALL_INFODIR=share/mysql/docs"
               "-DINSTALL_MANDIR=share/man"
               "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+              "-DINSTALL_SCRIPTDIR=bin"
               "-DINSTALL_INCLUDEDIR=include/mysql"
               "-DINSTALL_DOCREADMEDIR=share/mysql/docs"
               "-DINSTALL_SUPPORTFILESDIR=share/mysql"
               "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-              "-DINSTALL_MYSQLTESTDIR=OFF"
               "-DINSTALL_DOCDIR=share/mysql/docs"
-              "-DINSTALL_SHAREDIR=share/mysql")
+              "-DINSTALL_SHAREDIR=share/mysql"
+              ;; Get rid of test data.
+              "-DINSTALL_MYSQLTESTDIR="
+              "-DINSTALL_SQLBENCHDIR=")
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'configure 'disable-broken-abi-check
-            (lambda _
-              ;; The ABI check started failing with MySQL 9.7.0 for unknown
-              ;; reasons.
-              (substitute* "cmake/abi_check.cmake"
-                (("RUN_ABI_CHECK 1")
-                 "RUN_ABI_CHECK 0"))))
           (add-after 'install 'remove-extra-binaries
             (lambda _
               ;; Remove the 3 *_embedded files, which weigh in at
@@ -1287,51 +1253,35 @@ auto-completion and syntax highlighting.")
                            (dirname coreutils)
                            (dirname grep)
                            (dirname ps)
-                           (dirname sed)))))))
-          (add-after 'install 'fix-permissions
-            ;; XXX: Otherwise, the guix daemon reports: "suspicious ownership
-            ;; or permission on `/gnu/store/...-mysql-9.7.0'; rejecting this
-            ;; build output".
-            (lambda _
-              (chmod #$output #o755))))))
+                           (dirname sed))))))))))
     (native-inputs
      (list bison perl pkg-config))
     (inputs
      (list bash-minimal
-           boost
+           boost-for-mysql
            coreutils
-           curl
-           cyrus-sasl
            gawk
            grep
-           icu4c
            libaio
-           libedit
-           libfido2
            libtirpc
-           lz4
-           mit-krb5
            ncurses
-           openldap
-           openssl
-           protobuf
+           openssl-1.1
            procps
            rpcsvc-proto                 ; rpcgen
            sed
-           zlib
-           `(,zstd "lib")))
+           zlib))
     (home-page "https://www.mysql.com/")
     (synopsis "Fast, easy to use, and popular database")
     (description
      "MySQL is a fast, reliable, and easy to use relational database
 management system that supports the standardized Structured Query
 Language.")
-    (license license:gpl2)))    ;v2 only -- see 'Election of GPLv2' in LICENSE
+    (license license:gpl2)))
 
 (define-public mysql-connector-python
   (package
     (name "mysql-connector-python")
-    (version "9.7.0")
+    (version "8.3.0")
     (source
      (origin
        (method git-fetch)
@@ -1340,23 +1290,66 @@ Language.")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0zdm35apj1cfraxwlqfmr04pm87qpw73ilb8p88cn08zsa8q11hg"))))
+        (base32 "18jvpnnwmfrn961rvqmsygp7dw3spf3swhxhal4hhj5hqddckj5f"))))
     (build-system pyproject-build-system)
     (arguments
      (list
+      ;; tests: 1371 passed
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'compatibility
+            (lambda _
+              (substitute* "src/mysql_capi.c"
+                (("res = mysql_options\\(&self->session, MYSQL_OPT_LOAD_DATA_LOCAL_DIR.*")
+                 "res = 0;")
+                (("mysql_options\\(&self->session, MYSQL_OPT_LOAD_DATA_LOCAL_DIR.*")
+                 "")
+                (("mysql_options\\(&self->session, MYSQL_OPT_TLS_CIPHERSUITES.*")
+                 "")
+                ;; The C API does not have mysql_bind_param, so we produce an
+                ;; error here.
+                (("status = mysql_bind_param.*") "status = 1;")
+                (("#include \"mysql_capi_conversion\\.h\"" all)
+                 (string-append all "\n" "#include <stdbool.h>")))))
           (add-after 'unpack 'chdir
             (lambda _
-              ;; Our protobuf is too old for the mysqlx dev API, so use the
-              ;; classic one without the C modules.
               (chdir "mysql-connector-python")))
+          (add-before 'build 'prepare-build
+            (lambda _
+              (setenv "MYSQL_CAPI" #$(this-package-input "mysql"))))
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
               (when tests?
                 ;; Some of these tests might be failing due to the build
                 ;; container's restrictions, others are due to the version
                 ;; mismatch.
+                (substitute* "tests/cext/test_cext_api.py"
+                  (("def test_change_user") "def _do_not_test_change_user")
+                  (("def test_get_character_set_info")
+                   "def _do_not_test_get_character_set_info"))
+                (substitute* "tests/test_bugs.py"
+                  (("def test_change_user") "def _do_not_test_change_user")
+                  (("def test_lost_connection") "def _do_not_test_lost_connection")
+                  (("def test_kill_query") "def _do_not_test_kill_query")
+                  ;; These all fail because of expired certificates.
+                  (("def test_cext_verify_server_certificate")
+                   "def _do_not_test_cext_verify_server_certificate")
+                  (("def test_pure_verify_server_certificate")
+                   "def _do_not_test_pure_verify_server_certificate")
+                  (("def test_verify_server_name_cext_cnx")
+                   "def _do_not_test_verify_server_name_cext_cnx")
+                  (("def test_verify_server_name_pure_cnx")
+                   "def _do_not_test_verify_server_name_pure_cnx"))
+                (substitute* '("tests/test_connection.py"
+                               "tests/test_aio_connection.py")
+                  (("def test_allow_local_infile_in_path")
+                   "def _do_not_test_allow_local_infile_in_path")
+                  ;; This fails because of expired certificates.
+                  (("def test_connect_with_unix_socket")
+                   "def _do_not_test_connect_with_unix_socket"))
+                (substitute* "tests/test_constants.py"
+                  (("def test_deprecated")
+                   "def _do_not_test_deprecated"))
                 (mkdir-p "/tmp/datadir")
                 (invoke "python3" "unittests.py"
                         "--verbosity=3"
@@ -1364,8 +1357,9 @@ Language.")
                         "--keep"
                         "--mysql-topdir=/tmp/datadir"
                         "--unix-socket=/tmp/datadir")))))))
+    (propagated-inputs (list python-protobuf))
+    (inputs (list mysql protobuf-3.20 openssl-1.1 zlib))
     (native-inputs (list python-setuptools))
-    (inputs (list mysql openssl zlib `(,zstd "lib")))
     (home-page "https://dev.mysql.com/doc/connector-python/en/index.html")
     (synopsis "MySQL driver written in Python")
     (description "MySQL Connector/Python enables Python programs to access
@@ -1672,14 +1666,14 @@ and high-availability (HA).")
 (define-public postgresql-17
   (package
     (name "postgresql")
-    (version "17.10")
+    (version "17.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                   version "/postgresql-" version ".tar.bz2"))
               (sha256
                (base32
-                "144cb40gn1lasvz0jvz4i72mda8k7pm1bx6azq2vggfddm8h72h7"))
+                "1dg9labqgph2idaypb8khdvbag29pr3h4bqv5w8k7kgc08rk97pg"))
               (patches (search-patches
                         "postgresql-disable-normalize_exec_path.patch"))))
     (build-system gnu-build-system)
@@ -1742,14 +1736,14 @@ pictures, sounds, or video.")
   (package
     (inherit postgresql-17)
     (name "postgresql")
-    (version "16.14")
+    (version "16.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                   version "/postgresql-" version ".tar.bz2"))
               (sha256
                (base32
-                "0w9lgsn03m4k0v3m622v7fk3gqbfbjvwv34mrrc0i4ip4wa7gl7n"))
+                "0hib575m9x3z8c71gkcv9jsyq77d3qk7q2zgzvfy6clwrvs8b16y"))
               (patches (search-patches
                         "postgresql-disable-normalize_exec_path.patch"))))
     (arguments
@@ -1773,14 +1767,14 @@ pictures, sounds, or video.")
   (package
     (inherit postgresql-16)
     (name "postgresql")
-    (version "15.18")
+    (version "15.15")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                   version "/postgresql-" version ".tar.bz2"))
               (sha256
                (base32
-                "1d13qckpslfqamdmp23q3rbzxlp1rqwszylilyllpsp3gzwhvpqi"))
+                "1ais46b2ij38y75i1w336as03pybyndsd2pp2q8gdjq9igmsllsp"))
               (patches (search-patches
                         "postgresql-disable-resolve_symlinks.patch"))))
     (native-inputs (modify-inputs native-inputs
@@ -1793,7 +1787,6 @@ pictures, sounds, or video.")
     (inherit postgresql-15)
     (name "postgresql")
     (version "14.20")
-    (replacement postgresql-14.23)
     (source (origin
               (inherit (package-source postgresql-15))
               (uri (string-append "https://ftp.postgresql.org/pub/source/v"
@@ -1802,19 +1795,6 @@ pictures, sounds, or video.")
                (base32
                 "0sv45dsmyplfys6dfdjdwmrczl46s82x35xdh311nxj02q7z29vm"))))))
 
-(define-public postgresql-14.23
-  (package
-    (inherit postgresql-14)
-    (name "postgresql")
-    (version "14.23")
-    (source (origin
-              (inherit (package-source postgresql-14))
-              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
-                                  version "/postgresql-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "19clihp73ak2p5di90jhg50lqjkkr0iy349gkki30qsl5f11cwnc"))))))
-
 (define-deprecated/public postgresql-13 #f
   (package
     (inherit postgresql-14)

gnu/packages/datalog.scm

@@ -20,7 +20,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages python)

gnu/packages/debug.scm

@@ -58,7 +58,7 @@
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages digest)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gdb)

gnu/packages/dictionaries.scm

@@ -56,7 +56,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages education)
   #:use-module (gnu packages emacs)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)

gnu/packages/dns.scm

@@ -56,7 +56,7 @@
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)

gnu/packages/docker.scm

@@ -216,7 +216,6 @@ projects.")
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.25
       #:embed-files #~(list ".*\\.json")
       #:import-path "github.com/moby/policy-helpers"))
     (native-inputs

gnu/packages/documentation.scm

@@ -57,7 +57,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages docbook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gettext)

gnu/packages/dotnet.scm

@@ -29,7 +29,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages base)

gnu/packages/education.scm

@@ -42,7 +42,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)

gnu/packages/electronics.scm

@@ -90,7 +90,7 @@
   #:use-module (gnu packages elf)
   #:use-module (gnu packages embedded)
   #:use-module (gnu packages engineering)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
@@ -1021,7 +1021,7 @@ files.")
 (define-public klayout
   (package
     (name "klayout")
-    (version "0.30.9")
+    (version "0.30.8")
     (source
      (origin (method git-fetch)
              (uri (git-reference
@@ -1030,7 +1030,7 @@ files.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-               "1v5ddw7xixvdc3qshd0lkrc3ayk2q5wkk1zbhvsidq0kzlqbr2z5"))))
+               "0aw0y5k27pslql9pir6nplapj6ml6fkhzd815s13rlnw3bm0fcs6"))))
     (build-system copy-build-system)
     (arguments
      (list
@@ -2207,7 +2207,7 @@ which allows one to install the M8 firmware on any Teensy.")
 (define-public magic
   (package
     (name "magic")
-    (version "8.3.652")
+    (version "8.3.644")
     (source
      (origin
        (method git-fetch)
@@ -2216,7 +2216,7 @@ which allows one to install the M8 firmware on any Teensy.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "07q2lldcq6zb1apa5d3paciha92r6jlp7xny8pc31f56k5s9jnmz"))))
+        (base32 "0qp1alm4pczfm77r8lxwgzrwh02ihvfmk9sbwjlfbrixg1dn85xb"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -2312,7 +2312,7 @@ coverage.")
 (define-public netgen
   (package
     (name "netgen")
-    (version "1.5.320")
+    (version "1.5.319")
     (source
      (origin
        (method git-fetch)
@@ -2321,7 +2321,7 @@ coverage.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "11mvf0nrsfc1lxbgqhmczi0maw4n10lib2xqnhpkyy73ci489147"))))
+        (base32 "16xd2xcsny1bb6yk4lz34jfpwfb5xi2i9izxjymmalnzhg32i9cz"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -4376,7 +4376,7 @@ input and outputs an XML dataset.")
 (define-public qucs-s
   (package
     (name "qucs-s")
-    (version "26.1.1")                  ;update qucsator-rf accordingly
+    (version "26.1.0")                  ;update qucsator-rf accordingly
     (source
      (origin
        (method git-fetch)
@@ -4386,7 +4386,7 @@ input and outputs an XML dataset.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "009siqmn76r2l17hnjqmr6ap8nw969hd5fyqigb4p3i8cvjq7gmx"))))
+         "0aiyrcrxln4v6qm2dmigb54wl0mj499q3g18pz87m1s2lfgicpb1"))))
     (build-system qt-build-system)
     (arguments
      (list

gnu/packages/emacs-xyz.scm

@@ -4547,6 +4547,43 @@ boilerplate code from defining new Flymake backend functions.")
     (description "This package adds Clojure syntax checker clj-kondo.")
     (license license:gpl3+)))
 
+(define-public emacs-flymake-shellcheck
+  ;; No tag, version grabbed from source .el file.
+  (let ((commit "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7")
+        (revision "1"))
+    (package
+      (name "emacs-flymake-shellcheck")
+      (version (git-version "0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/federicotdn/flymake-shellcheck")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl"))))
+      (build-system emacs-build-system)
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'substitute-shellcheck-path
+             (lambda* (#:key inputs #:allow-other-keys)
+               (make-file-writable "flymake-shellcheck.el")
+               (emacs-substitute-sexps "flymake-shellcheck.el"
+                 ("defcustom flymake-shellcheck-path"
+                  `(or (executable-find "shellcheck")
+                       ,(search-input-file inputs "bin/shellcheck")))))))))
+      (inputs
+       (list shellcheck))
+      (home-page "https://github.com/federicotdn/flymake-shellcheck")
+      (synopsis "Flymake backend for Bash/Sh powered by ShellCheck")
+      (description
+       "This package provides a backend for Flymake to use the
+tool ShellCheck for static analyzing @command{bash} and @command{sh}
+scripts.")
+      (license license:gpl3+))))
+
 (define-public emacs-a
   (package
     (name "emacs-a")
@@ -5266,39 +5303,6 @@ to prevent advertisers from tracking you when you open URLs (or listen to
 podcasts) in Emacs.")
       (license (list license:gpl3+)))))
 
-(define-public emacs-emcp
-  (let ((commit "a91016452ef73813ea4a7e84cde233176d87a97f")
-        (revision "0"))
-    (package
-      (name "emacs-emcp")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://codeberg.org/martenlienen/emcp")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "08wbpj95l38fsdihxhgryb74psl11agw5n9swnpf1j3qyhwa13cn"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:test-command
-        #~(list "emacs" "-Q" "-batch"
-                "-l" "emcp-tests.el"
-                "-f"
-                "ert-run-tests-batch-and-exit")))
-      (propagated-inputs
-       (list emacs-elisp-refs emacs-magit emacs-http-server))
-      (home-page "https://codeberg.org/martenlienen/emcp")
-      (synopsis "Emacs MCP client")
-      (description
-       "@code{emacs-emcp} is an Emacs client for the @acronym{Model Context
-Protocol, MCP}, designed to connect LLM agents directly to Emacs.")
-      (license license:gpl3+))))
-
 (define emacs-emms-print-metadata
   (package
     (name "emacs-emms-print-metadata")
@@ -16790,51 +16794,6 @@ line program.")
 requests library that uses the url library.")
       (license license:gpl2+))))
 
-(define-public emacs-http-server
-  (let ((commit "00e746baf4a622a7545b4af5c5237a55d51f801b")
-        (revision "0"))
-    (package
-      (name "emacs-http-server")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://codeberg.org/martenlienen/http-server.el")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "0j7ls15ljk22qxy6hs2qzcjnbdfvrq4qwly8s6kfbczi74mw5iji"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:test-command
-        #~(list "emacs" "-Q" "-batch"
-                "-l" "http-server.el"
-                "-l" "http-server-ws.el"
-                "-l" "http-server-tests.el"
-                "-l" "http-server-ws-tests.el"
-                "--eval"
-                (string-append
-                 "(ert-run-tests-batch-and-exit "
-                 "'(and (not http-server-accepts-extra-methods)
-                        (not http-server-rejects-unsupported-methods)))"))
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'build-info-manual
-              (lambda _
-                (invoke "makeinfo" "--no-split"
-                        "-o" "http-server.info" "docs/http-server.texi"))))))
-      (native-inputs
-       (list emacs-package-lint emacs-plz emacs-websocket texinfo))
-      (home-page "https://codeberg.org/martenlienen/http-server.el")
-      (synopsis "Emacs HTTP server")
-      (description
-       "This library implements an HTTP server inside of Emacs to communicate
-with the user or other external programs.")
-      (license license:gpl3+))))
-
 (define-public emacs-rtfm-mode
   (package
    (name "emacs-rtfm-mode")
@@ -42120,7 +42079,7 @@ add popup descriptions to existing keymaps
 (define-public emacs-forgejo
   (package
     (name "emacs-forgejo")
-    (version "0.2.3")
+    (version "0.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -42129,7 +42088,7 @@ add popup descriptions to existing keymaps
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1c8s8a0hwb44jddxsrd74bh8rwaz8z5mn9ga8jmwxy7w045xfln1"))))
+                "0hf4sckxdygxa84g3pi3m2qy16ngx76jsrf192q5l4fppsyirnws"))))
     (build-system emacs-build-system)
     (arguments
      (list #:lisp-directory "lisp"

gnu/packages/embedded.scm

@@ -57,7 +57,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages dejagnu)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages guile)

gnu/packages/emulators.scm

@@ -81,7 +81,7 @@
   #:use-module (gnu packages engineering)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages file-systems)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)

gnu/packages/engineering.scm

@@ -113,7 +113,7 @@
   #:use-module (gnu packages emacs-build)
   #:use-module (gnu packages emacs-xyz)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)

gnu/packages/esolangs.scm

@@ -24,7 +24,7 @@
 (define-module (gnu packages esolangs)
   #:use-module (gnu packages)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)

gnu/packages/fabric-management.scm

@@ -30,7 +30,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages linux)

gnu/packages/file-systems.scm

@@ -78,7 +78,7 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)

gnu/packages/finance.scm

@@ -99,7 +99,7 @@
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages emacs-xyz)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)

gnu/packages/firmware.scm

@@ -68,7 +68,7 @@
   #:use-module (gnu packages elf)
   #:use-module (gnu packages embedded)
   #:use-module (gnu packages flashing-tools)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)

gnu/packages/flashing-tools.scm

@@ -72,7 +72,7 @@
   #:use-module (gnu packages electronics)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages embedded)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang-xyz)

gnu/packages/flex.scm

@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
+;;; Copyright © 2012, 2013, 2014, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,9 +19,65 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages flex)
-  #:use-module (gnu packages compiler-tools)
-  #:use-module (guix deprecation))
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages man)
+  #:use-module (gnu packages bison)
+  #:use-module (srfi srfi-1))
 
-;; XXX: Deprecated on 2026-05-28.
-(define-deprecated/public-alias flex
-  (@ (gnu packages compiler-tools) flex))
+(define-public flex
+  (package
+    (name "flex")
+    (version "2.6.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/westes/flex"
+                    "/releases/download/v" version "/"
+                    "flex-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))))
+    (build-system gnu-build-system)
+    (inputs
+     (let ((bison-for-tests
+            (package
+              (inherit bison)
+              (arguments
+               ;; Disable tests, since they require flex.
+               (substitute-keyword-arguments arguments
+                 ((#:tests? _ #f) #f)))
+              (inputs (alist-delete "flex" (package-inputs bison))))))
+       `(("bison" ,bison-for-tests))))
+    (arguments
+     (if (%current-target-system)
+         (list #:configure-flags
+               #~'("ac_cv_func_malloc_0_nonnull=yes"
+                   "ac_cv_func_realloc_0_nonnull=yes"))
+         '()))
+    ;; m4 is not present in PATH when cross-building
+    (native-inputs
+     (list help2man m4))
+    (propagated-inputs (list m4))
+    (home-page "https://github.com/westes/flex")
+    (synopsis "Fast lexical analyser generator")
+    (description
+     "Flex is a tool for generating scanners.  A scanner, sometimes
+called a tokenizer, is a program which recognizes lexical patterns in
+text.  The flex program reads user-specified input files, or its standard
+input if no file names are given, for a description of a scanner to
+generate.  The description is in the form of pairs of regular expressions
+and C code, called rules.  Flex generates a C source file named,
+\"lex.yy.c\", which defines the function yylex().  The file \"lex.yy.c\"
+can be compiled and linked to produce an executable.  When the executable
+is run, it analyzes its input for occurrences of text matching the
+regular expressions for each rule.  Whenever it finds a match, it
+executes the corresponding C code.")
+    (license (non-copyleft "file://COPYING"
+                           "See COPYING in the distribution."))))

gnu/packages/fonts.scm

@@ -335,14 +335,14 @@ mediums.")
     (version "4.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/rsms/inter/releases/download/"
-             "v" version "/Inter-" version ".zip"))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/rsms/inter")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "07miarbl5ain7pg7sxlrb2j4m9prbriacyqpv1mvckwxlkagv0wq"))))
+        (base32 "1g54vl3jkpan0s1mzrb1s8zjqzy9787ffjg9sfy6yjy4k3qg8xhx"))))
     (build-system font-build-system)
-    (outputs '("out" "ttf" "woff"))
     (home-page "https://rsms.me/inter")
     (synopsis "Variable font family optimized for screen readability")
     (description
@@ -400,30 +400,6 @@ Lisnoti is available in regular, italic, bold and bold-italic
 variants.")
       (license license:silofl1.1))))
 
-(define-public font-literata
-  (package
-    (name "font-literata")
-    (version "3.103")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/googlefonts/literata")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1nnr5y6fz7da06ihinmna2a1g79q8l41bgr62l6jpl43p1dw93dn"))))
-    (build-system font-build-system)
-    (outputs (list "out" "woff"))
-    (home-page "https://github.com/googlefonts/literata")
-    (synopsis "Contemporary serif typeface for long-form reading")
-    (description
-     "Literata is a serif screen font family.  It was conceived for intensive
-editorial use, especially on screens of all sorts.  Its main potential is in
-digital publishing, whether on the web, electronic press, or mobile
-applications.")
-    (license license:silofl1.1)))
-
 (define-public font-inconsolata
   (package
     (name "font-inconsolata")

gnu/packages/fontutils.scm

@@ -52,7 +52,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages docbook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)

gnu/packages/games.scm

@@ -144,7 +144,7 @@
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages emulators)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
@@ -6148,22 +6148,39 @@ have a steep learning curve.")))
 (define-public openrct2-title-sequences
   (package
    (name "openrct2-title-sequences")
-   (version "0.4.26")
+   (version "0.1.2")
    (source
     (origin
      (method url-fetch)
-     (uri (string-append "https://github.com/OpenRCT2/title-sequences"
-                         "/releases/download/v" version
-                         "/title-sequences.zip"))
+     (uri (string-append "https://github.com/OpenRCT2/title-sequences/releases/download/v"
+                         version "/title-sequence-v" version ".zip"))
      (file-name (string-append name "-" version ".zip"))
      (sha256
       (base32
-       "0n680llpcyzl22bbphp9diz4m86gz2rn97yxlky44qspn63rgfys"))))
-   (build-system copy-build-system)
+       "0qbyxrsw8hlgaq0r5d7lx7an3idy4qbfv7yiw9byhldk763n9cfw"))))
+   (build-system trivial-build-system)
+   (native-inputs
+    `(("bash" ,bash)
+      ("coreutils" ,coreutils)
+      ("unzip" ,unzip)))
    (arguments
-    (list #:install-plan #~'(("." "/share/openrct2/title-sequences"))))
-   (native-inputs (list unzip))
-   (home-page "https://openrct2.io")
+    `(#:modules ((guix build utils))
+      #:builder
+      (begin
+        (use-modules (guix build utils))
+        (let* ((out (assoc-ref %outputs "out"))
+               (openrct2-title-sequences (string-append out
+                                         "/share/openrct2/title-sequences"))
+               (source (assoc-ref %build-inputs "source"))
+               (unzip (search-input-file %build-inputs "/bin/unzip")))
+          (copy-file source (string-append ,name "-" ,version ".zip"))
+          (invoke unzip (string-append ,name "-" ,version ".zip"))
+          (delete-file (string-append ,name "-" ,version ".zip"))
+          (mkdir-p openrct2-title-sequences)
+          (copy-recursively "."
+                            openrct2-title-sequences)
+          #t))))
+   (home-page "https://github.com/OpenRCT2/OpenRCT2")
    (synopsis "Title sequences for OpenRCT2")
    (description
     "openrct2-title-sequences is a set of title sequences for OpenRCT2.")
@@ -6173,22 +6190,38 @@ have a steep learning curve.")))
 (define-public openrct2-objects
   (package
    (name "openrct2-objects")
-   (version "1.7.9")
+   (version "1.0.20")
    (source
     (origin
      (method url-fetch)
-     (uri (string-append "https://github.com/OpenRCT2/objects"
-                         "/releases/download/v" version "/objects.zip"))
+     (uri (string-append "https://github.com/OpenRCT2/objects/releases/download/v"
+                         version "/objects.zip"))
      (file-name (string-append name "-" version ".zip"))
      (sha256
-      (base32 "1mpa4vpgs4m9izak8h5rkfcn80jbcm2di717k97g30kf1k91wijm"))))
-   (build-system copy-build-system)
+      (base32 "1q7a38kcwrfijav6app1gf253yfv8b0rljbkah8040y6i7snw9mw"))))
+   (build-system trivial-build-system)
+   (native-inputs
+    `(("bash" ,bash)
+      ("coreutils" ,coreutils)
+      ("unzip" ,unzip)))
    (arguments
-    ;; zip has multiple top-level directories to install.
-    (list #:install-plan #~'((".." "/share/openrct2/objects"
-                              #:exclude ("environment-variables")))))
-   (native-inputs (list unzip))
-   (home-page "https://openrct2.io")
+    `(#:modules ((guix build utils))
+      #:builder
+      (begin
+        (use-modules (guix build utils))
+        (let* ((out (assoc-ref %outputs "out"))
+               (openrct2-objects (string-append out
+                                         "/share/openrct2/objects"))
+               (source (assoc-ref %build-inputs "source"))
+               (unzip (search-input-file %build-inputs "/bin/unzip")))
+          (copy-file source (string-append ,name "-" ,version ".zip"))
+          (invoke unzip (string-append ,name "-" ,version ".zip"))
+          (delete-file (string-append ,name "-" ,version ".zip"))
+          (mkdir-p openrct2-objects)
+          (copy-recursively "."
+                            openrct2-objects)
+          #t))))
+   (home-page "https://github.com/OpenRCT2/OpenRCT2")
    (synopsis "Objects for OpenRCT2")
    (description
     "openrct2-objects is a set of objects for OpenRCT2.")
@@ -6284,7 +6317,7 @@ that follows two aliens who come to Earth in search of a stolen artifact.")
 (define-public openrct2
   (package
     (name "openrct2")
-    (version "0.5.0")
+    (version "0.3.3")
     (source
      (origin
        (method git-fetch)
@@ -6293,88 +6326,53 @@ that follows two aliens who come to Earth in search of a stolen artifact.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0pxlk3a8akl0ghcbqqq5xw8chmxss7kwbvi52ixfqri68n46srxh"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            (with-directory-excursion "src/thirdparty"
-              (for-each delete-file-recursively
-                        '("quickjs-ng" "sfl")))
-            (substitute* "src/openrct2/CMakeLists.txt"
-              ;; use sys quickjs for scripting features
-              (("if \\(ENABLE_SCRIPTING\\)") "if (false)")
-              (("add_library\\(OpenRCT2[^\n]+" all)
-               (string-join
-                `(,all
-                  "find_library(QJS_L NAMES qjs REQUIRED)"
-                  "find_path(QJS_I NAMES quickjs.h REQUIRED)"
-                  "target_link_libraries(libopenrct2 ${QJS_L})"
-                  "target_include_directories(libopenrct2 SYSTEM PRIVATE ${QJS_I})")
-                "\n")))))))
+        (base32 "01nanpbz5ycdhkyd46fjfvj18sw729l4vk7xg12600f9rjngjk76"))))
     (build-system cmake-build-system)
     (arguments
-     (list
-      #:configure-flags #~(list "-DDOWNLOAD_OBJECTS=OFF"
-                                "-DDOWNLOAD_TITLE_SEQUENCES=OFF"
-                                "-DDOWNLOAD_OPENSFX=OFF"
-                                "-DDOWNLOAD_OPENMUSIC=OFF"
-                                "-DDISABLE_DISCORD_RPC=ON"
-                                "-DDISABLE_VERSION_CHECKER=ON")
-      ;; many issues such as https://github.com/OpenRCT2/OpenRCT2/issues/12719
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-usr-share-paths&add-data
-            ;; TODO: OpenRCT2 can optionally use free music and sounds!
-            ;; https://github.com/OpenRCT2/OpenMusic
-            ;; https://github.com/OpenRCT2/OpenSoundEffects
-            ;; ideally we package these instead of the ones the user is supposed
-            ;; to supply.
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((titles (assoc-ref inputs "openrct2-title-sequences"))
-                    (objects (assoc-ref inputs "openrct2-objects"))
-                    (sfl (assoc-ref inputs "sfl-library")))
-                ;; Fix some references to /usr/share.
-                (substitute* "src/openrct2/platform/Platform.Linux.cpp"
-                  (("/usr/share")
-                   (string-append #$output "/share")))
-                (copy-recursively
-                 (string-append titles "/share/openrct2/title-sequences")
-                 "data/title")
-                (copy-recursively
-                 (string-append objects "/share/openrct2/objects")
-                 "data/object")
-                (copy-recursively
-                 (string-append sfl "/include")
-                 "src/thirdparty"))))
-          (add-before 'configure 'get-rid-of-errors
-            (lambda _
-              ;; Don't treat warnings as errors.
-              (substitute* "CMakeLists.txt"
-                (("-Werror") "")))))))
-    (inputs
-     (list curl
-           flac
-           fontconfig
-           freetype
-           icu4c
-           jansson
-           libpng
-           libvorbis
-           libzip
-           mesa
-           nlohmann-json-no-char8-t
-           openrct2-objects
-           openrct2-title-sequences
-           openssl
-           quickjs-ng
-           sdl2
-           sfl-library
-           speexdsp
-           zlib
-           (list zstd "lib")))
-    (native-inputs (list pkg-config))
-    (home-page "https://openrct2.io")
+     `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF"
+                               "-DDOWNLOAD_TITLE_SEQUENCES=OFF")
+       #:tests? #f                      ; tests require network access
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-usr-share-paths&add-data
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((titles (assoc-ref inputs "openrct2-title-sequences"))
+                   (objects (assoc-ref inputs "openrct2-objects")))
+               ;; Fix some references to /usr/share.
+               (substitute* "src/openrct2/platform/Platform.Linux.cpp"
+                 (("/usr/share")
+                  (string-append (assoc-ref %outputs "out") "/share")))
+               (copy-recursively
+                (string-append titles "/share/openrct2/title-sequences")
+                "data/title")
+               (copy-recursively
+                (string-append objects "/share/openrct2/objects")
+                "data/object"))))
+         (add-before 'configure 'get-rid-of-errors
+           (lambda _
+             ;; Don't treat warnings as errors.
+             (substitute* "CMakeLists.txt"
+               (("-Werror") ""))
+             #t)))))
+    (inputs `(("curl" ,curl)
+              ("duktape" ,duktape)
+              ("fontconfig" ,fontconfig)
+              ("freetype" ,freetype)
+              ("icu4c" ,icu4c)
+              ("jansson" ,jansson)
+              ("nlohmann-json" ,nlohmann-json)
+              ("libpng" ,libpng)
+              ("libzip" ,libzip)
+              ("mesa" ,mesa)
+              ("openrct2-objects" ,openrct2-objects)
+              ("openrct2-title-sequences" ,openrct2-title-sequences)
+              ("openssl" ,openssl)
+              ("sdl2" ,sdl2)
+              ("speexdsp" ,speexdsp)
+              ("zlib" ,zlib)))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://github.com/OpenRCT2/OpenRCT2")
     (synopsis "Free software re-implementation of RollerCoaster Tycoon 2")
     (description "OpenRCT2 is a free software re-implementation of
 RollerCoaster Tycoon 2 (RCT2).  The gameplay revolves around building and
@@ -6382,8 +6380,8 @@ maintaining an amusement park containing attractions, shops and facilities.
 
 Note that this package does @emph{not} provide the game assets (sounds,
 images, etc.)")
-    ;; See bottom of:
-    ;; https://github.com/OpenRCT2/OpenRCT2/blob/develop/distribution/readme.txt
+    ;; See <https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files>
+    ;; regarding assets.
     (license license:gpl3+)))
 
 (define-public openriichi
@@ -6961,7 +6959,7 @@ tactics.")
 (define-public widelands
   (package
     (name "widelands")
-    (version "1.3.1")
+    (version "1.3")
     (source
      (origin
        (method git-fetch)
@@ -6970,7 +6968,7 @@ tactics.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ab9s1imqdq1krfwlba1ipx3pwnvy91aqqzr15ssfzixy4wj5mww"))
+        (base32 "1j288rkflqmzxbacrrx35y8qm4mvbvd30c03cmkvh8b29jkgz3gp"))
        (modules '((guix build utils)))
        (snippet
         #~(delete-file-recursively "src/third_party/minizip"))))

gnu/packages/gcc.scm

@@ -51,7 +51,7 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages perl)
   #:use-module (guix packages)
   #:use-module (guix download)

gnu/packages/gdb.scm

@@ -31,7 +31,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages dejagnu)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages hurd)
   #:use-module (gnu packages llvm)

gnu/packages/geo.scm

@@ -91,7 +91,7 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -807,7 +807,7 @@ OpenGeoSys")
 (define-public ogs-serial
   (package
     (name "ogs-serial")
-    (version "6.5.8")
+    (version "6.5.7")
     (source
      (origin
        (method git-fetch)
@@ -816,7 +816,9 @@ OpenGeoSys")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "037il6jw2j1g7bvrwvbp20yf0cnz7c7f3wmszxfv5ay7l54sffqg"))))
+        (base32 "1wflgkbcsa4sr8g63img0ld6h4jm1b7hjzsa2m4gsbzc6j7kd41w"))
+       ;; Remove patch on next release, likely 6.5.8
+       (patches (search-patches "ogs-6.5.7-netcdfconverter.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -871,7 +873,6 @@ OpenGeoSys")
            tclap
            tfel
            vtk
-           xdmf
            xmlpatch
            zlib))
     (propagated-inputs

gnu/packages/gl.scm

@@ -50,7 +50,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)

gnu/packages/glib.scm

@@ -56,7 +56,7 @@
   #:use-module (gnu packages elf)
   #:use-module (gnu packages enlightenment)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnome)

gnu/packages/gnome.scm

@@ -136,7 +136,7 @@
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages enchant)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages file-systems)
   #:use-module (gnu packages firmware)

gnu/packages/gnucash.scm

@@ -324,7 +324,7 @@ applications and libraries.  It is used by AqBanking.")
 (define-public aqbanking
   (package
     (name "aqbanking")
-    (version "6.9.2")
+    (version "6.8.5")
     (source
      (origin
        (method git-fetch)
@@ -333,7 +333,7 @@ applications and libraries.  It is used by AqBanking.")
               (commit version)))
        (sha256
         (base32
-         "1n1867vdml71p9dbcx70rmf10b12l7l0vq847bbizrkq7b0ha8w0"))
+         "1xqhhxhr1azqvdn47389h469d3srl5l3n1nx82jx2djbx9sdzdq9"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments

gnu/packages/gnupg.scm

@@ -693,14 +693,14 @@ and signature functionality from Python programs.")
 (define-public perl-gnupg-interface
   (package
     (name "perl-gnupg-interface")
-    (version "1.06")
+    (version "1.05")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cpan/authors/id/B/BP/BPS/"
                                   "GnuPG-Interface-" version ".tar.gz"))
               (sha256
                (base32
-                "07946rsmz0ibasd53l4qiwg0dl1h65p8byja4d7fiflxsklxccs4"))))
+                "0ig0ra2s1v2rw2ikm1hd0iwf2phhcr8kbc90jhr8kdpvlkymshsl"))))
     (build-system perl-build-system)
     (inputs
      (list gnupg))
@@ -764,7 +764,7 @@ parties.")
 (define-public signing-party
   (package
     (name "signing-party")
-    (version "2.12")
+    (version "2.11")
     (home-page "https://salsa.debian.org/signing-party-team/signing-party")
     (source (origin
               (method git-fetch)
@@ -774,7 +774,7 @@ parties.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1a4x02rcs5ryvfnhb6naiwc5jsil5k1fh8b01fkijkbzbh54qjc5"))))
+                "1aig5ssabzbk4mih7xd04vgr931bw0flbi8dz902wlr610gyv5s5"))))
     (build-system gnu-build-system)
     (native-inputs
      ;; autoconf-wrapper is required due to the non-standard
@@ -788,57 +788,56 @@ parties.")
                   perl-net-idn-encode
                   libmd))
     (arguments
-     (list #:tests? #f                      ; no test suite
-           #:phases
-           #~(modify-phases %standard-phases
-               (replace 'configure
-                 (lambda _
-                   (substitute* "keyanalyze/Makefile"
-                     (("LDLIBS")
-                      (string-append "CC=" (which "gcc") "\nLDLIBS")))
-                   (substitute* "keyanalyze/Makefile"
-                     (("\\./configure")
-                      (string-append "./configure --prefix=" #$output)))
-                   (substitute* "gpgwrap/Makefile"
-                     (("\\} clean")
-                      (string-append
-                       "} clean\ninstall:\n\tinstall -D bin/gpgwrap "
-                       #$output "/bin/gpgwrap\n")))
-                   (substitute* '("gpgsigs/Makefile" "keyanalyze/Makefile"
-                                  "keylookup/Makefile" "sig2dot/Makefile"
-                                  "springgraph/Makefile")
-                     (("/usr") #$output))
-                   (setenv "CONFIG_SHELL" (which "sh"))))
-               (replace 'install
-                 (lambda* (#:key #:allow-other-keys #:rest args)
-                   (let ((install (assoc-ref %standard-phases 'install)))
-                     (apply install args)
-                     (for-each
-                      (lambda (dir file)
-                        (copy-file (string-append dir "/" file)
-                                   (string-append #$output "/bin/" file)))
-                      '("caff" "caff" "caff" "gpgdir" "gpg-key2ps"
-                        "gpglist" "gpg-mailkeys" "gpgparticipants")
-                      '("caff" "pgp-clean" "pgp-fixkey" "gpgdir" "gpg-key2ps"
-                        "gpglist" "gpg-mailkeys" "gpgparticipants"))
-                     (for-each
-                      (lambda (dir file)
-                        (copy-file
-                         (string-append dir "/" file)
-                         (string-append #$output "/share/man/man1/" file)))
-                      '("caff" "caff" "caff" "gpgdir"
-                        "gpg-key2ps" "gpglist" "gpg-mailkeys"
-                        "gpgparticipants" "gpgsigs" "gpgwrap/doc"
-                        "keyanalyze" "keyanalyze/pgpring" "keyanalyze")
-                      '("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1"
-                        "gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1"
-                        "gpgparticipants.1" "gpgsigs.1" "gpgwrap.1"
-                        "process_keys.1" "pgpring.1" "keyanalyze.1")))))
-               (add-after 'install 'wrap-programs
-                 (lambda _
-                   (wrap-program
-                       (string-append #$output "/bin/caff")
-                     `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))))))
+     `(#:tests? #f                      ; no test suite
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "keyanalyze/Makefile"
+                 (("LDLIBS") (string-append "CC=" (which "gcc") "\nLDLIBS")))
+               (substitute* "keyanalyze/Makefile"
+                 (("\\./configure") (string-append "./configure --prefix=" out)))
+               (substitute* "gpgwrap/Makefile"
+                 (("\\} clean")
+                  (string-append "} clean\ninstall:\n\tinstall -D bin/gpgwrap "
+                                 out "/bin/gpgwrap\n")))
+               (substitute* '("gpgsigs/Makefile" "keyanalyze/Makefile"
+                              "keylookup/Makefile" "sig2dot/Makefile"
+                              "springgraph/Makefile")
+                 (("/usr") out))
+               (setenv "CONFIG_SHELL" (which "sh")))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys #:rest args)
+             (let ((out (assoc-ref outputs "out"))
+                   (install (assoc-ref %standard-phases 'install)))
+               (apply install args)
+               (for-each
+                (lambda (dir file)
+                  (copy-file (string-append dir "/" file)
+                             (string-append out "/bin/" file)))
+                '("caff" "caff" "caff" "gpgdir" "gpg-key2ps"
+                  "gpglist" "gpg-mailkeys" "gpgparticipants")
+                '("caff" "pgp-clean" "pgp-fixkey" "gpgdir" "gpg-key2ps"
+                  "gpglist" "gpg-mailkeys" "gpgparticipants"))
+               (for-each
+                (lambda (dir file)
+                  (copy-file (string-append dir "/" file)
+                             (string-append out "/share/man/man1/" file)))
+                '("caff" "caff" "caff" "gpgdir"
+                  "gpg-key2ps" "gpglist" "gpg-mailkeys"
+                  "gpgparticipants" "gpgsigs" "gpgwrap/doc"
+                  "keyanalyze" "keyanalyze/pgpring" "keyanalyze")
+                '("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1"
+                  "gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1"
+                  "gpgparticipants.1" "gpgsigs.1" "gpgwrap.1"
+                  "process_keys.1" "pgpring.1" "keyanalyze.1")))))
+         (add-after 'install 'wrap-programs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out")))
+               (wrap-program
+                   (string-append out "/bin/caff")
+                 `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))))))
     (synopsis "Collection of scripts for simplifying gnupg key signing")
     (description
      "Signing-party is a collection for all kinds of PGP/GnuPG related things,
@@ -1150,24 +1149,25 @@ however, pgpdump produces more detailed and easier to understand output.")
 (define-public gpa
   (package
     (name "gpa")
-    (version "0.11.1")
+    (version "0.11.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnupg/gpa/"
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "02sx9my3s4yjxzxzs8pfif8wvpjrjsh75wwa5mxd0h867v6v5i8b"))))
+                "1k1kvxffyb4nm83yp3mnx9bfmcciwb7vfw8c3xscnh85yxdzma16"))))
     (build-system gnu-build-system)
     (arguments
-     (list #:make-flags #~(list "CFLAGS=-Wno-implicit-function-declaration")
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'install 'wrap-program
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((gnupg (assoc-ref inputs "gnupg")))
-                     (wrap-program (string-append #$output "/bin/gpa")
-                       `("PATH" ":" prefix (,(string-append gnupg "/bin"))))))))))
+     `(#:make-flags '("CFLAGS=-Wno-implicit-function-declaration")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap-program
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (gnupg (assoc-ref inputs "gnupg")))
+               (wrap-program (string-append out "/bin/gpa")
+                 `("PATH" ":" prefix (,(string-append gnupg "/bin"))))))))))
     (native-inputs (list pkg-config))
     (inputs
      (list bash-minimal

gnu/packages/golang-build.scm

@@ -640,7 +640,7 @@ library.")
 (define-public go-github-com-yuin-goldmark
   (package
     (name "go-github-com-yuin-goldmark")
-    (version "1.7.16")
+    (version "1.8.2")
     (source
      (origin
        (method git-fetch)
@@ -649,7 +649,7 @@ library.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zgphfblr7340klbk97r2yhy19piw1ksfxkg15qxkrqql0r9daw5"))))
+        (base32 "0f7i14jpq3shm7zfdkhzsf8gkb87b7x1flpi5kn8y9z93qfkfiwf"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -732,7 +732,7 @@ toolchain.  The parts needed in the main Go repository are copied in.")
 (define-public go-golang-org-x-crypto
   (package
     (name "go-golang-org-x-crypto")
-    (version "0.48.0")
+    (version "0.50.0")
     (source
      (origin
        (method git-fetch)
@@ -741,7 +741,7 @@ toolchain.  The parts needed in the main Go repository are copied in.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ml7qabakjv3lcsv2pkc0h3092547z30pn8qwdiy7vf7hrssqa6g"))
+        (base32 "1rk47vw7sirdakvl0z1ffgrsd1xm285i3wv6xbm47b8irvailxxf"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
@@ -996,12 +996,20 @@ compile does not support generics.")
       #:skip-build? #t
       #:test-flags
       #~(list "-skip" (string-join
-                       ;; Permission denied to read or write go.mod file.
-                       (list "TestDocs/Modules"
-                             "TestGobind/Modules"
-                             ;; build_test.go:100: cannot set -o when building
-                             ;; non-main package
-                             "TestAndroidBuild")
+                       (append
+                        ;; Permission denied to read or write go.mod file.
+                        (list "TestDocs/Modules"
+                              "TestGobind/Modules"
+                              ;; build_test.go:100: cannot set -o when
+                              ;; building non-main package
+                              "TestAndroidBuild")
+                        ;; archNDK() in cmd/gomobile/env.go only maps
+                        ;; GOARCH 386 and amd64 (plus arm64 on darwin)
+                        ;; and panics otherwise, so TestInit crashes
+                        ;; with "unsupported GOARCH" on non-x86 Linux.
+                        (if #$(target-x86?)
+                            '()
+                            (list "TestInit")))
                        "|"))
       #:import-path "golang.org/x/mobile"
       #:phases
@@ -1027,7 +1035,7 @@ compile does not support generics.")
 (define-public go-golang-org-x-mod
   (package
     (name "go-golang-org-x-mod")
-    (version "0.33.0")
+    (version "0.35.0")
     (source
      (origin
        (method git-fetch)
@@ -1036,7 +1044,7 @@ compile does not support generics.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0g1g82lzcrn11b33aw1gs8k3whf7l76kgzxr49126shbyq6dxaws"))))
+        (base32 "1hicla74zspl15xdm6a9rkpsv0vx6bpyav6mspfmqfmkx8fl29n6"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1074,7 +1082,7 @@ loading algorithms.")
 (define-public go-golang-org-x-net
   (package
     (name "go-golang-org-x-net")
-    (version "0.50.0")
+    (version "0.53.0")
     (source
      (origin
        (method git-fetch)
@@ -1083,7 +1091,7 @@ loading algorithms.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0azrbdpydjdjg63rj51blwjlqaplwbd5yi9dy4fyxd38wm36yyq3"))))
+        (base32 "0rdyfdlaifmi0vz5phn98fhzllk2zsjk9gcdax4ajzwsdhp0mn0v"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1098,7 +1106,14 @@ loading algorithms.")
                              ;; test fails with error: ThreadSanitizer:
                              ;; unsupported VMA range.
                              #$@(if (target-arm?) '("TestRace") '()))
-                       "|"))))
+                       "|"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              ;; See: <https://go.dev/blog/synctest>.
+              (setenv "GOEXPERIMENT" "synctest")
+              (setenv "GODEBUG" "asynctimerchan=0"))))))
     (propagated-inputs
      (list go-golang-org-x-crypto
            go-golang-org-x-sys
@@ -1124,7 +1139,7 @@ loading algorithms.")
 (define-public go-golang-org-x-sync
   (package
     (name "go-golang-org-x-sync")
-    (version "0.19.0")
+    (version "0.20.0")
     (source
      (origin
        (method git-fetch)
@@ -1133,7 +1148,7 @@ loading algorithms.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ykjzxskvy1jbvyp2svd766jiyv3m0rqg89ifg7flllrqbx5kd25"))))
+        (base32 "0inbjipc9a1ai7r1ar4hqgq1d2js5w2v6cnda3l5msna4y227dy9"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1168,7 +1183,7 @@ cancellation for groups of goroutines working on subtasks of a common task
 (define-public go-golang-org-x-sys
   (package
     (name "go-golang-org-x-sys")
-    (version "0.40.0")
+    (version "0.43.0")
     (source
      (origin
        (method git-fetch)
@@ -1177,7 +1192,7 @@ cancellation for groups of goroutines working on subtasks of a common task
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1rygxjhh29hjzr6jni6kxaib1c9d6mp2wvjngfzdpxxmm9rk9r3d"))))
+        (base32 "18by7v7gvbanxkqjdadisgc7hgsn580yy5zj42wgiv642qd2r11g"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1199,17 +1214,6 @@ cancellation for groups of goroutines working on subtasks of a common task
 low-level interaction with the operating system.")
     (license license:bsd-3)))
 
-(define-public go-golang-org-x-sys-bootstrap
-  (hidden-package
-   (package
-     (inherit go-golang-org-x-sys)
-     (arguments
-      (list #:skip-build? #t
-            #:tests? #f
-            #:import-path "golang.org/x/sys"))
-     (native-inputs '())
-     (propagated-inputs '()))))
-
 ;; This is the only one dependency for esbuild, which is the main tool to
 ;; produce all Node packages, keep it away from other golang.
 (define-public go-golang-org-x-sys-for-esbuild
@@ -1233,7 +1237,7 @@ low-level interaction with the operating system.")
     (name "go-golang-org-x-telemetry")
     ;; Beware: the updater gets this wrong.  Use the latest commit and its
     ;; matching date.
-    (version "0.0.0-20260209163413-e7419c687ee4")
+    (version "0.0.0-20260428171046-76f71b9afea0")
     (source
      (origin
        (method git-fetch)
@@ -1242,7 +1246,7 @@ low-level interaction with the operating system.")
               (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wr4b40lwzpac2n9ipz5lmq6p973g5mr2im38dy3816lbg84rp38"))
+        (base32 "13z9sgs9lsaj2shv5hbv7i63pjjcw68r1vw7j5jkkqwcz5kkdwkp"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
@@ -1285,10 +1289,10 @@ low-level interaction with the operating system.")
            go-golang-org-x-sync
            go-golang-org-x-sys))
     (home-page "https://go.googlesource.com/telemetry")
-    (synopsis "Go Telemetry")
+    (synopsis "Go Telemetry library")
     (description
-     "This repository holds the Go Telemetry server code and libraries, used
-for hosting @url{https://telemetry.go.dev,telemetry.go.dev} and instrumenting
+     "This package provides the Go Telemetry server code and libraries, used
+for hosting @url{https://telemetry.go.dev, telemetry.go.dev} and instrumenting
 Go toolchain programs with opt-in telemetry.")
     (license license:bsd-3)))
 
@@ -1325,7 +1329,7 @@ telemetry uploads: GOOS, GOARCH, Go version, and per-program counters.")
 (define-public go-golang-org-x-term
   (package
     (name "go-golang-org-x-term")
-    (version "0.40.0")
+    (version "0.42.0")
     (source
      (origin
        (method git-fetch)
@@ -1334,7 +1338,7 @@ telemetry uploads: GOOS, GOARCH, Go version, and per-program counters.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1x6m4cxk8h88gacxjc6vsaj585zwc8dzpgxwgbq6fwg6l1519vxn"))))
+        (base32 "0ms3xm3m17ba2y7vk1mhyqjgzf15qn00v8hb340xivga0yy86a0l"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1361,7 +1365,7 @@ terminals, as commonly found on Unix systems.")
 (define-public go-golang-org-x-text
   (package
     (name "go-golang-org-x-text")
-    (version "0.34.0")
+    (version "0.36.0")
     (source
      (origin
        (method git-fetch)
@@ -1370,7 +1374,7 @@ terminals, as commonly found on Unix systems.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "10qhscx7zdack9b5ynjiiyk2pl2c5jfamvwgjfhpnnhxgp6jr8rc"))))
+        (base32 "1hhkamc8450y1jmrhw59v1v6l8icihmjdzbnrqpg947z3dlbk3nd"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1435,7 +1439,7 @@ time.")
 (define-public go-golang-org-x-tools
   (package
     (name "go-golang-org-x-tools")
-    (version "0.42.0")
+    (version "0.44.0")
     (source
      (origin
        (method git-fetch)
@@ -1444,16 +1448,14 @@ time.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0206hl6v7gy7cxwamjapa1zr2n3clj0vaqwyy6izcw18faga466i"))
+        (base32 "0inivp0ih1ykl184d4sbshyb1crayj9iayl012ms1b2x0rjg5l0p"))
        (modules '((guix build utils)))
        (snippet
         '(begin
            ;; Submodules with their own go.mod files and packaged separately:
            ;;
-           ;; - golang.org/x/tools/cmd/auth
            ;; - golang.org/x/tools/gopls
-           (delete-file-recursively "gopls")
-           (delete-file-recursively "cmd/auth")))))
+           (delete-file-recursively "gopls")))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1484,8 +1486,8 @@ time.")
                        (list
                         ;; The GenericPaths test fails with "invalid memory
                         ;; address or nil pointer dereference".
-                        "TestGenericPaths"
-                        ;; The ordering and paths tests fails because they
+                        "TestGenericPaths" "TestIssue70418"
+                        ;; The ordering and paths tests fail because they
                         ;; can't find test packages (perhaps because we do not
                         ;; support Go modules).
                         "TestOrdering" "TestPaths"

gnu/packages/golang-check.scm

@@ -2504,24 +2504,20 @@ can be used in test code as a mock of the interface.")
 (define-public go-github-com-maxatome-go-testdeep
   (package
     (name "go-github-com-maxatome-go-testdeep")
-    (version "1.14.0")
+    (version "1.15.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/maxatome/go-testdeep")
-             (commit (string-append "v" version))))
+              (url "https://github.com/maxatome/go-testdeep")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0r9w79qm6j080gbqhrd5gwjzsnkmrcihy4yniw77g0wkspxxdjww"))))
+        (base32 "14i64h4kd9b2adhvxn7r2jhp0ci6vla7y7n76yg49wm61ddbw9df"))))
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/maxatome/go-testdeep"
-      ;; Structure comparison not equal.
-      #:test-flags #~(list "-skip" "TestFatalTrace")))
-    (propagated-inputs
-     (list go-github-com-davecgh-go-spew))
+      #:import-path "github.com/maxatome/go-testdeep"))
     (home-page "https://github.com/maxatome/go-testdeep")
     (synopsis "Extended HTTP API testing framework")
     (description
@@ -2904,8 +2900,8 @@ testing type to omit repeated @code{t}.")
     (license license:expat)))
 
 (define-public go-github-com-petermattis-goid
-  (let ((commit "395b08cebbdbaf68f44f53a2d6e9f8d064180a0b")
-        (revision "3"))
+  (let ((commit "df67b199bc81d151c71a864c3eb1ea12bf66c852")
+        (revision "4"))
     (package
       (name "go-github-com-petermattis-goid")
       (version (git-version "0.0.0" revision commit))
@@ -2913,11 +2909,11 @@ testing type to omit repeated @code{t}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/petermattis/goid")
-               (commit commit)))
+                (url "https://github.com/petermattis/goid")
+                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0c8fc1v29wjv9r1l2dhkr9bxc7hysahr30bnxwnc854jckxiqi46"))))
+          (base32 "0lyr3h8cyk53xbg4asssk53zdfch3ympkk5m753zf1ggf4v3684f"))))
       (build-system go-build-system)
       (arguments
        (list
@@ -4414,6 +4410,41 @@ thoroughly
      "Package randfill is a library for populating go objects with random values.")
     (license license:asl2.0)))
 
+(define-public go-znkr-io-diff
+  (package
+    (name "go-znkr-io-diff")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/znkr/diff")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1s3slsr9d21zbcks9c7l3vli2pam2waww4bk63dy4qw9qsgaga90"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            ;; Submodules with their own go.mod files and packaged separately:
+            ;;
+            ;; - znkr.io/diff/internal/benchmarks
+            (delete-file-recursively "internal/benchmarks")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "znkr.io/diff"))
+    (native-inputs
+     (list go-github-com-google-go-cmp))
+    (propagated-inputs
+     (list go-golang-org-x-tools))
+    (home-page "https://znkr.io/diff")
+    (synopsis "Difference algorithm module for Go")
+    (description
+     "Package diff provides functions to efficiently compare two slices
+similar to the Unix diff command line tool to compare files.")
+    (license license:asl2.0)))
+
 ;;;
 ;;; Executables:
 ;;;

gnu/packages/golang-compression.scm

@@ -43,6 +43,35 @@
 ;;;
 ;;; Code:
 
+(define-public go-code-forgejo-org-forgejo-go-rpmutils
+  (package
+    (name "go-code-forgejo-org-forgejo-go-rpmutils")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://code.forgejo.org/forgejo/go-rpmutils.git")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1zgqr3il0w7j6964mh1nw5zg9shp1p039a8sj0y946r26labqm9i"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "code.forgejo.org/forgejo/go-rpmutils"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-protonmail-go-crypto))
+    (home-page "https://code.forgejo.org/forgejo/go-rpmutils")
+    (synopsis "Go RPM Utils")
+    (description
+     "go-rpmutils is a Golang library for parsing @url{http://www.rpm.org,
+RPM} file archives.  It's a slimmed version of
+@url{https://github.com/sassoftware/go-rpmutils, go-rpmutils}.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-a1ex3-zstd-seekable-format-go-pkg
   (let ((commit "eb2f95f46725437a64063e005a54e20c95b774c6")
         (revision "0"))
@@ -132,22 +161,24 @@ implementation from lzokay project} (MIT licensed).  It includes a
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/andybalholm/brotli")
-             (commit (string-append "v" version))))
+              (url "https://github.com/andybalholm/brotli")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32 "1zdvcwfzxnkljyh4p7izy0bfxrwidwwmp1p5h1fydyrgbs4xacly"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/andybalholm/brotli"))
+     (list
+      #:import-path "github.com/andybalholm/brotli"))
+    (native-inputs
+     (list go-github-com-xyproto-randomstring))
     (home-page "https://github.com/andybalholm/brotli")
     (synopsis "Pure Go Brotli encoder and decoder")
     (description
      "This package is a brotli compressor and decompressor implemented in Go.
 It was translated from the reference implementation
-(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
-the @code{c2go} tool at
-@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
+(@url{https://github.com/google/brotli}) with the @code{c2go} tool at
+@url{https://github.com/andybalholm/c2go}.")
     (license license:expat)))
 
 (define-public go-github-com-blakesmith-ar

gnu/packages/golang-crypto.scm

@@ -211,24 +211,27 @@ crypto/internal/bigmod, the backend of crypto/rsa and crypto/ecdsa.")
 (define-public go-filippo-io-edwards25519
   (package
     (name "go-filippo-io-edwards25519")
-    (version "1.1.0")
+    (version "1.2.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/FiloSottile/edwards25519")
-             (commit (string-append "v" version))))
+              (url "https://github.com/FiloSottile/edwards25519")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1b2c4iv13mfa0dydr8wawpnnrxgwl7mxzhryfrkjxrgwad8gas5k"))))
+        (base32 "0iz8sprg66v3dp7rgmpgfdr6h9mdfpnw1s2pyxyjgwbs3zd98q1k"))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "filippo.io/edwards25519"))
+     (list
+      ;; Tests hang forewer on ARM64.
+      #:tests? (not (target-aarch64?))
+      #:import-path "filippo.io/edwards25519"))
     (home-page "https://filippo.io/edwards25519")
     (synopsis "Group logic for the twisted Edwards curve")
-    (description "This package implements the edwards25519 elliptic curve in
-Go, exposing the necessary APIs to build a wide array of higher-level
-primitives.")
+    (description
+     "This package implements the edwards25519 elliptic curve in Go, exposing
+the necessary APIs to build a wide array of higher-level primitives.")
     (license license:bsd-3)))
 
 (define-public go-filippo-io-hpke
@@ -762,7 +765,7 @@ The package include Go source library and @code{redoctober} command.")
 (define-public go-github-com-cloudwego-base64x
   (package
     (name "go-github-com-cloudwego-base64x")
-    (version "0.1.4")
+    (version "0.1.7")
     (source
      (origin
        (method git-fetch)
@@ -771,11 +774,21 @@ The package include Go source library and @code{redoctober} command.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1lgs28mj5w350vp6pazz2265hx2kab3kbjw7vnk0w1skslxbj8kx"))))
+        (base32 "1f394m92xspc03sfwijbbn86ywm4q31aw86hd4d87ckrnbxp3mrc"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (delete-file-recursively "bench")))))
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/cloudwego/base64x"))
+      #:import-path "github.com/cloudwego/base64x"
+      ;; 'base64x.go' references 'b64encode' and 'b64decode',
+      ;; which are defined only in 'native_amd64.go' (restricted
+      ;; to amd64 by its filename), so compilation fails on
+      ;; non-x86-64.
+      #:skip-build? (not (target-x86-64?))
+      #:tests? (and (not (%current-target-system))
+                    (target-x86-64?))))
     (native-inputs
      (list go-github-com-davecgh-go-spew
            go-github-com-stretchr-testify))
@@ -1317,26 +1330,27 @@ crypto package.")
 (define-public go-github-com-dvsekhvalnov-jose2go
   (package
     (name "go-github-com-dvsekhvalnov-jose2go")
-    (version "1.5.0")
+    (version "1.8.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dvsekhvalnov/jose2go")
-             (commit (string-append "v" version))))
+              (url "https://github.com/dvsekhvalnov/jose2go")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1pzfmv2dxb3m455bi1ks4q3i0dcw1sazxk8k96wrgpkwgglyxj3n"))))
+        (base32 "1i43sg8anga22vv2gd40y8nmns10xzmsb3nlvb1p7ikal7h6d9fh"))))
     (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/dvsekhvalnov/jose2go"))
     (native-inputs
      (list go-gopkg-in-check-v1))
-    (arguments
-     '(#:import-path "github.com/dvsekhvalnov/jose2go"))
     (home-page "https://github.com/dvsekhvalnov/jose2go")
     (synopsis "Go implementation of Javascript Object Signing and Encryption spec")
-    (description "This package provides a Go library for generating, decoding,
-and encrypting JSON Web Tokens (JWT).  It relies only on the standard
-library.")
+    (description
+     "This package provides a Go library for generating, decoding,and
+encrypting JSON Web Tokens (JWT).  It relies only on the standard library.")
     (license license:expat)))
 
 (define-public go-github-com-elithrar-simple-scrypt
@@ -1637,7 +1651,7 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
   (package
     (inherit go-github-com-golang-jwt-jwt-v4)
     (name "go-github-com-golang-jwt-jwt-v5")
-    (version "5.2.1")
+    (version "5.3.1")
     (source
      (origin
        (method git-fetch)
@@ -1646,7 +1660,7 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "13l2p4g9f7bpz0nf2sc4r5ms06ps7bs7z1vpzzv943q094pjs0yw"))))
+        (base32 "1h2r420031i405p1mn9z0g959fxx7lk9lgjx47vn4qdpgz62rc47"))))
     (arguments
      (list
       #:import-path "github.com/golang-jwt/jwt/v5"))))
@@ -1654,28 +1668,35 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
 (define-public go-github-com-google-go-tpm
   (package
     (name "go-github-com-google-go-tpm")
-    (version "0.9.4")
+    (version "0.9.8")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/google/go-tpm")
-             (commit (string-append "v" version))))
+              (url "https://github.com/google/go-tpm")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1sp1mbr6vz36zy9w36iksirbsj5p2jslsl8zs1cdj8s4ig4lkd9d"))))
+        (base32 "17210acrj3kd9k9l6grlgqzq1063981mscwwws3mjdzlm3r4bn9g"))))
     (build-system go-build-system)
     (arguments
      (list
+      #:skip-build? #t
       #:import-path "github.com/google/go-tpm"
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; XXX: Break cycle:
-          ;; github.com/google/go-tpm/tpm2/transport/simulator/simulator.go ->
-          ;; github.com/google/go-tpm-tools -> github.com/google/go-tpm.
-          ;; Consider to add required inputs on dependent package.
-          (delete 'build)
-          (delete 'check))))
+      ;; github.com/google/go-tpm-tools needs to be boostrapped.
+      #:test-subdirs
+      #~(list "legacy/tpm2"
+              "legacy/tpm2/credactivation"
+              "tpm"
+              "tpm2/transport/linuxtpm"
+              "tpm2/transport/linuxudstpm"
+              "tpm2/transport/tcp"
+              "tpmutil")))
+    (native-inputs
+     (list go-github-com-google-go-cmp))
+    (propagated-inputs
+     (list ;; go-github-com-google-go-tpm-tools
+           go-golang-org-x-sys))
     (home-page "https://github.com/google/go-tpm")
     (synopsis "Go-TPM Legacy TPM 2.0 library")
     (description
@@ -2278,20 +2299,22 @@ package in Rust.")
 (define-public go-github-com-minio-highwayhash
   (package
     (name "go-github-com-minio-highwayhash")
-    (version "1.0.3")
+    (version "1.0.4")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/minio/highwayhash")
-             (commit (string-append "v" version))))
+              (url "https://github.com/minio/highwayhash")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "14g2x266h8sxs0yynmcl2r2mnhx55rfzgykw4hygm7i1vpfrikg4"))))
+        (base32 "0ypa82c75ksgl7apmkyng6jl1j8y27q6mhgaa3hslqkbz2nn4vhr"))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "github.com/minio/highwayhash"))
-    (propagated-inputs (list go-golang-org-x-sys))
+     (list
+      #:import-path "github.com/minio/highwayhash"))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
     (home-page "https://github.com/minio/highwayhash")
     (synopsis "HighwayHash library for Go")
     (description
@@ -2467,7 +2490,7 @@ times faster decoding.")
 (define-public go-github-com-nats-io-jwt-v2
   (package
     (name "go-github-com-nats-io-jwt-v2")
-    (version "2.8.0")
+    (version "2.8.1")
     (source
      (origin
        (method git-fetch)
@@ -2476,7 +2499,7 @@ times faster decoding.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "16fxmml1cw2y3cr87ry61k2q8421hab77cx6gpqz1qfy6sdh0vvz"))))
+        (base32 "1258y5p8nyf4p285j2rq8v54l52z6ahklx9fk93fa1mf20nm1v2y"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -2495,7 +2518,7 @@ JWT tokens.  Nkeys use Ed25519 to provide authentication of JWT claims.")
 (define-public go-github-com-nats-io-nkeys
   (package
     (name "go-github-com-nats-io-nkeys")
-    (version "0.4.11")
+    (version "0.4.15")
     (source
      (origin
        (method git-fetch)
@@ -2504,7 +2527,7 @@ JWT tokens.  Nkeys use Ed25519 to provide authentication of JWT claims.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wrsrccc4sxzlrlngkw644p4n074vd54mkad8vzi9ylnw97hhabm"))))
+        (base32 "0qhi2ai5g2vy8mwrdlcsrpbc2giq4b4xw58vbnm4jw6ypmy4ymc6"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/nats-io/nkeys"))
@@ -4293,7 +4316,7 @@ purpose of improving obfs4proxy's meek_lite transport.")
 (define-public go-go-mau-fi-libsignal
   (package
     (name "go-go-mau-fi-libsignal")
-    (version "0.2.1")
+    (version "0.1.2")
     (source
      (origin
        (method git-fetch)
@@ -4309,7 +4332,7 @@ purpose of improving obfs4proxy's meek_lite transport.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0jwqhaaqjf5fb322karppisbg5s1la459a0cwvhbii899nzyd59k"))))
+        (base32 "1pd2kijza7dr5nbgfw176ca1r3rmgpx8h22gqjp557awxqhw9lzr"))))
     (build-system go-build-system)
     (arguments
      (list

gnu/packages/golang-graphics.scm

@@ -1,6 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2026 Sughosha <sughosha@disroot.org>
-;;; Copyright © 2026 orahcio <orahcio@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -250,88 +249,3 @@ multiple return values, Go's native multiple return values are used instead.
 Whenever a native GTK call could return an unexpected NULL pointer, an
 additional error is returned in the Go binding.")
     (license license:isc)))
-
-(define-public go-github-com-jackmordaunt-icns-v3
-  (package
-    (name "go-github-com-jackmordaunt-icns-v3")
-    (version "3.0.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/JackMordaunt/icns")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "04wnxv79b1xbca16kgz98zc929q60lwcgcc6q784lkz2a1clh2z2"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            ;; Submodules with their own go.mod files and packaged separately:
-            (delete-file-recursively "cmd")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/jackmordaunt/icns/v3"
-      #:test-flags #~(list "-vet=off")))
-    (propagated-inputs
-     (list go-github-com-nfnt-resize))
-    (home-page "https://github.com/jackmordaunt/icns")
-    (synopsis "Easily create .icns files")
-    (description
-     "This package provides Go library to easily convert @code{.jpg} and
-@code{.png} to @code{.icns}, or to convert from any @code{image.Image} to
-@code{.icns}.")
-    (license license:expat)))
-
-(define-public go-github-com-sergeymakinen-go-bmp
-  (package
-    (name "go-github-com-sergeymakinen-go-bmp")
-    (version "1.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/sergeymakinen/go-bmp")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0bglvxqmjvgclcfjpkznxyifj5r0bh837c2iw6x1vylc7lqcq07h"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/sergeymakinen/go-bmp"))
-    (home-page "https://github.com/sergeymakinen/go-bmp")
-    (synopsis "BMP image decoder and encoder")
-    (description "Package bmp implements a BMP image decoder and encoder.")
-    (license license:bsd-3)))
-
-(define-public go-github-com-sergeymakinen-go-ico
-  (package
-    (name "go-github-com-sergeymakinen-go-ico")
-    (version "1.0.0-beta.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sergeymakinen/go-ico")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "115fgnhn1j91zvkigl1x03jkc2dn6vx7qvfmm6l59d24qkfv6cwn"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/sergeymakinen/go-ico"))
-    (propagated-inputs
-     (list go-github-com-sergeymakinen-go-bmp))
-    (home-page "https://github.com/sergeymakinen/go-ico")
-    (synopsis "ICO and CUR file decoders and encoders")
-    (description "Package ico implements an ICO file decoder and encoder.")
-    (license license:bsd-3)))
-
-;;;
-;;; Avoid adding new packages to the end of this file. To reduce the chances
-;;; of a merge conflict, place them above in alphabetic order:
-;;; guix import --insert=gnu/packages/golang-graphics.scm pypi <package-name>.
-;;;

gnu/packages/golang-maths.scm

@@ -41,6 +41,31 @@
 ;;; Libraries:
 ;;;
 
+(define-public go-github-com-aio-arch-graphlib
+  (package
+    (name "go-github-com-aio-arch-graphlib")
+    (version "1.0.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/aio-arch/graphlib")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1a69h1wlrv324wb0amagn6qyjb6cny0qhg82ivvkv0ilvvn17b6m"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:tests? (not (target-aarch64?))
+      #:import-path "github.com/aio-arch/graphlib"))
+    (home-page "https://github.com/aio-arch/graphlib")
+    (synopsis "Topological sort lib for Sorting and pruning of DAG graphs")
+    (description
+     "This package provides a Topological sort lib.  Sorting and pruning of
+DAG graphs.")
+    (license license:expat)))
+
 (define-public go-github-com-altree-bigfloat
   (package
     (name "go-github-com-altree-bigfloat")

gnu/packages/golang-vcs.scm

@@ -33,6 +33,7 @@
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
+  #:use-module (gnu packages golang-maths)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages haskell-apps)
@@ -50,6 +51,77 @@
 ;;; Libraries:
 ;;;
 
+(define-public go-code-forgejo-org-f3-gof3-v3
+  (package
+    (name "go-code-forgejo-org-f3-gof3-v3")
+    (version "3.11.39")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://code.forgejo.org/f3/gof3.git")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1gisxivmsy1r6kn4pcn96ry03mmh6y6hl26yi4zkihlj9m48brsb"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "code.forgejo.org/f3/gof3/v3"
+      #:unpack-path "code.forgejo.org/f3/gof3/v3"
+      #:build-flags
+      #~(list "-tags" "'netgo osusergo'"
+              (string-append "-ldflags="
+                             "-X code.forgejo.org/f3/gof3/v3/cmd.Version="
+                             #$version))
+      #:embed-files
+      ;; For go-github-com-urfave-cli-v3:
+      #~(list "bash_autocomplete"
+              "powershell_autocomplete.ps1"
+              "zsh_autocomplete"
+              "prelude.graphql"
+              ;; For go-github-com-santhosh-tekuri-jsonschema-v6:
+              "applicator"
+              "content"
+              "core"
+              "format"
+              "format-annotation"
+              "format-assertion"
+              "meta-data"
+              "schema"
+              "unevaluated"
+              "validation")
+    #:test-flags
+    #~(list "-vet=off"
+            "-skip" (string-join
+                     ;; Depends on internal helper command "internal/hoverfly".
+                     (list "TestInternal_Hoverfly"
+                           ;; Test tries to resolve DNS on 4.4.4.4 to clone
+                           ;; local directory.
+                           "TestUtil_Exec_CommandTimeout")
+                     "|"))))
+    (native-inputs
+     (list git-minimal
+           go-github-com-google-go-cmp
+           go-github-com-stretchr-testify
+           go-github-com-urfave-cli-v3))
+    (propagated-inputs
+     (list go-github-com-42wim-httpsig
+           go-github-com-aio-arch-graphlib
+           ;; go-github-com-davidmz-go-pageant  ;Windows only
+           go-github-com-hashicorp-go-version
+           go-github-com-santhosh-tekuri-jsonschema-v6
+           go-gitlab-com-gitlab-org-api-client-go-0.116
+           go-golang-org-x-crypto))
+    (home-page "https://code.forgejo.org/f3/gof3")
+    (synopsis "Friendly Forge Format (F3)")
+    (description
+     "As a command or as a library, @code{GoF3} provides a single operation:
+mirroring.  The origin and destination are designated by the URL of a forge
+and a path to the resource.")
+    (license license:expat)))
+
 (define-public go-code-gitea-io-actions-proto-go-ping
   (package
     (name "go-code-gitea-io-actions-proto-go-ping")
@@ -267,33 +339,28 @@ using the Git pkt-line format used in various Git operations.")
     (license license:asl2.0)))
 
 (define-public go-github-com-go-git-go-git-v6
-  ;; v6.0.0 is not a release tag as of 14.11.2025
-  (let ((commit "47b1ed2930c96d34c09a3e31abf9673fe361ec63")
-        (revision "0"))
-    (package
-      (inherit go-github-com-go-git-go-git-v5)
-      (name "go-github-com-go-git-go-git-v6")
-      (version (git-version "6.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/go-git/go-git")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1vzj9vs0wqsjpwsi7mvkfs7n8gnk3qg5vhl040c5a5k8h7rlhdz4"))))
-      (arguments
-       (substitute-keyword-arguments
-           (package-arguments go-github-com-go-git-go-git-v5)
-         ((#:import-path _) "github.com/go-git/go-git/v6")))
-      (propagated-inputs
-       (modify-inputs (package-propagated-inputs
-                       go-github-com-go-git-go-git-v5)
-         (replace "go-github-com-go-git-go-billy-v5"
-           go-github-com-go-git-go-billy-v6)
-         (replace "go-github-com-go-git-gcfg"
-           go-github-com-go-git-gcfg-v2))))))
+  (package
+    (inherit go-github-com-go-git-go-git-v5)
+    (name "go-github-com-go-git-go-git-v6")
+    (version "6.0.0-alpha.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/go-git/go-git")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1whmxb0035c7qxnr3lkypcdrdlcg3mc49d20c1kk1q4zyx2v4zgl"))))
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:import-path _) "github.com/go-git/go-git/v6")))
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs go-github-com-go-git-go-git-v5)
+       (replace "go-github-com-go-git-go-billy-v5"
+         go-github-com-go-git-go-billy-v6)
+       (replace "go-github-com-go-git-gcfg"
+         go-github-com-go-git-gcfg-v2)))))
 
 (define-public go-github-com-cli-go-gh-v2
   (package
@@ -667,6 +734,29 @@ interact with GitLab in a simple and uniform way.")
 ;;; Executables:
 ;;;
 
+(define-public f3-cli
+  (package/inherit go-code-forgejo-org-f3-gof3-v3
+    (name "f3-cli")
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:import-path _) "code.forgejo.org/f3/gof3/v3/main")
+       ((#:install-source? #t #t) #f)
+       ((#:skip-build? #t #t) #f)
+       ((#:tests? #t #t) #f)
+       ((#:phases phases '%standard-phases)
+        #~(modify-phases #$phases
+            (add-after 'install 'rename-binary
+              (lambda _
+                (with-directory-excursion #$output
+                  (rename-file "bin/main"
+                               "bin/f3-cli"))))))))
+    (native-inputs
+     (append
+      (package-native-inputs go-code-forgejo-org-f3-gof3-v3)
+      (package-propagated-inputs go-code-forgejo-org-f3-gof3-v3)))
+    (inputs '())
+    (propagated-inputs '())))
+
 (define-public git-sync
   (package
     (name "git-sync")

gnu/packages/golang.scm

@@ -25,7 +25,7 @@
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2021-2025 Sharlatan Hellseher <sharlatanus@mgail.com>
+;;; Copyright © 2021-2026 Sharlatan Hellseher <sharlatanus@mgail.com>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
@@ -95,6 +95,18 @@
 ;; go-1.18.  Starting with go-1.5 go cannot be built without an existing
 ;; installation of go, so we need to use go-1.4 or gccgo.  For architectures which
 ;; are not supported with go-1.4 we use a version of gccgo to bootstrap them.
+;;
+;; The minimum version of Go required depends on the target version of Go:
+;;
+;;     Go <= 1.4: a C toolchain.
+;;     1.5 <= Go <= 1.19: a Go 1.4 compiler.
+;;     1.20 <= Go <= 1.21: a Go 1.17 compiler.
+;;     1.22 <= Go <= 1.23: a Go 1.20 compiler.
+;;
+;; Going forward, Go version 1.N will require a Go 1.M compiler, where M is
+;; N-2 rounded down to an even number.
+;; Example: Go 1.24 and 1.25 require Go 1.22.
+;; See: <https://go.dev/doc/install/source>.
 
 (define-public go-1.4
   (package
@@ -1149,7 +1161,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
 ;;
 ;; Default Golang version used in guix/build-system/go.scm to build packages.
 ;;
-(define-public go go-1.24)
+(define-public go go-1.25)
 
 (define make-go-std
   (mlambdaq (go)

gnu/packages/graph.scm

@@ -55,7 +55,7 @@
   #:use-module (gnu packages cran)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages docbook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages graphics)

gnu/packages/graphics.scm

@@ -78,7 +78,7 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)

gnu/packages/groff.scm

@@ -37,7 +37,7 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages ruby-xyz)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages netpbm)
   #:use-module (gnu packages perl)

gnu/packages/gstreamer.scm

@@ -56,7 +56,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)

gnu/packages/guile-xyz.scm

@@ -4019,38 +4019,6 @@ with documentation.
     ;; details.
     (license license:gpl3+)))
 
-(define-public guile-scriba
-  (package
-    (name "guile-scriba")
-    (version "0.1.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/jjba23/scriba.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1chhbhy21g6zghc3alpqhvb6nizylmzzapjariykv41f47ynhljs"))))
-    (build-system guile-build-system)
-    (arguments
-     (list
-      #:source-directory "src"))
-    (propagated-inputs (list guile-json-4))
-    (inputs (list guile-3.0))
-    (synopsis "Structured logging framework for Guile Scheme")
-    (description
-     "Scriba is a structured logging library for GNU Guile that prioritizes
-flexibility and observability.  It provides modular log routing, formatting,
-and filtering, allowing developers to generate human-readable console logs
-during development and machine-readable JSON logs for production environments.
-Key features include an auto-logger configured via environment variables,
-dynamically scoped log contexts using Scheme parameters, ahead-of-time log
-level filtering, and minimal runtime overhead achieved through memoization
-and compile-time macros.")
-    (home-page "https://codeberg.org/jjba23/scriba")
-    (license license:lgpl3+)))
-
 (define-public guile-simple-iterators
   (let ((commit "50f16a2b2aa57e657e52e19fb3c35bdc182cfa36")
         (revision "0"))
@@ -7558,7 +7526,7 @@ in a large number of randomly generated test cases.")
 (define-public guile-veritas
   (package
     (name "guile-veritas")
-    (version "0.3.0")
+    (version "0.1.6")
     (source
      (origin
        (method git-fetch)
@@ -7567,13 +7535,13 @@ in a large number of randomly generated test cases.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1i64pd5pcx37i25hnks7zj8pbwf1fdy0s5y9ic2sgn800zqq1dxy"))))
+        (base32 "1h4si2p8gj4wfhvn4cshga2kjxf59vd4nwvxkc2i3g5gv3kxhm3k"))))
     (build-system guile-build-system)
     (arguments
      (list
       #:source-directory "src"))
     (native-inputs (list guile-3.0))
-    (propagated-inputs (list guile-fibers guile-json-4))
+    (propagated-inputs (list guile-fibers))
     (home-page "https://codeberg.org/jjba23/veritas")
     (synopsis "Testing framework for Guile")
     (description

gnu/packages/guile.scm

@@ -44,7 +44,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gperf)

gnu/packages/hardware.scm

@@ -61,7 +61,7 @@
   #:use-module (gnu packages debian)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)

gnu/packages/haskell.scm

@@ -52,7 +52,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages ghostscript)

gnu/packages/heads.scm

@@ -33,7 +33,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages m4)

gnu/packages/high-availability.scm

@@ -297,7 +297,7 @@ applications.")
 (define-public nats-server
   (package
     (name "nats-server")
-    (version "2.12.1")
+    (version "2.14.1")
     (source
      (origin
        (method git-fetch)
@@ -306,7 +306,7 @@ applications.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "04dza8jqw4lhnqj1ip05jx47g9frb00x9s0yy1863qf88bvszv8z"))))
+        (base32 "1bnp17ddvpx0n8r7p4spfnhwhwwzff3f9w2h54pss8qvrsv0xy2a"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -320,7 +320,7 @@ applications.")
                        (list "TestHTTPHost"
                              "TestSysLogger"
                              "TestLogMaxArchives")
-                       "|") )
+                       "|"))
       #:test-subdirs
       #~(list "conf/..." "internal/..." "logger/..." "test/...")))
     (inputs
@@ -332,7 +332,6 @@ applications.")
            go-github-com-nats-io-nats-go
            go-github-com-nats-io-nkeys
            go-github-com-nats-io-nuid
-           go-go-uber-org-automaxprocs
            go-golang-org-x-crypto
            go-golang-org-x-sys
            go-golang-org-x-time))

gnu/packages/hurd.scm

@@ -38,7 +38,7 @@
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages disk)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages bison)

gnu/packages/image-processing.scm

@@ -72,7 +72,7 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages engineering)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages game-development)
   #:use-module (gnu packages gcc)
@@ -1521,7 +1521,7 @@ libraries designed for computer vision research and implementation.")
                     python
                     onetbb
                     vxl-1
-                    zlib-ng-compat))
+                    zlib))
       (native-inputs
        (list castxml
              git-minimal

gnu/packages/instrumentation.scm

@@ -34,7 +34,7 @@
   #:use-module (gnu packages elf)
   #:use-module (gnu packages engineering)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)

gnu/packages/ipfs.scm

@@ -99,7 +99,7 @@
 (define-public go-github-com-ipfs-bbloom
   (package
     (name "go-github-com-ipfs-bbloom")
-    (version "0.0.4")
+    (version "0.1.0")
     (source
      (origin
        (method git-fetch)
@@ -108,7 +108,7 @@
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0dcdn7nlysynl7yrbivv8m7j83jq7pabhcff8mvfjdk583rgnkp2"))))
+        (base32 "0k3bwhp0vc4ivnw32q8gi974xcqwjw2471lz4qkypxi7ld8clgmj"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -117,14 +117,15 @@
     (synopsis "Fast bit set Bloom filter")
     (description
      "This package implements a fast bloom filter with real @code{bitset} and
-JSONMarshal/JSONUnmarshal to store/reload the Bloom filter.")
+JSONMarshal/JSONUnmarshal to store/reload the Bloom filter.  It's an
+alternative fork of @url{https://github.com/gxed/bbloom}.")
     (license (list license:expat             ; bbloom.go
                    license:public-domain)))) ; siphash.go
 
 (define-public go-github-com-ipfs-boxo
   (package
     (name "go-github-com-ipfs-boxo")
-    (version "0.35.2")
+    (version "0.39.0")
     (source
      (origin
        (method git-fetch)
@@ -133,18 +134,14 @@ JSONMarshal/JSONUnmarshal to store/reload the Bloom filter.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "02z88kv17m1mia68ac8wliiz5kzq59b1632qql21vy9c3gjqk56r"))
+        (base32 "0sy7v5cnz7ajvfb1mz4p86rmsr8f8agzgfnpwyzlhvvwcglslns9"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
-            ;; Submodules with their own go.mod files and packed as
-            ;; separated packages:
+            ;; Submodules with their own go.mod files and packaged separately:
             ;;
-            ;; - github.com/ipfs/boxo/cmd/boxo-migrate
-            ;; - github.com/ipfs/boxo/cmd/deprecator
             ;; - github.com/ipfs/boxo/examples
-            (for-each delete-file-recursively
-                      (list "cmd" "examples"))))))
+            (delete-file-recursively "examples")))))
     (build-system go-build-system)
     (arguments
      (list
@@ -160,7 +157,13 @@ JSONMarshal/JSONUnmarshal to store/reload the Bloom filter.")
                              ;; config: Get
                              ;; "https://conf.ipfs-mainnet.org/autoconf.json"
                              "TestRealAutoConfURL")
-                       "|"))))
+                       "|"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              ;; See: <https://go.dev/blog/synctest>.
+              (setenv "GODEBUG" "asynctimerchan=0"))))))
     (native-inputs
      (list go-github-com-libp2p-go-libp2p-kad-dht-bootstrap
            go-github-com-libp2p-go-libp2p
@@ -222,11 +225,9 @@ JSONMarshal/JSONUnmarshal to store/reload the Bloom filter.")
            go-go-opencensus-io
            go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp
            go-go-opentelemetry-io-otel
-           go-go-opentelemetry-io-otel-exporters-otlp-otlptrace
            go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracegrpc
            go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracehttp
            go-go-opentelemetry-io-otel-exporters-stdout-stdouttrace
-           go-go-opentelemetry-io-otel-exporters-zipkin
            go-go-opentelemetry-io-otel-sdk
            go-go-opentelemetry-io-otel-trace
            go-go-uber-org-zap
@@ -532,7 +533,6 @@ go-datastore}.")
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.25
       #:import-path "github.com/ipfs/go-dsqueue"
       #:phases
       #~(modify-phases %standard-phases
@@ -615,7 +615,7 @@ storing and retrieving items.  Queued items are persisted across restarts.")
 (define-public go-github-com-ipfs-go-ipfs-cmds
   (package
     (name "go-github-com-ipfs-go-ipfs-cmds")
-    (version "0.14.1")
+    (version "0.16.1")
     (source
      (origin
        (method git-fetch)
@@ -624,7 +624,7 @@ storing and retrieving items.  Queued items are persisted across restarts.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0npgcwzxzgvygl9r9h5kbnfl1dh0hygmwk1jj1hwznyvj47x6lwl"))))
+        (base32 "01cnpzbacdcbzi6lbppyn6vczrjvayh6s0fqm0mcaym1xi61y8jh"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -637,7 +637,7 @@ storing and retrieving items.  Queued items are persisted across restarts.")
                 (delete-file-recursively "examples")))))))
     (propagated-inputs
      (list go-github-com-ipfs-boxo
-           go-github-com-ipfs-go-log
+           go-github-com-ipfs-go-log-v2
            go-github-com-rs-cors
            go-github-com-texttheater-golang-levenshtein
            go-golang-org-x-term))
@@ -1111,6 +1111,38 @@ IPLD graph as detailed below.  Objects are demonstrated here using both
 @code{go-ipld-prime} nodes and @code{go-ipld-format} legacy interface.")
     (license (list license:expat license:asl2.0))))
 
+(define-public go-github-com-ipfs-go-libdht
+  (package
+    (name "go-github-com-ipfs-go-libdht")
+    (version "0.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/ipfs/go-libdht")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "139zzvs9c65k6agfpy412y9bb4pfxdmwvwjbvndx9gd615qhxzak"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/ipfs/go-libdht"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (home-page "https://github.com/ipfs/go-libdht")
+    (synopsis "go-libdht")
+    (description
+     "@code{go-libdht} is a generic toolbox designed for the implementation
+and experimentation of @acronym{Distributed Hash Tables, DHT} in Go.  It
+establishes foundational types and interfaces applicable across a broad
+spectrum of DHTs, especially those sharing a similar topology.  By offering
+reusable components like keys and routing tables, @code{go-libdht} streamlines
+the DHT implementation process.  Using @code{go-libdht}, developers can
+seamlessly craft their own DHTs using the provided modular components.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public go-github-com-ipfs-go-metrics-interface
   (package
     (name "go-github-com-ipfs-go-metrics-interface")
@@ -1881,7 +1913,7 @@ through @url{https://github.com/libp2p/libp2p, LibP2P} using Go's standard
 (define-public go-github-com-libp2p-go-libp2p-kad-dht
   (package
     (name "go-github-com-libp2p-go-libp2p-kad-dht")
-    (version "0.37.1")
+    (version "0.39.1")
     (source
      (origin
        (method git-fetch)
@@ -1890,21 +1922,20 @@ through @url{https://github.com/libp2p/libp2p, LibP2P} using Go's standard
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "07p5vy43kszcqzyy9piagyakgikg5afihd478q2zsviimqhl9ngb"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            ;; Module name has been changed upstream.
-            (substitute* (find-files "." "\\.go$")
-              (("github.com/probe-lab/go-libdht")
-               "github.com/ipfs/go-libdht"))))))
+        (base32 "1lyh4a4m6v7i1sj18vi02snx2291hfrj09y484y2k9wynhdr71rz"))))
     (build-system go-build-system)
     (arguments
      (list
       #:embed-files #~(list "sorted-network-list.bin")
       #:import-path "github.com/libp2p/go-libp2p-kad-dht"
       ;; Error: "[]" should have 3 item(s), but has 0
-      #:test-flags #~(list "-skip" "TestIPDiversityFilter/Different_IPv6_blocks")))
+      #:test-flags #~(list "-skip" "TestIPDiversityFilter/Different_IPv6_blocks")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              ;; See: <https://go.dev/blog/synctest>.
+              (setenv "GODEBUG" "asynctimerchan=0"))))))
     (native-inputs
      (list go-github-com-ipfs-go-test
            go-github-com-ipfs-go-detect-race
@@ -1922,6 +1953,7 @@ through @url{https://github.com/libp2p/libp2p, LibP2P} using Go's standard
            go-github-com-ipfs-go-cid
            go-github-com-ipfs-go-datastore
            go-github-com-ipfs-go-dsqueue
+           go-github-com-ipfs-go-libdht
            go-github-com-ipfs-go-log-v2
            go-github-com-libp2p-go-libp2p-kbucket
            go-github-com-libp2p-go-libp2p-record
@@ -1934,7 +1966,6 @@ through @url{https://github.com/libp2p/libp2p, LibP2P} using Go's standard
            go-github-com-multiformats-go-multiaddr
            go-github-com-multiformats-go-multibase
            go-github-com-multiformats-go-multihash
-           go-github-com-probe-lab-go-libdht
            go-github-com-whyrusleeping-go-keyspace
            go-go-opentelemetry-io-otel
            go-go-opentelemetry-io-otel-metric
@@ -2007,7 +2038,7 @@ kab-dht}.  This DHT is modeled after Kademlia with S/Kademlia modifications.")
 (define-public go-github-com-libp2p-go-libp2p-pubsub
   (package
     (name "go-github-com-libp2p-go-libp2p-pubsub")
-    (version "0.13.0")
+    (version "0.16.0")
     (source
      (origin
        (method git-fetch)
@@ -2016,31 +2047,45 @@ kab-dht}.  This DHT is modeled after Kademlia with S/Kademlia modifications.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "14afjrgfbmlrnjd5xnl70ff95mbvfxp9n8mx3hrw8069bcpzvm2k"))))
+        (base32 "03nh7lbzy51yyfgi6lqlyxz91il05axvis0nq3zfi8c98dadzr5j"))))
     (build-system go-build-system)
     (arguments
      (list
-      ;; TODO: Tests may need some adjustments as they take quite a lot of
-      ;; time to finish.
-      #:tests? #f
       #:import-path "github.com/libp2p/go-libp2p-pubsub"
+      #:test-flags
+      #~(list "-short"
+              "-skip" (string-join
+                       ;; Expencive tests, which takes more than 10s to pass
+                       ;; and accumulate hard timeout; succeeded after 235.9
+                       ;; seconds with 16 threads.
+                       (list "TestBasicSeqnoValidatorReplay"
+                             "TestLastSeenCacheNotFoundAfterExpire"
+                             "TestConfigurableMaxMessageSize"
+                             "TestFloodSubPluggableProtocol/won"
+                             "TestGossipsubAttackSpamIHAVE"
+                             "TestGossipsubFanoutMaintenance"
+                             "TestGossipsubGossip"
+                             "TestGossipsubOpportunisticGrafting"
+                             "TestGossipsubRPCFragmentation"
+                             "TestGossipsubStarTopology"
+                             "TestGossipsubStarTopologyWithSignedPeerRecords"
+                             "TestPairwiseInteractionWithPartialMessages"
+                             "TestPeerDisconnect")
+                       "|"))
       ;; src/github.com/libp2p/go-libp2p-asn-util/asn.go:12:12: pattern
       ;; sorted-network-list.bin: cannot embed irregular file
       ;; sorted-network-list.bin
       #:embed-files #~(list "sorted-network-list\\.bin")))
     (native-inputs
-     (list go-github-com-libp2p-go-libp2p-testing
-           go-github-com-stretchr-testify))
+     (list go-github-com-libp2p-go-libp2p-testing))
     (propagated-inputs
      (list go-github-com-benbjohnson-clock
            go-github-com-gogo-protobuf
-           go-github-com-ipfs-go-log-v2
            go-github-com-libp2p-go-buffer-pool
            go-github-com-libp2p-go-libp2p
            go-github-com-libp2p-go-msgio
            go-github-com-multiformats-go-multiaddr
-           go-github-com-multiformats-go-varint
-           go-go-uber-org-zap))
+           go-github-com-multiformats-go-varint))
     (home-page "https://github.com/libp2p/go-libp2p-pubsub")
     (synopsis "PubSub implementation for go-libp2p")
     (description
@@ -2306,7 +2351,7 @@ types.")
 (define-public kubo
   (package
     (name "kubo")
-    (version "0.39.0")
+    (version "0.41.0")
     (source
      (origin
        (method git-fetch)
@@ -2315,7 +2360,7 @@ types.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "17571bm3zp04z6y62mpdi3vsrmx7xrhsyzzz5nssfc4rymp0y4sn"))
+        (base32 "1fa4szzvgzahv1n5laz11habdj4p43n8sbq5msmp0d95cnqnciyg"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
@@ -2326,7 +2371,7 @@ types.")
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.25
+      #:go go-1.26
       #:install-source? #f
       #:embed-files #~(list "sorted-network-list.bin" ".*\\.css" ".*\\.html")
       #:unpack-path "github.com/ipfs/kubo"
@@ -2347,8 +2392,7 @@ types.")
                                   "ipfs"
                                   #~(string-append #$output "/bin/ipfs"))
                             "commands" "completion" "bash")))))))))
-    (inputs (list go-bazil-org-fuse
-                  go-contrib-go-opencensus-io-exporter-prometheus
+    (inputs (list go-contrib-go-opencensus-io-exporter-prometheus
                   go-github-com-anmitsu-go-shlex
                   go-github-com-blang-semver-v4
                   go-github-com-caddyserver-certmagic
@@ -2360,9 +2404,9 @@ types.")
                   go-github-com-dustin-go-humanize
                   go-github-com-elgris-jsondiff
                   go-github-com-facebookgo-atomicfile
-                  go-github-com-filecoin-project-go-clock
                   go-github-com-fsnotify-fsnotify
                   go-github-com-google-uuid
+                  go-github-com-hanwen-go-fuse-v2
                   go-github-com-hashicorp-go-version
                   go-github-com-ipfs-boxo
                   go-github-com-ipfs-go-block-format

gnu/packages/kde-frameworks.scm

@@ -58,7 +58,7 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages ebook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)

gnu/packages/kde-graphics.scm

@@ -57,7 +57,7 @@
   #:use-module (gnu packages djvu)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages ebook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)

gnu/packages/kde-pim.scm

@@ -46,7 +46,7 @@
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages geo)
   #:use-module (gnu packages glib)

gnu/packages/kde-sdk.scm

@@ -36,7 +36,7 @@
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages apr)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages code)

gnu/packages/kerberos.scm

@@ -36,7 +36,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages gettext)

gnu/packages/lego.scm

@@ -27,7 +27,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages qt))
 

gnu/packages/lesstif.scm

@@ -25,7 +25,7 @@
   #:use-module (guix git-download)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages c)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages pkg-config)

gnu/packages/libreoffice.scm

@@ -59,7 +59,7 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages game-development)

gnu/packages/librewolf.scm

@@ -125,14 +125,14 @@
   ;; ex:
   ;; tar xf /gnu/store/...-firefox-123.4.source.tar.xz -O \
   ;;     firefox-123.4/browser/locales/l10n-changesets.json | grep revision
-  (let ((commit "a867076ab29cc0777b14d0448707629cdb825d81"))
+  (let ((commit "a8799feda04a221a2c552576501975662c5350bb"))
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/mozilla-l10n/firefox-l10n.git")
             (commit commit)))
       (file-name (git-file-name "firefox-l10n" commit))
-      (sha256 (base32 "1j6gzzq1y5nx7iv3p173fmc4b87d5lwb0hnaiq1lmc6ryjnzk3wm")))))
+      (sha256 (base32 "1625rh1w5fdq6nl7fpwgiln29hkqcj0zksmnwcfj34y5cvhwrq2z")))))
 
 (define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n)
   (let* ((ff-src (firefox-source-origin
@@ -244,17 +244,17 @@
 ;; It's used for cache validation and therefore can lead to strange bugs.
 ;; ex: date '+%Y%m%d%H%M%S'
 ;; or: (format-time-string "%Y%m%d%H%M%S")
-(define %librewolf-build-id "20260527211539")
+(define %librewolf-build-id "20260524201108")
 
 (define-public librewolf
   (package
     (name "librewolf")
-    (version "151.0.2-1")
+    (version "151.0.1-2")
     (source
      (make-librewolf-source
       #:version version
-      #:firefox-hash "1j7q00fwdijvg5b01jmadhqabwmwdcqd15srmkbqsqgjk5vjdi33"
-      #:librewolf-hash "0fm11phcpp2xggwdhdl044f4a015adg8bplw4cj0in5hq1zqkbi2"
+      #:firefox-hash "1h440pkdqkx3085ij9nz9n9h1b6c2p92bg3lf983my6b711f62m8"
+      #:librewolf-hash "1hy4p1336igy8p73hrgvmv7krbr15ap9ain79n340d3sapqkhbg8"
       #:l10n firefox-l10n))
     (build-system gnu-build-system)
     (arguments

gnu/packages/lighting.scm

@@ -29,7 +29,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gnunet)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages libftdi)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)

gnu/packages/linux.scm

@@ -135,7 +135,7 @@
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
@@ -1218,12 +1218,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                        "aarch64-linux" "powerpc64le-linux" "riscv64-linux")
                      #:configuration-file kernel-config))
 
-(define-public linux-libre-version         linux-libre-7.0-version)
-(define-public linux-libre-gnu-revision    linux-libre-7.0-gnu-revision)
-(define-public linux-libre-pristine-source linux-libre-7.0-pristine-source)
-(define-public linux-libre-source          linux-libre-7.0-source)
-(define-public linux-libre                 linux-libre-7.0)
-
 (define-public linux-libre-6.19
   (make-linux-libre* linux-libre-6.19-version
                      linux-libre-6.19-gnu-revision
@@ -1240,6 +1234,12 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                        "aarch64-linux" "powerpc64le-linux" "riscv64-linux")
                      #:configuration-file kernel-config))
 
+(define-public linux-libre-version         linux-libre-6.18-version)
+(define-public linux-libre-gnu-revision    linux-libre-6.18-gnu-revision)
+(define-public linux-libre-pristine-source linux-libre-6.18-pristine-source)
+(define-public linux-libre-source          linux-libre-6.18-source)
+(define-public linux-libre                 linux-libre-6.18)
+
 (define-public linux-libre-6.12
   (make-linux-libre* linux-libre-6.12-version
                      linux-libre-6.12-gnu-revision
@@ -1979,8 +1979,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform2-dsi.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform-next.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
 
-(define-public linux-libre-arm64-mnt-reform linux-libre-arm64-mnt-reform-7.0)
-
 (define-public linux-libre-arm64-mnt-reform-6.19
   ;; Kernel for use on the MNT/Reform systems
   ;; https://mntre.com/reform.html
@@ -2317,6 +2315,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform2-dsi.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform-next.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
 
+(define-public linux-libre-arm64-mnt-reform linux-libre-arm64-mnt-reform-6.18)
+
 (define-public linux-libre-arm64-mnt-reform-6.12
   ;; Kernel for use on the MNT/Reform systems
   ;; https://mntre.com/reform.html

gnu/packages/logging.scm

@@ -46,7 +46,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages databases)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages geo)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages kerberos)

gnu/packages/lua.scm

@@ -77,7 +77,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages rdf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages re2c)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages rsync)
   #:use-module (gnu packages ssh)