gnu: ghc-haskeline: Fix build

* gnu/packages/haskell-xyz.scm
(ghc-haskeline): Update to version 0.8.4.1.
[native-inputs]: Add which.
[phases]: Add example binary to PATH before running tests.

Change-Id: I0c006c89b766397dd144da76ae20c5326ad776f4
Signed-off-by: Andreas Enge <andreas@enge.fr>

.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"))

CODEOWNERS

@@ -292,12 +292,12 @@ guix/build-system/julia\.scm                       @guix/julia
 
 gnu/packages/(kde)(-.+|)\.scm$                     @guix/kde
 
-gnu/build/linux-modules\.scm                       @guix/linux-libre
-gnu/packages/aux-files/linux-libre.*$              @guix/linux-libre
-gnu/packages/linux\.scm                            @guix/linux-libre
-gnu/tests/linux-modules\.scm                       @guix/linux-libre
-guix/build/linux-module-build-system\.scm          @guix/linux-libre
-guix/build-system/linux-module\.scm                @guix/linux-libre
+gnu/build/linux-modules\.scm                       @guix/kernel
+gnu/packages/aux-files/linux-libre.*$              @guix/kernel
+gnu/packages/linux\.scm                            @guix/kernel
+gnu/tests/linux-modules\.scm                       @guix/kernel
+guix/build/linux-module-build-system\.scm          @guix/kernel
+guix/build-system/linux-module\.scm                @guix/kernel
 
 gnu/packages/lisp(-.+|)\.scm$                      @guix/lisp
 guix/build/asdf-build-system\.scm                  @guix/lisp

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

etc/teams.scm

@@ -876,8 +876,8 @@ and the maven-build-system."
         "The plasma desktop environment, and KDE Applications."
         #:scope (list (make-regexp* "^gnu/packages/(kde)(-.+|)\\.scm$"))))
 
-(define-team linux-libre
-  (team 'linux-libre
+(define-team kernel
+  (team 'kernel
         #:name "Linux-libre kernel team"
         #:scope (list "gnu/build/linux-modules.scm"
                       (make-regexp* "^gnu/packages/aux-files/linux-libre.*$")
@@ -1298,7 +1298,7 @@ the \"texlive\" importer."
 (define-member (person "Leo Famulari"
                        "leo@famulari.name"
                        "lfam")
-  linux-libre)
+  kernel)
 
 (define-member (person "Efraim Flashner"
                        "efraim@flashner.co.il"
@@ -1383,7 +1383,7 @@ the \"texlive\" importer."
 (define-member (person "Vagrant Cascadian"
                        "vagrant@debian.org"
                        "vagrantc")
-  debian embedded linux-libre)
+  debian embedded kernel)
 
 (define-member (person "Vagrant Cascadian"        ;XXX: duplicate
                        "vagrant@reproducible-builds.org"
@@ -1537,7 +1537,7 @@ the \"texlive\" importer."
 (define-member (person "Rodion Goritskov"
                        "rodion@goritskov.com"
                        "rodion-goritskov")
-  games java kde linux-libre release)
+  games java kde kernel release)
 
 (define-member (person "Jason Conroy"
                        "jconroy@tscripta.net"
@@ -1622,7 +1622,7 @@ the \"texlive\" importer."
 (define-member (person "Wilko Meyer"
                        "w@wmeyer.eu"
                        "theesm")
-  linux-libre perl)
+  kernel perl)
 
 (define-member (person "Untrusem"
                        "mysticmoksh@riseup.net"

gnu/local.mk

@@ -1452,6 +1452,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghc-aeson-encodeDouble.patch		\
   %D%/packages/patches/ghc-basement-fix-32bit.patch		\
   %D%/packages/patches/ghc-bytestring-handle-ghc9.patch	\
+  %D%/packages/patches/ghc-chell-quickcheck-enable-qc-2.15.patch	\
   %D%/packages/patches/ghc-clock-realfrag.patch	\
   %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch	\
   %D%/packages/patches/ghc-memory-fix-32bit.patch		\
@@ -1967,7 +1968,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 +1994,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 +2024,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 +2629,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/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/dhall.scm

@@ -31,13 +31,13 @@
 (define-public dhall
   (package
     (name "dhall")
-    (version "1.41.2")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "dhall" version))
-              (sha256
-               (base32
-                "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"))))
+    (version "1.42.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "dhall" version))
+       (sha256
+        (base32 "0fvvqvh6diqi55dmncfs06rvcw8k0a1hs2gq228yxvsfbzcpv44s"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "dhall")))
     (inputs (list ghc-aeson
@@ -73,8 +73,8 @@
                   ghc-text-manipulate
                   ghc-text-short
                   ghc-th-lift-instances
+                  ghc-unix-compat
                   ghc-unordered-containers
-                  ghc-uri-encode
                   ghc-vector
                   ghc-cryptohash-sha256
                   ghc-http-types
@@ -86,7 +86,6 @@
                          ghc-quickcheck-instances
                          ghc-special-values
                          ghc-spoon
-                         ghc-system-filepath
                          ghc-tasty
                          ghc-tasty-expected-failure
                          ghc-tasty-hunit
@@ -97,9 +96,8 @@
                          ghc-mockery
                          ghc-doctest))
     (arguments
-     `(#:tests? #f ; Tries to access httpbin.org
-       #:cabal-revision ("4"
-                         "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx")))
+     `(#:cabal-revision ("2"
+                         "1h9kxpn3kzwmxj07mqc0cxjj2ak3dyxnifb78z5vn34xn747j5bk")))
     (home-page "http://hackage.haskell.org/package/dhall")
     (synopsis "Configuration language guaranteed to terminate")
     (description

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/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)
@@ -321,37 +321,41 @@ based on Qt.")
 (define-public ghc-hledger
   (package
     (name "ghc-hledger")
-    (version "1.27.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hledger" version))
-              (sha256
-               (base32
-                "0qdg87m7ys2ykqqq32p7h7aw827w4f5bcqx4dspxxq6zqlvzddqb"))))
+    (version "1.43.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hledger" version))
+       (sha256
+        (base32 "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hledger")))
     (inputs (list ghc-decimal
                   ghc-diff
                   ghc-aeson
                   ghc-ansi-terminal
-                  ghc-breakpoint
                   ghc-cmdargs
                   ghc-data-default
                   ghc-extra
                   ghc-githash
                   ghc-hashable
                   ghc-hledger-lib
+                  ghc-http-client
+                  ghc-http-types
                   ghc-lucid
                   ghc-math-functions
                   ghc-megaparsec
                   ghc-microlens
+                  ghc-modern-uri
                   ghc-regex-tdfa
+                  ghc-req
                   ghc-safe
                   ghc-shakespeare
                   ghc-split
                   ghc-tabular
                   ghc-tasty
                   ghc-temporary
+                  ghc-text-ansi
                   ghc-timeit
                   ghc-unordered-containers
                   ghc-utf8-string
@@ -382,8 +386,8 @@ Accounting.")
       #~(modify-phases %standard-phases
           (add-after 'install 'install-doc
             (lambda _
-              (install-file "hledger.info" (string-append #$output "/share/info"))
-              (install-file "hledger.1" (string-append #$output "/man/man1"))))
+              (install-file "embeddedfiles/hledger.info" (string-append #$output "/share/info"))
+              (install-file "embeddedfiles/hledger.1" (string-append #$output "/man/man1"))))
            (add-after 'register 'remove-libraries
              (lambda* (#:key outputs #:allow-other-keys)
                (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib")))))))))
@@ -2280,13 +2284,13 @@ textual ledgers to Beancount files.")
 (define-public hledger-web
   (package
     (name "hledger-web")
-    (version "1.27.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hledger-web" version))
-              (sha256
-               (base32
-                "151dxci7dld8626dzw823sr3d9iaac92wfzbfcbdz4jh9f7n07wa"))))
+    (version "1.43.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hledger-web" version))
+       (sha256
+        (base32 "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hledger-web")))
     (inputs (list ghc-decimal
@@ -2294,7 +2298,6 @@ textual ledgers to Beancount files.")
                   ghc-base64
                   ghc-blaze-html
                   ghc-blaze-markup
-                  ghc-breakpoint
                   ghc-case-insensitive
                   ghc-clientsession
                   ghc-cmdargs
@@ -2302,6 +2305,8 @@ textual ledgers to Beancount files.")
                   ghc-conduit-extra
                   ghc-data-default
                   ghc-extra
+                  ghc-file-embed
+                  ghc-githash
                   ghc-hjsmin
                   ghc-hledger
                   ghc-hledger-lib
@@ -2311,6 +2316,7 @@ textual ledgers to Beancount files.")
                   ghc-http-types
                   ghc-megaparsec
                   ghc-network
+                  ghc-safe
                   ghc-shakespeare
                   ghc-unix-compat
                   ghc-unordered-containers

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")
@@ -4311,7 +4287,7 @@ typographical palette.")
 (define-public font-mona-sans
   (package
     (name "font-mona-sans")
-    (version "2.0.27")
+    (version "2.0.26")
     (source
      (origin
        (method git-fetch)
@@ -4321,7 +4297,7 @@ typographical palette.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "10xbs857d21zrfx0cpzcsyyk76j921qq68qpz5r2kl4jr3gz541z"))))
+         "09b6apxq659y4dkkm5swy683q6hviibv1cd48ragm5rd1376hsaz"))))
     (build-system font-build-system)
     (outputs '("out" "ttf" "woff"))
     (home-page "https://github.com/mona-sans")

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-check.scm

@@ -2151,57 +2151,6 @@ testing and improve the efficiency of unit test writing.")
 testing of time-sensitive code.")
     (license license:expat)))
 
-(define-public go-github-com-josharian-mapfs
-  (package
-    (name "go-github-com-josharian-mapfs")
-    (version "0.0.0-20210615234106-095c008854e6")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/josharian/mapfs")
-             (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "09i6shqwacx8nm6jfyhc1zvry8fcb3ddd98m96skzybv9lckq7h4"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/josharian/mapfs"))
-    (home-page "https://github.com/josharian/mapfs")
-    (synopsis "Fork of Go std's testing/fstest.MapFS")
-    (description
-     "This is a fork of the @code{MapFS} component of the Go standard
-library's testing/fstest package.")
-    (license license:bsd-3)))
-
-(define-public go-github-com-josharian-txtarfs
-  (package
-    (name "go-github-com-josharian-txtarfs")
-    (version "0.0.0-20240408113805-5dc76b8fe6bf")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/josharian/txtarfs")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "129rf6hviw46rxcnnkc8jb1k579798rrhnh1k3nn7npi260ia44m"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/josharian/txtarfs"))
-    (propagated-inputs
-     (list go-github-com-josharian-mapfs
-           go-golang-org-x-tools))
-    (home-page "https://github.com/josharian/txtarfs")
-    (synopsis "Convert a txtar to an io.FS")
-    (description
-     "This package turns a @url{https://pkg.go.dev/golang.org/x/tools/txtar,
- txtar} into an @url{https://pkg.go.dev/io/fs, fs.FS}.")
-    (license license:expat)))
-
 (define-public go-github-com-joshdk-go-junit
   (package
     (name "go-github-com-joshdk-go-junit")
@@ -2713,56 +2662,6 @@ error messages, preserving the order of @code{have} (actual result) before
 @code{want} (expected result) to minimize confusion.")
     (license license:asl2.0)))
 
-(define-public go-github-com-newmo-oss-go-caller
-  (package
-    (name "go-github-com-newmo-oss-go-caller")
-    (version "0.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/newmo-oss/go-caller")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1hn0wj2v6yvn83lpilbcb9xpa36fmcbv83rk6fhr2rwckp2dxy8p"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/newmo-oss/go-caller"))
-    (native-inputs
-     (list go-github-com-google-go-cmp))
-    (home-page "https://github.com/newmo-oss/go-caller")
-    (synopsis "Collect stack traces at runtime")
-    (description
-     "This package provides a library for collecting stack traces at runtime.")
-    (license license:expat)))
-
-(define-public go-github-com-newmo-oss-gotestingmock
-  (package
-    (name "go-github-com-newmo-oss-gotestingmock")
-    (version "0.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/newmo-oss/gotestingmock")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1flgmarj961k4vl6d7i2740snrdfjiv4aigb87v5aznvi8bwa5d3"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/newmo-oss/gotestingmock"))
-    (propagated-inputs
-     (list go-github-com-newmo-oss-go-caller))
-    (home-page "https://github.com/newmo-oss/gotestingmock")
-    (synopsis "Mocking utilities for Go")
-    (description
-     "This package provides mocking utilities for unit tests in Go.")
-    (license license:expat)))
-
 (define-public go-github-com-onsi-ginkgo
   (package
     (name "go-github-com-onsi-ginkgo")
@@ -3368,84 +3267,6 @@ and CLI tool.")
 such as readers and writers that fail after N consecutive reads/writes.")
     (license license:expat)))
 
-(define-public go-github-com-tenntenn-golden
-  (package
-    (name "go-github-com-tenntenn-golden")
-    (version "0.5.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tenntenn/golden")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "09w3h7c4z930z91dg7bfs9m680pw9zgqyyikw88gisv1z86y3qlz"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/tenntenn/golden"))
-    (native-inputs
-     (list go-github-com-google-go-cmp))
-    (propagated-inputs
-     (list go-github-com-josharian-txtarfs
-           go-golang-org-x-tools))
-    (home-page "https://github.com/tenntenn/golden")
-    (synopsis "Utilities for golden file tests")
-    (description "This package provides utilities for golden file tests.")
-    (license license:expat)))
-
-(define-public go-github-com-tenntenn-modver
-  (package
-    (name "go-github-com-tenntenn-modver")
-    (version "1.0.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tenntenn/modver")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1p4402lizz5ny0l49yxa65ryhx09wm8g13lx4pw0nw0s4r06rw3g"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/tenntenn/modver"))
-    (native-inputs
-     (list go-github-com-google-go-cmp))
-    (propagated-inputs
-     (list go-github-com-hashicorp-go-version))
-    (home-page "https://github.com/tenntenn/modver")
-    (synopsis "Utility for Go modules")
-    (description "This package provides utilities for Go modules.")
-    (license license:expat)))
-
-(define-public go-github-com-tenntenn-text-transform
-  (package
-    (name "go-github-com-tenntenn-text-transform")
-    (version "0.0.0-20250402111347-ba836492e880")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tenntenn/text")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "19f302js8pxyqnl189992zp6pl169b4gpgn6wywpdir77vm56pih"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/tenntenn/text/transform"
-      #:unpack-path "github.com/tenntenn/text"))
-    (propagated-inputs
-     (list go-golang-org-x-text))
-    (home-page "https://github.com/tenntenn/text")
-    (synopsis "Text transformation utilities")
-    (description "This package provides text transformation utilities in Go.")
-    (license license:expat)))
-
 (define-public go-github-com-tj-assert
   (package
     (name "go-github-com-tj-assert")
@@ -3728,34 +3549,6 @@ goroutine leaks and understanding goroutine lifecycles.")
 based on Go @code{testing} library procedures.")
     (license license:cc0)))
 
-(define-public go-gitlab-com-bosi-decorder
-  (package
-    (name "go-gitlab-com-bosi-decorder")
-    (version "0.4.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://gitlab.com/bosi/decorder")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0g9x5f7mhvdzwki57902qgb4ih2gipkg255nf9hjv30flfnl2294"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "gitlab.com/bosi/decorder"
-      #:test-flags #~(list "-vet=off")))
-    (propagated-inputs
-     (list go-golang-org-x-tools))
-    (home-page "https://gitlab.com/bosi/decorder")
-    (synopsis "Declaration order and number linter for golang")
-    (description
-     "This package provides a declaration order linter for Go.  In case of
-this tool declarations are @code{type}, @code{const}, @code{var} and
-@code{func}.")
-    (license license:expat)))
-
 (define-public go-go-abhg-dev-requiredfield
   (package
     (name "go-go-abhg-dev-requiredfield")
@@ -3864,60 +3657,6 @@ and restore them afterwards.")
 of @url{https://github.com/wadey/gocovmerge}.")
     (license license:bsd-2)))
 
-(define-public go-go-simpler-org-assert
-  (package
-    (name "go-go-simpler-org-assert")
-    (version "0.9.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/go-simpler/assert")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0pg3yhicggby978n8war9n5zzigr95mvnsipnk6zgsjn6gyvjdm5"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "go-simpler.org/assert"))
-    (home-page "https://go-simpler.org/assert")
-    (synopsis "Assertions for the standard testing package")
-    (description
-     "This package implements assertions for the standard @code{testing}
-package, and is a minimalistic replacement for the @code{stretchr/testify}
-package.")
-    (license license:mpl2.0)))
-
-(define-public go-go-simpler-org-musttag
-  (package
-    (name "go-go-simpler-org-musttag")
-    (version "0.14.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/go-simpler/musttag")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "15kvnppc2q8ay1m8lhag0bmdx08kc68lzv78699qkyi6bcw68ajf"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "go-simpler.org/musttag"
-      #:test-flags #~(list "-skip" "TestAnalyzer")))
-    (native-inputs
-     (list go-go-simpler-org-assert))
-    (propagated-inputs
-     (list go-golang-org-x-tools))
-    (home-page "https://go-simpler.org/musttag")
-    (synopsis "Enforce field tags in (un)marshaled structs")
-    (description
-     "This package checks that exported fields of a struct passed to a
-@code{Marshal}-like function are annotated with the relevant tag.")
-    (license license:mpl2.0)))
-
 (define-public go-go-simpler-org-sloglint
   (package
     (name "go-go-simpler-org-sloglint")

gnu/packages/golang-crypto.scm

@@ -4293,7 +4293,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 +4309,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-web.scm

@@ -3724,51 +3724,6 @@ lookups.  It implements looking up the following records:
 Storage}.")
     (license license:asl2.0)))
 
-(define-public go-github-com-beeper-argo-go
-  (package
-    (name "go-github-com-beeper-argo-go")
-    (version "1.1.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/beeper/argo-go")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1c11aqbap9yxpnc8bvzjiy5cg53brhc47hw2q24xjvbw5d90r2ff"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/beeper/argo-go"
-      #:embed-files #~(list "prelude.graphql")
-      #:test-flags
-      #~(list "-vet=off"
-              "-skip" (string-join
-                       ;; These test groups fail with panic by similar error:
-                       ;; UnsignedDecode failed for 10000000000000000000000:
-                       ;; varint: varint too large for 64-bit. Encoded:
-                       ;; 80808092abb7b2f099bc08.
-                       (list "TestUnsignedRoundTrip"
-                             "TestQueriesEquivalence"
-                             "TestStarWarsEquivalence"
-                             "TestZigZagRoundTrip"
-                             ;; UnsignedDecode error mismatch for too long
-                             ;; varint.
-                             "TestUnsignedDecodeTooLong")
-                       "|"))))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (propagated-inputs
-     (list go-github-com-elliotchance-orderedmap-v3
-           go-github-com-vektah-gqlparser-v2))
-    (home-page "https://github.com/beeper/argo-go")
-    (synopsis "Go implementation of Argo for GraphQL")
-    (description
-     "Go implementation of Argo, a compact and compressible binary
-serialization format for GraphQL.")
-    (license license:expat)))
-
 (define-public go-github-com-beevik-ntp
   (package
     (name "go-github-com-beevik-ntp")
@@ -20917,30 +20872,28 @@ state machine.  See @url{https://raft.github.io/raft.pdf} for more info.")
 (define-public go-go-mau-fi-whatsmeow
   (package
     (name "go-go-mau-fi-whatsmeow")
-    (version "0.0.0-20260529101937-a7ea56383ec4")
+    (version "0.0.0-20241215104421-68b0856cce22")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/tulir/whatsmeow")
-              (commit (go-version->git-ref version))))
+             (url "https://github.com/tulir/whatsmeow")
+             (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0i6vcn6l5sf0wsyr3k856xiz5pq3ivl9a7xd1bzqzlq74jmivivc"))))
+        (base32 "1y3h132g3w6ihc8jn587wvyha9xm3sinjlr0znqq7krvynz3z8id"))))
     (build-system go-build-system)
     (arguments
      (list
       #:import-path "go.mau.fi/whatsmeow"))
     (propagated-inputs
-     (list go-github-com-beeper-argo-go
-           go-github-com-coder-websocket
-           go-github-com-google-uuid
+     (list go-github-com-google-uuid
+           go-github-com-gorilla-websocket
            go-github-com-rs-zerolog
            go-go-mau-fi-libsignal
            go-go-mau-fi-util
            go-golang-org-x-crypto
            go-golang-org-x-net
-           go-golang-org-x-sync
            go-google-golang-org-protobuf))
     (home-page "https://go.mau.fi/whatsmeow")
     (synopsis "Go library for the WhatsApp web multidevice API")
@@ -23390,16 +23343,16 @@ the code or routes.")
 (define-public go-maunium-net-go-mautrix
   (package
     (name "go-maunium-net-go-mautrix")
-    (version "0.28.0")
+    (version "0.22.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/mautrix/go")
-              (commit (string-append "v" version))))
+             (url "https://github.com/mautrix/go")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "09isb4q876mkcwm2yk7vgzwhd3yw1n0s78qvdb7wpmab6vvxjnlf"))))
+        (base32 "0msqbs3qc9ljckj41hgvp16p0sbfzm25wzldb68av9svimscwnmm"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -23415,32 +23368,27 @@ the code or routes.")
          ;; golang.org/x/net/publicsuffix/table.go:33:12: pattern data/text:
          ;; cannot embed irregular file data/text
          "text")
-      #:test-flags
-      #~(list "-skip" (string-join
-                       ;; Network access is required for the tets.
-                       (list "TestCrossSignVerification_ScanQRAndConfirmScan"
-                             "TestSelfVerification_Accept_QRContents"
-                             "TestSelfVerification_ScanQRAndConfirmScan"
-                             "TestSelfVerification_ScanQRTransactionIDCorrup"
-                             "TestSelfVerification_ScanQRKeyCorrupted"
-                             "TestVerification_SAS"
-                             "TestVerification_SAS_BothCallStart"
-                             "TestVerification_Start"
-                             "TestVerification_StartThenCancel"
-                             "TestVerification_Accept_NoSupportedMethods"
-                             "TestVerification_Accept_CorrectMethodsPresented"
-                             "TestVerification_Accept_CancelOnNonParticipati"
-                             "TestVerification_ErrorOnDoubleAccept"
-                             "TestVerification_CancelOnDoubleStart"
-                             "TestClient_Version"
-                             "TestResolveServerName"
-                             "TestServerKeyResponse_VerifySelfSignature"
-                             "TestServerKeyResponse_FailWithFilter")
-                       "|"))))
+    #:test-flags
+    #~(list "-skip" (string-join
+                     ;; Network access is required for the tets.
+                     (list "TestClient_Version"
+                           "TestResolveServerName/RM_Step_3B"
+                           "TestResolveServerName/RM_Step_3C"
+                           "TestResolveServerName/RM_Step_3C_MSC4040"
+                           "TestResolveServerName/RM_Step_3D"
+                           "TestResolveServerName/RM_Step_4"
+                           "TestResolveServerName/RM_Step_4_MSC4040"
+                           "TestResolveServerName/maunium")
+                     "|")
+            "-vet=off")))
+    ;; XXX: The final application needs a "libolm" package.
+    (native-inputs
+     (list olm))
     (propagated-inputs
      (list go-filippo-io-edwards25519
            go-github-com-chzyer-readline
-           go-github-com-coder-websocket
+           go-github-com-gorilla-mux
+           go-github-com-gorilla-websocket
            go-github-com-lib-pq
            go-github-com-mattn-go-sqlite3
            go-github-com-rs-xid
@@ -23457,9 +23405,7 @@ the code or routes.")
            go-golang-org-x-net
            go-golang-org-x-sync
            go-gopkg-in-yaml-v3
-           go-maunium-net-go-mauflag
-           ;; XXX: The final application needs a "libolm" package.
-           olm))
+           go-maunium-net-go-mauflag))
     (home-page "https://maunium.net/go/mautrix")
     (synopsis "Golang Matrix framework")
     (description

gnu/packages/golang-xyz.scm

@@ -78,7 +78,6 @@
 ;;; Copyright © 2026 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;; Copyright © 2026 Sughosha <sughosha@disroot.org>
-;;; Copyright © 2026 orahcio <orahcio@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -114,7 +113,6 @@
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
-  #:use-module (gnu packages golang-graphics)
   #:use-module (gnu packages golang-maths)
   #:use-module (gnu packages golang-vcs)
   #:use-module (gnu packages golang-web)
@@ -445,33 +443,6 @@ a human-readable byte format.")
 time dependencies in tests.")
     (license license:asl2.0)))
 
-(define-public go-code-rocketnine-space-tslocum-cbind
-  (package
-    (name "go-code-rocketnine-space-tslocum-cbind")
-    (version "0.1.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://codeberg.org/tslocum/cbind.git")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0a0gpzapm3jsivdf5h6lvlxhzngrmyj7xp5fdk20l8r4yba7yqsy"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "code.rocketnine.space/tslocum/cbind"
-      #:test-flags #~(list "--skip" "TestConfiguration")))
-    (propagated-inputs
-     (list go-github-com-gdamore-tcell-v2))
-    (home-page "https://codeberg.org/tslocum/cbind")
-    (synopsis "Key event handling library for tcell")
-    (description
-     "Package cbind provides a tcell key event encoding, decoding and handling
-as human-readable strings.")
-    (license license:expat)))
-
 (define-public go-codeberg-org-anaseto-gruid
   (package
     (name "go-codeberg-org-anaseto-gruid")
@@ -1869,33 +1840,6 @@ software (based on Python's
 @uref{https://github.com/pycontribs/tendo, tendo}).")
     (license license:expat)))
 
-(define-public go-github-com-alimpfard-line
-  (package
-    (name "go-github-com-alimpfard-line")
-    (version "0.0.0-20230131232016-03b4e7dee324")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alimpfard/line")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0swjy1z7hqy4xgq2hfa457rs7p9d7fw5lmdh0zaf3n25rqv10ds1"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/alimpfard/line"))
-    (propagated-inputs
-     (list go-golang-org-x-sys))
-    (home-page "https://github.com/alimpfard/line")
-    (synopsis "Terminal line editor")
-    (description
-     "This package provides a full reimplementation of SerenityOS's LibLine in
-Go language.  It supports flexible autocompletion, live prompt, buffer update
-and stylisation, multiline editing and more.")
-    (license license:bsd-2)))
-
 (define-public go-github-com-alsm-ioprogress
   (package
     (name "go-github-com-alsm-ioprogress")
@@ -4739,7 +4683,7 @@ contexts (e.g. testing).")
 (define-public go-github-com-charlievieth-fastwalk
   (package
     (name "go-github-com-charlievieth-fastwalk")
-    (version "1.0.14")
+    (version "1.0.8")
     (source
      (origin
        (method git-fetch)
@@ -4748,7 +4692,7 @@ contexts (e.g. testing).")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ab90pdqgnd0a6ylmq35zca0imj2pp4pxz2bcmg2zx0szv3910im"))))
+        (base32 "17zy17q31p8b93bf703rr0xqafp02bb0slkrgpxb8r0aaxz3zg4y"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -9826,37 +9770,6 @@ O(1) for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.")
         #~(modify-phases %standard-phases
             (delete 'remove-submodule)))))))
 
-(define-public go-github-com-elliotchance-orderedmap-v3
-  (package
-    (name "go-github-com-elliotchance-orderedmap-v3")
-    (version "3.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/elliotchance/orderedmap")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1w681qsybcf34g0wn9hm6nnzc9jcdv59ahjiqdq9hs22xq0qgnjj"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      ;; Projects includes v1, v2 and v3 in the same source tree.
-      #:import-path "github.com/elliotchance/orderedmap/v3"
-      #:unpack-path "github.com/elliotchance/orderedmap"))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (home-page "https://github.com/elliotchance/orderedmap")
-    (synopsis "Ordered map in with amortized O(1) for Set, Get, Delete and Len")
-    (description
-     "An @code{*OrderedMap} is a high performance ordered map that maintains
-amortized O(1) for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.
-Internally an @code{*OrderedMap} uses the composite type
-@url{https://go.dev/blog/maps, map} combined with a trimmed down linked list
-to maintain the order.")
-    (license license:expat)))
-
 (define-public go-github-com-elliotwutingfeng-asciiset
   (package
     (name "go-github-com-elliotwutingfeng-asciiset")
@@ -10189,36 +10102,6 @@ and @code{io.ReadCloser}) with overwrites
                     "  This package is a fork of dlclark/regexp2 providing a
 more similar API to regexp."))))
 
-(define-public go-github-com-esiqveland-notify
-  (package
-    (name "go-github-com-esiqveland-notify")
-    (version "0.13.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/esiqveland/notify")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "03d27a8rl55j6dqclg3233dj3j7v0i0p9cda06f9c4a21djamrfb"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/esiqveland/notify"))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (propagated-inputs
-     (list go-github-com-godbus-dbus-v5))
-    (home-page "https://github.com/esiqveland/notify")
-    (synopsis "Delivering desktop notifications over DBus")
-    (description
-     "Notify is a Go library for interacting with the DBus notification
-service defined by freedesktop.org at
-@url{https://developer.gnome.org/notification-spec/}.  Notify can deliver
-desktop notifications over DBus, ala how @code{libnotify} does it.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-ettle-strcase
   (package
     (name "go-github-com-ettle-strcase")
@@ -11010,37 +10893,6 @@ library in go standard library.")
      "Go library that pluralizes and singularizes English nouns.")
     (license license:bsd-2)))
 
-(define-public go-github-com-gen2brain-beeep
-  (package
-    (name "go-github-com-gen2brain-beeep")
-    (version "0.11.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/gen2brain/beeep")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0jvfspz941r93djf83gsjqw8w9v34fa9dys1465iwbq769ayizmw"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/gen2brain/beeep"
-      #:test-flags #~(list "--skip" "TestAlert|TestNotify")))
-    (propagated-inputs
-     (list go-github-com-esiqveland-notify
-           go-github-com-godbus-dbus-v5
-           go-github-com-jackmordaunt-icns-v3
-           go-github-com-sergeymakinen-go-ico
-           go-golang-org-x-sys))
-    (home-page "https://github.com/gen2brain/beeep")
-    (synopsis "Sending desktop notifications, alerts and beeps")
-    (description
-     "Package beeep provides a cross-platform library for sending desktop
-notifications and beeps.")
-    (license license:bsd-2)))
-
 (define-public go-github-com-ghemawat-stream
   (package
     (name "go-github-com-ghemawat-stream")
@@ -29913,31 +29765,6 @@ utilities for cty Golang module.")
      "Package yaml can marshal and unmarshal cty values in YAML format.")
     (license license:asl2.0)))
 
-(define-public go-github-com-zeebo-bencode
-  (package
-    (name "go-github-com-zeebo-bencode")
-    (version "1.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/zeebo/bencode")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0c6bw1if1vbcr9l4684a4jdri8z31m8msjpp7z6y2p9s1jqjhkrp"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/zeebo/bencode"))
-    (home-page "https://github.com/zeebo/bencode")
-    (synopsis "Bencode marshal and unmarshal library")
-    (description
-     "This library implements encoding and decoding of
-@url{https://wiki.theory.org/BitTorrentSpecification#Bencoding, bencoded}
-objects.")
-    (license license:expat)))
-
 (define-public go-github-com-zeebo-errs
   (package
     (name "go-github-com-zeebo-errs")
@@ -30251,31 +30078,6 @@ connections.")
       "This package provides a pretty printing library for Golang values.")
     (license license:expat)))
 
-(define-public go-github-com-zyedidia-clipboard
-  (package
-    (name "go-github-com-zyedidia-clipboard")
-    (version "1.0.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/zyedidia/clipboard")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1nrs2ll6dh31wyzxh2zbykwvpavhlpzysfk6qgfj5s4rz6ck8glz"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:tests? #f      ;requires clipboard (xclip or xsel)
-      #:import-path "github.com/zyedidia/clipboard"))
-    (home-page "https://github.com/zyedidia/clipboard")
-    (synopsis "Clipboard for Golang")
-    (description
-     "Package clipboard read/write on clipboard.  It's an alternative fork of
-@url{https://github.com/atotto/clipboard}.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-zyedidia-clipper
   (package
     (name "go-github-com-zyedidia-clipper")
@@ -30784,7 +30586,7 @@ Identifier (RFC3986) specification in Go.")
 (define-public go-go-mau-fi-util
   (package
     (name "go-go-mau-fi-util")
-    (version "0.9.9")
+    (version "0.8.4")
     (source
      (origin
        (method git-fetch)
@@ -30793,7 +30595,7 @@ Identifier (RFC3986) specification in Go.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1d6365n4j5hx172mi5f9rk49l7cgcbf8qvi721b0l34j2m036rsy"))))
+        (base32 "0zzkrbwgbxfppsxjck8qgj4xxzpiq25sx4p3zwjh6s1yz3kfb97p"))))
     (build-system go-build-system)
     (arguments
      (list

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-apps.scm

@@ -64,16 +64,17 @@
 (define-public apply-refact
   (package
     (name "apply-refact")
-    (version "0.10.0.0")
+    (version "0.15.0.0")
     (source (origin
               (method url-fetch)
               (uri (hackage-uri "apply-refact" version))
               (sha256
                (base32
-                "129bf8n66kpwh5420rxprngg43bqr2agyd8q8d7l49k2rxsjl1fb"))))
+                "0iny8ynxx46afbzjp14rvpd4sqk8c1p5883mbln53gmlxcm8zq53"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "apply-refact")))
     (inputs (list ghc-refact
+                  ghc-data-default
                   ghc-exactprint
                   ghc-paths
                   ghc-extra
@@ -96,13 +97,13 @@ library.  It is primarily used with HLint's @code{--refactor} flag.")
 (define-public cabal-install
  (package
    (name "cabal-install")
-   (version "3.6.2.0")
-   (source (origin
-             (method url-fetch)
-             (uri (hackage-uri "cabal-install" version))
-             (sha256
-              (base32
-               "0dihpm4h3xh13vnpvwflnb7v614qdvljycc6ffg5cvhwbwfrxyfw"))))
+   (version "3.12.1.0")
+   (source
+    (origin
+      (method url-fetch)
+      (uri (hackage-uri "cabal-install" version))
+      (sha256
+       (base32 "1cmifq189i4x0r0yha3dl8nrzzfh92bnd2saak7dqvvjkkysqj38"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cabal-install")))
    (inputs (list ghc-async
@@ -117,13 +118,35 @@ library.  It is primarily used with HLint's @code{--refactor} flag.")
                  ghc-tar
                  ghc-zlib
                  ghc-hackage-security
+                 ghc-open-browser
                  ghc-regex-base
                  ghc-regex-posix
+                 ghc-safe-exceptions
+                 ghc-semaphore-compat
                  ghc-resolv
                  ghc-lukko))
+   (native-inputs (list ghc-tasty
+                        ghc-tasty-golden
+                        ghc-tasty-quickcheck
+                        ghc-tasty-expected-failure
+                        ghc-tasty-hunit
+                        ghc-tree-diff
+                        ghc-quickcheck
+                        ghc-tasty
+                        ghc-tasty-hunit
+                        ghc-tasty
+                        ghc-tasty-hunit
+                        ghc-tagged
+                        ghc-tagged
+                        ghc-tasty
+                        ghc-tasty-expected-failure
+                        ghc-tasty-hunit
+                        ghc-tasty-quickcheck
+                        ghc-quickcheck
+                        ghc-pretty-show))
    (arguments
     `(#:cabal-revision ("2"
-                        "1kpgyfl5njxp4c8ax5ziag1bhqvph3h0pn660v3vpxalz8d1j6xv")))
+                        "0fdzqdkg2vbyg0lnbk9bdskr2d23hwjpmnc7jnvpzkcmxmcvl99n")))
    (home-page "https://www.haskell.org/cabal/")
    (synopsis "Command-line interface for Cabal and Hackage")
    (description
@@ -145,11 +168,10 @@ installation of Haskell libraries and programs.")
          "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cpphs")))
-    (inputs
-     (list ghc-polyparse ghc-old-locale ghc-old-time))
+    (inputs (list ghc-polyparse))
     (arguments
-     `(#:cabal-revision ("1"
-                         "1f8jzs8zdh4wwbcq8fy6qqxkv75ypnvsm4yzw49wpr3b9vpnzlha")))
+     `(#:cabal-revision ("2"
+                         "0vxav36p0kplp4dpd17i4cfzrsl3r437d840xwv83lf1bqp7mrxc")))
     (home-page "https://projects.haskell.org/cpphs/")
     (synopsis "Liberalised re-implementation of cpp, the C pre-processor")
     (description "Cpphs is a re-implementation of the C pre-processor that is
@@ -269,20 +291,18 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
 (define-public ghcid
   (package
     (name "ghcid")
-    (version "0.8.7")
+    (version "0.8.9")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "ghcid" version))
        (sha256
-        (base32 "0yqc1pkfajnr56gnh43sbj50r7c3r41b2jfz07ivgl6phi4frjbq"))))
+        (base32 "1dq8lc0dwzib8y21279q4j54cmm7lvx64b3hw2yiym1kzi9rrhj4"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "ghcid")))
-    (inputs
-     (list ghc-extra ghc-ansi-terminal ghc-cmdargs ghc-fsnotify
-           ghc-terminal-size))
-    (native-inputs
-     (list ghc-tasty ghc-tasty-hunit))
+    (inputs (list ghc-extra ghc-ansi-terminal ghc-cmdargs ghc-fsnotify
+                  ghc-terminal-size))
+    (native-inputs (list ghc-tasty ghc-tasty-hunit))
     (home-page "https://github.com/ndmitchell/ghcid#readme")
     (synopsis "GHCi based bare bones IDE")
     (description
@@ -404,95 +424,97 @@ to @code{cabal repl}).")
                         (string-append bin "/git-remote-annex"))
                (symlink (string-append bin "/git-annex")
                         (string-append bin "/git-remote-tor-annex"))))))))
-    (inputs
-     (list curl
-           ghc-aeson
-           ghc-ansi-terminal
-           ghc-async
-           ghc-attoparsec
-           ghc-aws
-           ghc-bloomfilter
-           ghc-byteable
-           ghc-case-insensitive
-           ghc-clientsession
-           ghc-concurrent-output
-           ghc-conduit
-           ghc-connection
-           ghc-crypto-api
-           ghc-cryptonite
-           ghc-data-default
-           ghc-dav
-           ghc-dbus
-           ghc-disk-free-space
-           ghc-dlist
-           ghc-edit-distance
-           ghc-exceptions
-           ghc-fdo-notify
-           ghc-feed
-           ghc-filepath-bytestring
-           ghc-free
-           ghc-git-lfs
-           ghc-hinotify
-           ghc-http-client
-           ghc-http-client-tls
-           ghc-http-client-restricted
-           ghc-http-conduit
-           ghc-http-types
-           ghc-ifelse
-           ghc-magic
-           ghc-memory
-           ghc-microlens
-           ghc-monad-control
-           ghc-monad-logger
-           ghc-mountpoints
-           ghc-network
-           ghc-network-bsd
-           ghc-network-info
-           ghc-network-multicast
-           ghc-network-uri
-           ghc-old-locale
-           ghc-optparse-applicative
-           ghc-persistent
-           ghc-persistent-sqlite
-           ghc-persistent-template
-           ghc-quickcheck
-           ghc-random
-           ghc-regex-tdfa
-           ghc-resourcet
-           ghc-safesemaphore
-           ghc-sandi
-           ghc-securemem
-           ghc-servant-client
-           ghc-servant-server
-           ghc-socks
-           ghc-split
-           ghc-stm-chans
-           ghc-tagsoup
-           ghc-torrent
-           ghc-transformers
-           ghc-unbounded-delays
-           ghc-unix-compat
-           ghc-unliftio-core
-           ghc-unordered-containers
-           ghc-utf8-string
-           ghc-uuid
-           ghc-vector
-           ghc-wai
-           ghc-wai-extra
-           ghc-warp
-           ghc-warp-tls
-           ghc-yesod
-           ghc-yesod-core
-           ghc-yesod-form
-           ghc-yesod-static
-           lsof
-           rsync
-           xdg-utils))
+    (inputs (list ghc-network-uri
+                  ghc-optparse-applicative
+                  ghc-uuid
+                  ghc-data-default
+                  ghc-case-insensitive
+                  ghc-random
+                  ghc-dlist
+                  ghc-unix-compat
+                  ghc-safesemaphore
+                  ghc-async
+                  ghc-disk-free-space
+                  ghc-ifelse
+                  ghc-monad-logger
+                  ghc-free
+                  ghc-utf8-string
+                  ghc-sandi
+                  ghc-monad-control
+                  ghc-bloomfilter
+                  ghc-edit-distance
+                  ghc-resourcet
+                  ghc-http-client
+                  ghc-http-client-tls
+                  ghc-http-types
+                  ghc-http-conduit
+                  ghc-http-client-restricted
+                  ghc-conduit
+                  ghc-old-locale
+                  ghc-persistent-sqlite
+                  ghc-persistent
+                  ghc-persistent-template
+                  ghc-unliftio-core
+                  ghc-microlens
+                  ghc-aeson
+                  ghc-vector
+                  ghc-tagsoup
+                  ghc-unordered-containers
+                  ghc-feed
+                  ghc-regex-tdfa
+                  ghc-socks
+                  ghc-byteable
+                  ghc-stm-chans
+                  ghc-securemem
+                  ghc-crypto-api
+                  ghc-memory
+                  ghc-split
+                  ghc-attoparsec
+                  ghc-concurrent-output
+                  ghc-unbounded-delays
+                  ghc-quickcheck
+                  ghc-tasty
+                  ghc-tasty-hunit
+                  ghc-tasty-quickcheck
+                  ghc-tasty-rerun
+                  ghc-ansi-terminal
+                  ghc-aws
+                  ghc-dav
+                  ghc-network
+                  ghc-network-bsd
+                  ghc-git-lfs
+                  ghc-clock
+                  ghc-crypton
+                  ghc-servant
+                  ghc-servant-server
+                  ghc-servant-client
+                  ghc-servant-client-core
+                  ghc-warp
+                  ghc-warp-tls
+                  ghc-os-string
+                  ghc-file-io
+                  ghc-mountpoints
+                  ghc-yesod
+                  ghc-yesod-static
+                  ghc-yesod-form
+                  ghc-yesod-core
+                  ghc-path-pieces
+                  ghc-wai
+                  ghc-wai-extra
+                  ghc-blaze-builder
+                  ghc-clientsession
+                  ghc-shakespeare
+                  ghc-hinotify
+                  ghc-dbus
+                  ghc-fdo-notify
+                  ghc-network-multicast
+                  ghc-network-info
+                  ghc-torrent
+                  ghc-magic
+                  ghc-criterion))
     (propagated-inputs
      (list git))
-    (native-inputs
-     (list ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck ghc-tasty-rerun
-           perl))
+    (native-inputs (list ghc-filepath-bytestring))
     (home-page "https://git-annex.branchable.com/")
     (synopsis "Manage files with Git, without checking in their contents")
     (description "This package allows managing files with Git, without
@@ -513,13 +535,13 @@ used to keep a folder in sync between computers.")
 (define-public hlint
   (package
     (name "hlint")
-    (version "3.4.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hlint" version))
-              (sha256
-               (base32
-                "0bkk03c9hacvfd73dk89g4r81b50g7pjgw5pavldali4qwss34cz"))))
+    (version "3.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hlint" version))
+       (sha256
+        (base32 "0dzy7spc45v88yplczhd3la464bhcbaihi619a45bd06ghrp55nr"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hlint")))
     (inputs (list ghc-unordered-containers
@@ -536,12 +558,10 @@ used to keep a folder in sync between computers.")
                   ghc-aeson
                   ghc-deriving-aeson
                   ghc-filepattern
+                  ghc-lib-parser
                   ghc-lib-parser-ex
                   hscolour
                   ghc-yaml))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "1rdaffg5n179yfcn5zjwjb0bki09qy13gz2ijky455y9pbaz8yz9")))
     (home-page "https://github.com/ndmitchell/hlint#readme")
     (synopsis "Suggest improvements for Haskell source code")
     (description
@@ -553,13 +573,13 @@ unwanted suggestions, and to add your own custom suggestions.")
 (define-public hoogle
   (package
     (name "hoogle")
-    (version "5.0.18.3")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hoogle" version))
-              (sha256
-               (base32
-                "0v6k75w0an9pqgb7a6cicnpf9rz77xd2lmxfbafc5l4f99jg83bn"))))
+    (version "5.0.18.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hoogle" version))
+       (sha256
+        (base32 "08z32d87vqzhapb2vw21h25jb2g74csxlpvd8f54xl91k3ijs3wx"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hoogle")))
     (inputs (list ghc-quickcheck
@@ -569,7 +589,7 @@ unwanted suggestions, and to add your own custom suggestions.")
                   ghc-cmdargs
                   ghc-conduit
                   ghc-conduit-extra
-                  ghc-connection
+                  ghc-crypton-connection
                   ghc-extra
                   ghc-foundation
                   ghc-old-locale
@@ -582,6 +602,7 @@ unwanted suggestions, and to add your own custom suggestions.")
                   ghc-mmap
                   ghc-process-extras
                   ghc-resourcet
+                  ghc-safe
                   ghc-storable-tuple
                   ghc-tar
                   ghc-uniplate
@@ -593,6 +614,9 @@ unwanted suggestions, and to add your own custom suggestions.")
                   ghc-warp-tls
                   ghc-zlib
                   ghc-semigroups))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1129flhhb1992rijw46dclvmpqlylmbrzl4swsnk2knylx6jgw5a")))
     (home-page "https://hoogle.haskell.org/")
     (synopsis "Haskell API Search")
     (description
@@ -604,14 +628,13 @@ or by approximate type signature.")
 (define-public hscolour
   (package
     (name "hscolour")
-    (version "1.24.4")
+    (version "1.25")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "hscolour" version))
        (sha256
-        (base32
-         "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4"))))
+        (base32 "0z679khnmb6as1zcdb44n9qjk7in32jpm4ldscpqg7jrapd31kjl"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hscolour")))
     (home-page "https://hackage.haskell.org/package/hscolour")
@@ -760,12 +783,12 @@ Wayland, and Linux console environments alike.")
                   ghc-text-zipper
                   ghc-timezone-olson
                   ghc-timezone-series
-                  ghc-unix-compat-7
+                  ghc-unix-compat
                   ghc-unordered-containers
                   ghc-utf8-string
                   ghc-uuid
                   ghc-vector
-                  ghc-vty-6
+                  ghc-vty
                   ghc-vty-crossplatform
                   ghc-word-wrap
                   ghc-xdg-basedir))
@@ -811,20 +834,31 @@ Wayland, and Linux console environments alike.")
 (define-public nixfmt
   (package
     (name "nixfmt")
-    (version "0.5.0")
+    (version "1.1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (hackage-uri "nixfmt" version))
+       (method git-fetch)
+       (uri
+        (git-reference
+          (url "https://github.com/NixOS/nixfmt")
+          (commit (string-append "v" version))))
        (sha256
-        (base32 "0rxi8zrd2xr72w673nvgnhb0g3r7rssc1ahlhz8rmdpc6c1a82wl"))))
+        (base32 "19sydkdw1579qmvzx0zq06s23bm6m6l9wp1kvsfhxawk8pkz2pc2"))
+       (snippet
+        #~(substitute* "nixfmt.cabal"
+            (("(megaparsec|filepath)  *[0-9<>=^&|. ]*" _ package)
+             package)))
+       (modules '((guix build utils)))))
     (build-system haskell-build-system)
-    (properties '((upstream-name . "nixfmt")))
-    (inputs
-     (list ghc-megaparsec ghc-parser-combinators ghc-cmdargs
-           ghc-safe-exceptions))
-    (home-page "https://github.com/serokell/nixfmt")
-    (synopsis "Opinionated formatter for Nix")
+    (inputs (list ghc-megaparsec
+                  ghc-parser-combinators
+                  ghc-scientific
+                  ghc-pretty-simple
+                  ghc-cmdargs
+                  ghc-file-embed
+                  ghc-safe-exceptions))
+    (home-page "https://github.com/NixOS/nixfmt")
+    (synopsis "Official formatter for Nix code")
     (description
      "Nixfmt is a formatter for Nix that ensures consistent and clear
 formatting by forgetting all existing formatting during parsing.")
@@ -954,6 +988,7 @@ too slow and you'll get wound up in the scroll and crushed.")
     (build-system haskell-build-system)
     (arguments
      (list #:haddock? #f ; TODO: Fails to build.
+           #:cabal-revision '("1" "1935jrzy1r3g9cc74b330fmxnz2i1j8hsdk9jnl557qgk6xjqzs7")
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'build 'build-man-page
@@ -993,13 +1028,13 @@ advanced user's otherwise working script to fail under future circumstances.
 (define-public shelltestrunner
   (package
     (name "shelltestrunner")
-    (version "1.9")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "shelltestrunner" version))
-              (sha256
-               (base32
-                "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b"))))
+    (version "1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "shelltestrunner" version))
+       (sha256
+        (base32 "1c6bjyxqa4mgnh3w4pqp6sbr5cf160n7jf9i1b4b9sdxzdjk7g87"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "shelltestrunner")))
     (arguments
@@ -1022,17 +1057,19 @@ advanced user's otherwise working script to fail under future circumstances.
                            "tests/examples")
                    (format #t "test suite not run~%"))
                #t))))))
-    (inputs
-     (list ghc-diff
-           ghc-cmdargs
-           ghc-filemanip
-           ghc-hunit
-           ghc-pretty-show
-           ghc-regex-tdfa
-           ghc-safe
-           ghc-utf8-string
-           ghc-test-framework
-           ghc-test-framework-hunit))
+    (inputs (list ghc-diff
+                  ghc-filemanip
+                  ghc-hunit
+                  ghc-cmdargs
+                  ghc-pretty-show
+                  ghc-regex-tdfa
+                  ghc-safe
+                  ghc-test-framework
+                  ghc-test-framework-hunit
+                  ghc-utf8-string
+                  ghc-hspec
+                  ghc-hspec-core
+                  ghc-hspec-contrib))
     (home-page "https://github.com/simonmichael/shelltestrunner")
     (synopsis "Test CLI programs")
     (description
@@ -1045,13 +1082,13 @@ output, stderr, and exit status.")
 (define-public stylish-haskell
   (package
     (name "stylish-haskell")
-    (version "0.14.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "stylish-haskell" version))
-              (sha256
-               (base32
-                "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d"))))
+    (version "0.15.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "stylish-haskell" version))
+       (sha256
+        (base32 "06y6f7bv5j5k7q81194v9jqcbmmqcv7h8ii3lq1783bpfnyd6h19"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "stylish-haskell")))
     (inputs (list ghc-aeson
@@ -1061,6 +1098,7 @@ output, stderr, and exit status.")
                   ghc-hsyaml-aeson
                   ghc-hsyaml
                   ghc-semigroups
+                  ghc-lib-parser
                   ghc-lib-parser-ex
                   ghc-strict
                   ghc-optparse-applicative))

gnu/packages/haskell-check.scm

@@ -45,22 +45,18 @@
 (define-public ghc-tasty-ant-xml
   (package
     (name "ghc-tasty-ant-xml")
-    (version "1.1.8")
+    (version "1.1.9")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "tasty-ant-xml" version))
        (sha256
-        (base32
-         "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8"))))
+        (base32 "00zgsd6jjfwasr69d0y781vhjr7d8p1jbaaz4pn75ljf33akd92l"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-ant-xml")))
-    (inputs
-     (list ghc-generic-deriving ghc-xml ghc-tagged ghc-tasty))
-    (home-page
-     "https://github.com/ocharles/tasty-ant-xml")
-    (synopsis
-     "Render tasty output to XML for Jenkins")
+    (inputs (list ghc-generic-deriving ghc-tagged ghc-tasty ghc-xml))
+    (home-page "http://github.com/ocharles/tasty-ant-xml")
+    (synopsis "Render tasty output to XML for Jenkins")
     (description
      "A tasty ingredient to output test results in XML, using the Ant
 schema.  This XML can be consumed by the Jenkins continuous integration
@@ -76,33 +72,37 @@ framework.")
        (method url-fetch)
        (uri (hackage-uri "tasty-smallcheck" version))
        (sha256
-        (base32
-         "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"))))
+        (base32 "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-smallcheck")))
-    (inputs
-     (list ghc-tasty ghc-smallcheck ghc-async ghc-tagged))
-    (home-page "https://documentup.com/feuerbach/tasty")
+    (inputs (list ghc-tasty ghc-smallcheck ghc-tagged ghc-optparse-applicative))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "0033ha2w9rzc1rxpzh1dkfdrn256i5lvb41pqbdh2i6kli0v5vmh")))
+    (home-page "https://github.com/feuerbach/tasty")
     (synopsis "SmallCheck support for the Tasty test framework")
     (description "This package provides SmallCheck support for the Tasty
 Haskell test framework.")
-    (license license:bsd-3)))
+    (license license:expat)))
 
 (define-public ghc-tasty-quickcheck
   (package
     (name "ghc-tasty-quickcheck")
-    (version "0.10.2")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-quickcheck" version))
-              (sha256
-               (base32
-                "1qnc6rdvjvlw08q6sln2n98rvj0s0pp689h6w4z58smjbn0lr25l"))))
+    (version "0.11.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-quickcheck" version))
+       (sha256
+        (base32 "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-quickcheck")))
     (inputs (list ghc-tagged ghc-tasty ghc-random ghc-quickcheck
                   ghc-optparse-applicative))
-    (native-inputs (list ghc-tasty-hunit ghc-pcre-light))
+    (native-inputs (list ghc-regex-tdfa ghc-tasty-hunit))
+    (arguments
+     `(#:cabal-revision ("3"
+                         "1wzvha4xam8npx5mk33c056grmrqnjd6m38nnm6d7y99w2mn1a7w")))
     (home-page "https://github.com/UnkindPartition/tasty")
     (synopsis "QuickCheck support for the Tasty test framework")
     (description "This package provides QuickCheck support for the Tasty
@@ -140,22 +140,23 @@ contains the correct result for the test.")
 (define-public ghc-tasty
   (package
     (name "ghc-tasty")
-    (version "1.4.3")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty" version))
-              (sha256
-               (base32
-                "006bf4gyc30i2gvb17hj1mzrh1kwnwf7l050x3f72wi6c2axl87l"))))
+    (version "1.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty" version))
+       (sha256
+        (base32 "10076vlklbcyiz7plakrihava5sy3dvwhskjldqzhfl18jvcg82l"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty")))
     (inputs
-      (append
-        (list ghc-tagged ghc-optparse-applicative ghc-ansi-terminal)
-        ;; TODO: Add ghc-unbounded-delays unconditionally on next rebuild cycle.
-        (if (member (%current-system) '("i686-linux"))
-            (list ghc-unbounded-delays)
-            '())))
+      (list ghc-tagged
+            ghc-optparse-applicative
+            ghc-ansi-terminal
+            ghc-unbounded-delays)) ; needed on 32-bit architectures
+    (arguments
+     `(#:cabal-revision ("2"
+                         "04llcf1i3gawdik0bjhxdgls2wkiqlx0gi76nfh784nv2qzxlpbb")))
     (home-page "https://github.com/UnkindPartition/tasty")
     (synopsis "Modern and extensible testing framework")
     (description
@@ -167,17 +168,20 @@ and any other types of tests into a single test suite.")
 (define-public ghc-tasty-hedgehog
   (package
     (name "ghc-tasty-hedgehog")
-    (version "1.3.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-hedgehog" version))
-              (sha256
-               (base32
-                "1iq452mvd9wc9pfmjsmm848jwp3cvsk1faf2mlr21vcs0yaxvq3m"))))
+    (version "1.4.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-hedgehog" version))
+       (sha256
+        (base32 "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-hedgehog")))
     (inputs (list ghc-tagged ghc-tasty ghc-hedgehog))
     (native-inputs (list ghc-tasty-expected-failure))
+    (arguments
+     `(#:cabal-revision ("6"
+                         "1rb8ncp6xyy7jr6v0hyls9m529ba0djndsxgxmkgr52rk3qq8lrc")))
     (home-page "https://github.com/qfpl/tasty-hedgehog")
     (synopsis "Integration for tasty and hedgehog")
     (description
@@ -190,22 +194,25 @@ framework}.")
 (define-public ghc-tasty-hspec
   (package
     (name "ghc-tasty-hspec")
-    (version "1.2.0.2")
+    (version "1.2.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "tasty-hspec" version))
        (sha256
-        (base32 "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"))))
+        (base32 "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-hspec")))
     (inputs (list ghc-hspec
+                  ghc-hspec-api
                   ghc-hspec-core
                   ghc-quickcheck
                   ghc-tasty
                   ghc-tasty-smallcheck
-                  ghc-tasty-quickcheck
-                  ghc-tagged))
+                  ghc-tasty-quickcheck))
+    (arguments
+     `(#:cabal-revision ("7"
+                         "0s1y34i8g7fva0z10ws3ipcy2jmlvqk0v4hdbx8rqnby5n0l5kay")))
     (home-page "https://github.com/mitchellwrosen/tasty-hspec")
     (synopsis "Hspec support for the Tasty test framework")
     (description
@@ -215,19 +222,17 @@ framework}.")
 (define-public ghc-tasty-hunit
   (package
     (name "ghc-tasty-hunit")
-    (version "0.10.0.3")
+    (version "0.10.2")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "tasty-hunit" version))
        (sha256
-        (base32
-         "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"))))
+        (base32 "1xh33ss7dncm7zanzkzh7ywb3a46k7vkcbh6v8jb767gq6kizw2s"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-hunit")))
-    (inputs
-     (list ghc-call-stack-boot ghc-tasty))
-    (home-page "http://documentup.com/feuerbach/tasty")
+    (inputs (list ghc-tasty ghc-call-stack-boot))
+    (home-page "https://github.com/UnkindPartition/tasty")
     (synopsis "HUnit support for the Tasty test framework")
     (description "This package provides HUnit support for the Tasty Haskell
 test framework.")
@@ -257,13 +262,13 @@ tasty.")
 (define-public ghc-tasty-lua
   (package
     (name "ghc-tasty-lua")
-    (version "1.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-lua" version))
-              (sha256
-               (base32
-                "1vnyvgcjsvqhwwyqkbgqksr9ppj5whiihpwcqkg33sl7jj3ysdwv"))))
+    (version "1.1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-lua" version))
+       (sha256
+        (base32 "03b2n3gw2w70cnl57w3sh3cv5ka270sf07jlxpb4zs0z5gh83p1r"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-lua")))
     (inputs (list ghc-hslua-core
@@ -288,16 +293,15 @@ from Lua.")
        (method url-fetch)
        (uri (hackage-uri "tasty-th" version))
        (sha256
-        (base32
-         "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
+        (base32 "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-th")))
-    (inputs
-     (list ghc-haskell-src-exts ghc-tasty ghc-tasty-hunit))
+    (inputs (list ghc-haskell-src-exts ghc-tasty))
+    (native-inputs (list ghc-tasty-hunit))
     (home-page "https://github.com/bennofs/tasty-th")
     (synopsis "Automatically generate tasty TestTrees")
     (description
-      "Tasty-th automatically generates tasty TestTrees from functions of the
+     "Tasty-th automatically generates tasty TestTrees from functions of the
 current module, using TemplateHaskell.  This is a fork the original
 test-framework-th package, modified to work with tasty instead of
 test-framework.")
@@ -306,28 +310,27 @@ test-framework.")
 (define-public ghc-tasty-rerun
   (package
     (name "ghc-tasty-rerun")
-    (version "1.1.18")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-rerun" version))
-              (sha256
-               (base32
-                "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"))))
+    (version "1.1.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-rerun" version))
+       (sha256
+        (base32 "0px58jm1yqbg32qf2s0yk09d2qdjxkkz9df89f31q3nzw85jv2ky"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-rerun")))
-    (inputs
-     (list ghc-optparse-applicative ghc-reducers ghc-split ghc-tagged
-           ghc-tasty))
+    (inputs (list ghc-optparse-applicative ghc-split ghc-tagged ghc-tasty))
     (arguments
-     `(#:cabal-revision ("3"
-                         "0091arn90cx5rzn5n2bpb9alzybwraf9yj7hb0bwdfyamzpf3pkb")))
+     `(#:cabal-revision ("1"
+                         "13xmx91hp7i0qzrhada9ckliqkynwlwa8x6pjbvxjcy1y0qsd7hk")))
     (home-page "https://github.com/ocharles/tasty-rerun")
     (synopsis "Run tests by filtering the test tree")
-    (description "This package adds the ability to run tests by filtering the
+    (description
+     "This package adds the ability to run tests by filtering the
 test tree based on the result of a previous test run.  You can use this to run
 only those tests that failed in the last run, or to only run the tests that have
 been added since previous test run.")
-  (license license:bsd-3)))
+    (license license:bsd-3)))
 
 (define-public ghc-tasty-expected-failure
   (package
@@ -362,17 +365,17 @@ development.")
 (define-public ghc-quickcheck-instances
   (package
     (name "ghc-quickcheck-instances")
-    (version "0.3.29.1")
+    (version "0.3.33")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "quickcheck-instances" version))
        (sha256
-        (base32 "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"))))
+        (base32 "0rl8y3rb4fm4nqz122bp5f2aya4f8bc9m9i9n2vwlyq2gdacs0v8"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-instances")))
     (inputs (list ghc-quickcheck
-                  ghc-splitmix
+                  ghc-splitmix-bootstrap
                   ghc-case-insensitive
                   ghc-data-fix
                   ghc-hashable
@@ -383,17 +386,15 @@ development.")
                   ghc-scientific
                   ghc-strict
                   ghc-tagged
+                  ghc-text-short
                   ghc-these
                   ghc-time-compat
-                  ghc-transformers-compat
                   ghc-unordered-containers
                   ghc-uuid-types
-                  ghc-vector
-                  ghc-data-array-byte
-                  ghc-text-short))
+                  ghc-vector))
     (arguments
-     `(#:cabal-revision ("2"
-                         "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip")))
+     `(#:cabal-revision ("1"
+                         "1xkc7rsfgya4rwiizh0yfincws3knpdnh08m280v1dgik4kv37vh")))
     (home-page "https://github.com/haskellari/qc-instances")
     (synopsis "Common quickcheck instances")
     (description "This package provides QuickCheck instances for types
@@ -409,17 +410,38 @@ provided by the Haskell Platform.")
        (method url-fetch)
        (uri (hackage-uri "quickcheck-unicode" version))
        (sha256
-        (base32
-         "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"))))
+        (base32 "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-unicode")))
     (inputs (list ghc-quickcheck))
-    (home-page
-     "https://github.com/bos/quickcheck-unicode")
+    (home-page "https://github.com/bos/quickcheck-unicode")
     (synopsis "Generator functions Unicode-related tests")
     (description "This package provides generator and shrink functions for
 testing Unicode-related software.")
-    (license license:bsd-3)))
+    (license license:bsd-2)))
+
+(define-public ghc-quickcheck-text
+  (package
+    (name "ghc-quickcheck-text")
+    (version "0.1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "quickcheck-text" version))
+       (sha256
+        (base32 "02dbs0k6igmsa1hcw8yfvp09v7038vp4zlsp9706km3cmswgshj4"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "quickcheck-text")))
+    (inputs (list ghc-quickcheck))
+    (home-page "https://github.com/olorin/quickcheck-text")
+    (synopsis "Alternative arbitrary instance for Text")
+    (description
+     "The usual Arbitrary instance for Text (in
+<https://hackage.haskell.org/package/quickcheck-instances quickcheck-instances>)
+only has single-byte instances and so isn't an ideal representation of a valid
+UTF-8 character.  This package has generators for one-, two- and three-byte
+UTF-8 characters (all that are currently in use).")
+    (license license:expat)))
 
 (define-public ghc-quickcheck-io
   (package
@@ -446,17 +468,19 @@ use HUnit assertions as QuickCheck properties.")
 (define-public ghc-quickcheck
   (package
     (name "ghc-quickcheck")
-    (version "2.14.3")
+    (version "2.15.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "QuickCheck" version))
        (sha256
-        (base32 "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw"))))
+        (base32 "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "QuickCheck")))
-    (inputs
-     (list ghc-random ghc-splitmix-bootstrap))
+    (inputs (list ghc-random-bootstrap ghc-splitmix-bootstrap))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "0cgfp4s51cjphsn9cls6rndisvqmi94vn95xan9g1yz6p5xk7z8c")))
     (home-page "https://github.com/nick8325/quickcheck")
     (synopsis "Automatic testing of Haskell programs")
     (description
@@ -479,10 +503,8 @@ expressed in Haskell, using combinators defined in the QuickCheck library.")
         (base32 "1kyam4cy7qmnizjwjm8jamq43w7f0fs6ljfplwj0ib6wi2kjh0wv"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-assertions")))
-    (native-inputs
-     (list ghc-hspec))
-    (inputs
-     (list ghc-ieee754 ghc-pretty-show ghc-quickcheck))
+    (inputs (list ghc-quickcheck ghc-ieee754 ghc-pretty-show))
+    (native-inputs (list ghc-hspec))
     (home-page "https://github.com/s9gf4ult/quickcheck-assertions")
     (synopsis "HUnit-like assertions for QuickCheck")
     (description
@@ -494,33 +516,27 @@ HUnit.")
 (define-public ghc-test-framework
   (package
     (name "ghc-test-framework")
-    (version "0.8.2.0")
+    (version "0.8.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "test-framework" version))
        (sha256
-        (base32
-         "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"))))
+        (base32 "04ijf5x6xx8i5lqv9ir33zs1rfzc4qkwwz8c1fdycnzvydcv4dnp"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "test-framework")))
+    (inputs (list ghc-ansi-terminal
+                  ghc-ansi-wl-pprint
+                  ghc-random
+                  ghc-regex-posix
+                  ghc-old-locale
+                  ghc-xml
+                  ghc-hostname))
+    (native-inputs (list ghc-hunit ghc-quickcheck ghc-semigroups-bootstrap))
     (arguments
-     `(#:tests? #f  ; FIXME: Tests do not build.
-       #:cabal-revision
-       ("6" "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r")))
-    ;(native-inputs
-    ; (list ghc-hunit ghc-quickcheck))
-    (inputs
-     `(("ghc-ansi-terminal" ,ghc-ansi-terminal)
-       ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
-       ("ghc-hostname" ,ghc-hostname)
-       ("ghc-old-locale" ,ghc-old-locale)
-       ("ghc-random" ,ghc-random)
-       ("ghc-regex-posix" ,ghc-regex-posix)
-       ("ghc-xml" ,ghc-xml)
-       ("ghc-libxml" ,ghc-libxml)
-       ("ghc-semigroups" ,ghc-semigroups-bootstrap)))
-    (home-page "https://batterseapower.github.io/test-framework/")
+     `(#:cabal-revision ("1"
+                         "1yv1qsr6bxphxk9430id9bqhfmkffdqmfg0k017dp9pnn4pqj0zh")))
+    (home-page "https://github.com/haskell/test-framework#readme")
     (synopsis "Framework for running and organising tests")
     (description
      "This package allows tests such as QuickCheck properties and HUnit test
@@ -557,23 +573,21 @@ reporting and test statistics output.")
 (define-public ghc-test-framework-quickcheck2
   (package
     (name "ghc-test-framework-quickcheck2")
-    (version "0.3.0.5")
+    (version "0.3.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "test-framework-quickcheck2" version))
        (sha256
-        (base32
-         "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"))))
+        (base32 "1d0w2q9sm8aayk0aj1zr2irpnqwpzixn6pdfq1i904vs1kkb2xin"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "test-framework-quickcheck2")))
+    (inputs (list ghc-test-framework ghc-quickcheck ghc-extensible-exceptions
+                  ghc-random))
     (arguments
-     `(#:cabal-revision
-       ("3" "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh")))
-    (inputs
-     (list ghc-extensible-exceptions ghc-quickcheck ghc-random
-           ghc-test-framework))
-    (home-page "https://batterseapower.github.io/test-framework/")
+     `(#:cabal-revision ("1"
+                         "1af2gw9gvq143jdqmsnxj23cgss9ffdyr67951a5x151aps04y7z")))
+    (home-page "https://github.com/haskell/test-framework")
     (synopsis "QuickCheck2 support for test-framework")
     (description
      "This package provides QuickCheck2 support for the test-framework
@@ -592,9 +606,8 @@ package.")
         (base32 "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "test-framework-smallcheck")))
-    (inputs
-     (list ghc-smallcheck ghc-test-framework))
-    (home-page "https://github.com/Bodigrim/smallcheck")
+    (inputs (list ghc-test-framework ghc-smallcheck))
+    (home-page "https://github.com/feuerbach/smallcheck")
     (synopsis "SmallCheck support for test-framework")
     (description
      "This package lets programmers use SmallCheck properties in Haskell's
@@ -660,17 +673,17 @@ JUnit tool for Java.")
 (define-public hspec-discover
   (package
     (name "hspec-discover")
-    (version "2.9.7")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hspec-discover" version))
-              (sha256
-               (base32
-                "0536kdxjw6p8b6gcwvmr22jbmb6cgzbddi0fkd01b2m847z37sb5"))))
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-discover" version))
+       (sha256
+        (base32 "044vgsy45ff00h9z2k3jgn2m37npcjiacc4cifahrjlmwa7a7ylp"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-discover")))
     (native-inputs (list ghc-quickcheck ghc-hspec-meta ghc-mockery-bootstrap))
-    (home-page "http://hspec.github.io/")
+    (home-page "https://hspec.github.io/")
     (synopsis "Automatically discover and run Hspec tests")
     (description "hspec-discover is a tool which automatically discovers and
 runs Hspec tests.")
@@ -679,28 +692,30 @@ runs Hspec tests.")
 (define-public ghc-hspec-core
   (package
     (name "ghc-hspec-core")
-    (version "2.9.7")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hspec-core" version))
-              (sha256
-               (base32
-                "040rzqiqwkp373jjpij8lkmv08pp2ya92zzcf95bw8px215rp08n"))))
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-core" version))
+       (sha256
+        (base32 "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-core")))
     (inputs (list ghc-hunit
                   ghc-quickcheck
                   ghc-ansi-terminal
                   ghc-call-stack
-                  ghc-clock
+                  ghc-haskell-lexer
                   ghc-hspec-expectations
                   ghc-quickcheck-io
                   ghc-random
-                  ghc-setenv
                   ghc-tf-random))
     (native-inputs (list ghc-base-orphans-bootstrap ghc-hspec-meta
-                         ghc-silently-bootstrap ghc-temporary))
-    (home-page "http://hspec.github.io/")
+                         ghc-silently-bootstrap ghc-temporary-bootstrap))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq")))
+    (home-page "https://hspec.github.io/")
     (synopsis "Testing framework for Haskell")
     (description "This library exposes internal types and functions that can
 be used to extend Hspec's functionality.")
@@ -709,23 +724,28 @@ be used to extend Hspec's functionality.")
 (define-public ghc-hspec-meta
   (package
     (name "ghc-hspec-meta")
-    (version "2.9.3")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hspec-meta" version))
-              (sha256
-               (base32
-                "1raxwpsmcijl3x2h5naw6aydhbiknxvhj3x7v384bi1rqi51ainm"))))
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-meta" version))
+       (sha256
+        (base32 "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-meta")))
-    (inputs (list ghc-quickcheck
+    (inputs (list ghc-hunit
+                  ghc-quickcheck
                   ghc-ansi-terminal
                   ghc-call-stack-boot
-                  ghc-clock
+                  ghc-haskell-lexer
+                  ghc-hspec-expectations
                   ghc-quickcheck-io
                   ghc-random
-                  ghc-setenv))
-    (home-page "http://hspec.github.io/")
+                  ghc-tf-random))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d")))
+    (home-page "https://hspec.github.io/")
     (synopsis "Version of Hspec to test Hspec itself")
     (description "This library provides a stable version of Hspec which is
 used to test the in-development version of Hspec.")
@@ -734,38 +754,58 @@ used to test the in-development version of Hspec.")
 (define-public ghc-hspec
   (package
     (name "ghc-hspec")
-    (version "2.9.7")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hspec" version))
-              (sha256
-               (base32
-                "092sfqjkargxxszp9jjqa8ldjz0xv34jwn6k21q59ys5ckvsrpc1"))))
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec" version))
+       (sha256
+        (base32 "1zdgkn0gkcphcsfqcqwcfqiqvkz12ljks46v3czpaysndz8icfip"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec")))
     (inputs (list ghc-quickcheck ghc-hspec-core hspec-discover
                   ghc-hspec-expectations))
-    (home-page "http://hspec.github.io/")
+    (home-page "https://hspec.github.io/")
     (synopsis "Testing Framework for Haskell")
     (description "This library provides the Hspec testing framework for
 Haskell, inspired by the Ruby library RSpec.")
     (license license:expat)))
 
+(define-public ghc-hspec-api
+  (package
+    (name "ghc-hspec-api")
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-api" version))
+       (sha256
+        (base32 "1xn2b2hafyq6qm3zaia9nw27ir4cg8v2qn499bz2zwnp2vkjra07"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "hspec-api")))
+    (inputs (list ghc-hspec-core))
+    (native-inputs (list ghc-hspec))
+    (home-page "https://hspec.github.io/")
+    (synopsis "A Testing Framework for Haskell")
+    (description
+     "This package provides a stable API that can be used to extend Hspec's
+functionality.")
+    (license license:expat)))
+
 (define-public ghc-hspec-contrib
   (package
     (name "ghc-hspec-contrib")
-    (version "0.5.1.1")
+    (version "0.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "hspec-contrib" version))
        (sha256
-        (base32 "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"))))
+        (base32 "0002xzvyh790iwf1y33d4nflrbp5sxvpsp010srcfryf1n3qx2b0"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-contrib")))
     (inputs (list ghc-hunit ghc-call-stack ghc-hspec-core))
     (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover))
-    (arguments (list #:tests? #f)) ; Fail to build.
     (home-page "https://hspec.github.io/")
     (synopsis "Contributed functionality for Hspec")
     (description "This package provides contributed Hspec extensions.")
@@ -774,22 +814,25 @@ Haskell, inspired by the Ruby library RSpec.")
 (define-public ghc-hspec-expectations
   (package
     (name "ghc-hspec-expectations")
-    (version "0.8.2")
+    (version "0.8.4")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "hspec-expectations" version))
        (sha256
-        (base32
-         "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1"))))
+        (base32 "1zr1pqchcwglfr5dvcrgc1l5x924n9w09n2zr68dmkqf4dzdx3bv"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-expectations")))
+    (inputs (list ghc-hunit ghc-call-stack))
+    (arguments
     ;; Tests depend on ghc-nanospec.
-    (arguments '(#:tests? #f))
-    (inputs (list ghc-hunit))
-    (home-page "https://github.com/sol/hspec-expectations")
+     `(#:tests? #f
+       #:cabal-revision ("2"
+                         "14zzsjqcz1zbnvi50i82lx84nc8b5da7ar5cazzh44lklyag0ds2")))
+    (home-page "https://github.com/hspec/hspec-expectations#readme")
     (synopsis "Catchy combinators for HUnit")
-    (description "This library provides catchy combinators for HUnit, see
+    (description
+     "This library provides catchy combinators for HUnit, see
 @uref{https://github.com/sol/hspec-expectations#readme, the README}.")
     (license license:expat)))
 
@@ -854,13 +897,13 @@ implementations of cryptographic ciphers.")
 (define-public ghc-hedgehog
   (package
     (name "ghc-hedgehog")
-    (version "1.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hedgehog" version))
-              (sha256
-               (base32
-                "0dbk75hk6hqpzkjdlpw3s63qhm42kqigij33p321by6xndb59jg1"))))
+    (version "1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hedgehog" version))
+       (sha256
+        (base32 "0sl6x9q9kyrpv73565w9na9dm10wzxdl0qgiraqarffynfgn0hg9"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hedgehog")))
     (inputs (list ghc-ansi-terminal
@@ -875,8 +918,12 @@ implementations of cryptographic ciphers.")
                   ghc-primitive
                   ghc-random
                   ghc-resourcet
+                  ghc-safe-exceptions
                   ghc-transformers-base
                   ghc-wl-pprint-annotated))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "1m0b9m8dw5nw4b3w1jbp5fd0b0kqlyvvy3qsfxc7md77iafxq169")))
     (home-page "https://hedgehog.qa")
     (synopsis "Property-based testing in the spirt of QuickCheck")
     (description
@@ -892,26 +939,16 @@ To get started quickly, see the examples:
 (define-public cabal-doctest
   (package
     (name "cabal-doctest")
-    (version "1.0.9")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "cabal-doctest" version))
-              (sha256
-               (base32
-                "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"))))
+    (version "1.0.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "cabal-doctest" version))
+       (sha256
+        (base32 "0gwjpwv2v7c7gs2dvf7ixsxx6likmgw5yi0fy4bqc0i7nkqg4bfw"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cabal-doctest")))
-    (arguments
-     `(#:cabal-revision ("2"
-                         "0868js0qgfhvmyw4hjzrvmlzyqsm8dfsbmqhybxb90x44xi3r0i1")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'update-constraints
-           (lambda _
-             (substitute* "cabal-doctest.cabal"
-               (("\\b(Cabal|base)\\s+[^,]+" all dep)
-                dep)))))))
-    (home-page "https://github.com/haskellari/cabal-doctest")
+    (home-page "https://github.com/ulidtko/cabal-doctest")
     (synopsis "Setup.hs helper for running doctests")
     (description
      "To properly work, the @code{doctest} package needs plenty of
@@ -971,13 +1008,13 @@ random testing, and hybrids of the two.")
 (define-public ghc-inspection-testing
   (package
     (name "ghc-inspection-testing")
-    (version "0.4.6.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "inspection-testing" version))
-              (sha256
-               (base32
-                "0mxff0v3ciccbk4b8kxnh4752fzbwn7213qd8xji0csv6gi2w83y"))))
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "inspection-testing" version))
+       (sha256
+        (base32 "0zi1q86sd9jy5dpqfs2j71acdl7kvik0ps78xirpdhyldhwwyqws"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "inspection-testing")))
     (home-page "https://github.com/nomeata/inspection-testing")
@@ -1010,33 +1047,33 @@ examples and more information.")
     (name "ghc-quickcheck-classes")
     (version "0.6.5.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "quickcheck-classes" version))
-        (sha256
-          (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "quickcheck-classes" version))
+       (sha256
+        (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-classes")))
-    (inputs
-      (list ghc-quickcheck
-            ghc-primitive
-            ghc-primitive-addr
-            ghc-quickcheck-classes-base
-            ghc-aeson
-            ghc-semigroupoids
-            ghc-semirings
-            ghc-vector))
-    (native-inputs
-      (list ghc-base-orphans
-            ghc-tagged
-            ghc-base-orphans
-            ghc-tagged
-            ghc-tasty
-            ghc-tasty-quickcheck))
+    (inputs (list ghc-quickcheck
+                  ghc-primitive
+                  ghc-primitive-addr
+                  ghc-quickcheck-classes-base
+                  ghc-semigroups-bootstrap
+                  ghc-fail
+                  ghc-tagged
+                  ghc-aeson
+                  ghc-semigroupoids
+                  ghc-semirings
+                  ghc-vector))
+    (native-inputs (list ghc-base-orphans ghc-base-orphans ghc-tasty
+                         ghc-tasty-quickcheck))
+    (arguments
+     `(#:cabal-revision ("3"
+                         "1pawam5rsdcdv21fqc87khzqjm0ixwzklfxd6gk3b2qrr5q66bn5")))
     (home-page "https://github.com/andrewthad/quickcheck-classes#readme")
     (synopsis "QuickCheck common typeclasses")
     (description
-      "This library provides QuickCheck properties to ensure that typeclass
+     "This library provides QuickCheck properties to ensure that typeclass
 instances adhere to the set of laws that they are supposed to.  There are
 other libraries that do similar things, such as @code{genvalidity-hspec} and
 @code{checkers}.  This library differs from other solutions by not introducing
@@ -1052,24 +1089,26 @@ constraints more cleanly.")
     (name "ghc-quickcheck-classes-base")
     (version "0.6.2.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "quickcheck-classes-base" version))
-        (sha256
-          (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "quickcheck-classes-base" version))
+       (sha256
+        (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-classes-base")))
-    (inputs
-      (list ghc-quickcheck
-            ghc-contravariant
-            ghc-bifunctors
-            ghc-semigroups
-            ghc-fail
-            ghc-tagged))
+    (inputs (list ghc-quickcheck
+                  ghc-contravariant
+                  ghc-bifunctors
+                  ghc-semigroups-bootstrap
+                  ghc-fail
+                  ghc-tagged))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1p3v38jhpx0r6rnvaspkkivl8xyq2mq4xnmycgmkj1gr77vplkdr")))
     (home-page "https://github.com/andrewthad/quickcheck-classes#readme")
     (synopsis "QuickCheck common typeclasses from `base`")
     (description
-      "This library is a minimal variant of `quickcheck-classes` that only
+     "This library is a minimal variant of `quickcheck-classes` that only
 provides laws for typeclasses from `base`.  The main purpose of splitting this
 out is so that `primitive` can depend on `quickcheck-classes-base` in its test
 suite, avoiding the circular dependency that arises if `quickcheck-classes` is
@@ -1087,67 +1126,61 @@ this library uses the higher-kinded typeclasses
 (define-public ghc-doctest-lib
   (package
     (name "ghc-doctest-lib")
-    (version "0.1")
+    (version "0.1.1.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "doctest-lib" version))
-        (sha256
-          (base32 "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "doctest-lib" version))
+       (sha256
+        (base32 "1hb3zx1xzib3v41blnwcbhc2v0rzwdzq7gm4sajqndimwjkkxc67"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "doctest-lib")))
     (home-page "https://hub.darcs.net/thielema/doctest-lib/")
     (synopsis "Parts of doctest exposed as library")
     (description
-      "Parts of doctest exposed as library.  For use with the doctest-extract utility.")
+     "Parts of doctest exposed as library.  For use with the doctest-extract utility.")
     (license license:expat)))
 
 (define-public ghc-doctest-exitcode-stdio
   (package
     (name "ghc-doctest-exitcode-stdio")
-    (version "0.0")
+    (version "0.0.0.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "doctest-exitcode-stdio" version))
-        (sha256
-          (base32 "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "doctest-exitcode-stdio" version))
+       (sha256
+        (base32 "0kg5xiw4giyvqpcj6cxqqnysvixhxlwm0pbg3qks8dzwb5w79dvk"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "doctest-exitcode-stdio")))
-    (inputs
-      (list ghc-doctest-lib ghc-quickcheck ghc-semigroups))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "1065s8bch6zhl6mc8nhvfpwd1irmjd04z7xgycbpihc14x4ijim3")))
+    (inputs (list ghc-doctest-lib ghc-quickcheck ghc-semigroups))
     (home-page "https://hub.darcs.net/thielema/doctest-exitcode-stdio/")
     (synopsis "Run Doctests in a @code{Cabal.Test.exitcode-stdio} environment")
     (description
-      "This package allows on to run Doctests in a Cabal.Test.exitcode-stdio
+     "This package allows on to run Doctests in a Cabal.Test.exitcode-stdio
 environment.")
     (license license:bsd-3)))
 
 (define-public ghc-tasty-silver
   (package
     (name "ghc-tasty-silver")
-    (version "3.3.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-silver" version))
-              (sha256
-               (base32
-                "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m"))))
+    (version "3.3.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-silver" version))
+       (sha256
+        (base32 "01w3576kymglcddinh10m1wgy71dia49k2pnw5y1c97jjrhanf17"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-silver")))
     (inputs (list ghc-ansi-terminal
-                  ghc-async
                   ghc-optparse-applicative
                   ghc-process-extras
                   ghc-regex-tdfa
                   ghc-silently
                   ghc-tagged
                   ghc-tasty
-                  ghc-temporary
-                  ghc-semigroups))
+                  ghc-temporary))
     (native-inputs (list ghc-tasty-hunit))
     (home-page "https://github.com/phile314/tasty-silver")
     (synopsis "Fancy test runner, including support for golden tests")
@@ -1163,16 +1196,19 @@ result of golden tests.")
 (define-public ghc-tasty-inspection-testing
   (package
     (name "ghc-tasty-inspection-testing")
-    (version "0.1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-inspection-testing" version))
-              (sha256
-               (base32
-                "0p46w44f19w7lvdzyg3vq6qzix0rjp8p23ilxz82dviq38lgmifp"))))
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-inspection-testing" version))
+       (sha256
+        (base32 "0wl2xlnbmqdkwhi4ic6a4q4lxf9qg433lidi8d0hlp3ykrjpbcay"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-inspection-testing")))
     (inputs (list ghc-inspection-testing ghc-tasty))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "0z9al0hyq381fw146agbpz7rf24rwms1w91m7s0k1w3xbfw16l9n")))
     (home-page "https://github.com/Bodigrim/tasty-inspection-testing")
     (synopsis "Inspection testing support for tasty")
     (description
@@ -1182,13 +1218,13 @@ result of golden tests.")
 (define-public ghc-proctest
   (package
     (name "ghc-proctest")
-    (version "0.1.3.0")
+    (version "0.1.3.1")
     (source (origin
               (method url-fetch)
               (uri (hackage-uri "proctest" version))
               (sha256
                (base32
-                "02iz323arx9zwclvspgaaqz81bp6jdnj89pjm08n2gamg39zsbdn"))))
+                "0yvhc0l5aj170ymhjx4ig0im0yd7wfa150m5lqhabr8j7cf16l7y"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "proctest")))
     (inputs (list ghc-hunit ghc-hspec ghc-quickcheck))

gnu/packages/haskell-crypto.scm

@@ -62,18 +62,19 @@ format.")
   (package
     (name "ghc-asn1-encoding")
     (version "0.9.6")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "asn1-encoding" version))
-              (sha256
-               (base32
-                "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "asn1-encoding" version))
+       (sha256
+        (base32 "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "asn1-encoding")))
-    (inputs
-     (list ghc-hourglass ghc-asn1-types))
-    (native-inputs
-     (list ghc-tasty ghc-tasty-quickcheck))
+    (inputs (list ghc-hourglass ghc-asn1-types))
+    (native-inputs (list ghc-tasty ghc-tasty-quickcheck))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97")))
     (home-page "https://github.com/vincenthz/hs-asn1")
     (synopsis "ASN1 data reader and writer in RAW, BER and DER forms")
     (description
@@ -111,15 +112,18 @@ when ASN1 pattern matching is not convenient.")
        (method url-fetch)
        (uri (hackage-uri "crypto-api" version))
        (sha256
-        (base32
-         "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"))))
+        (base32 "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypto-api")))
     (inputs (list ghc-cereal ghc-tagged ghc-entropy))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1z6n1sa5pn3iqvqjrd8hv4bc2pxzsrhm5sh0l8z7g9lbqp6w0wp5")))
     (home-page "https://github.com/TomMD/crypto-api")
     (synopsis "Provides generic interface for cryptographic operations
 for Haskell")
-    (description "This Haskell package provides a generic interface for
+    (description
+     "This Haskell package provides a generic interface for
 cryptographic operations (hashes, ciphers, randomness).
 
 Maintainers of hash and cipher implementations are encouraged to add instances
@@ -197,13 +201,15 @@ that hides the C implementation.")
        (method url-fetch)
        (uri (hackage-uri "cryptohash-md5" version))
        (sha256
-        (base32
-         "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
+        (base32 "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cryptohash-md5")))
     (native-inputs (list ghc-base16-bytestring ghc-puremd5 ghc-tasty
-                         ghc-tasty-hunit ghc-tasty-quickcheck))
-    (home-page "https://github.com/hvr/cryptohash-md5")
+                         ghc-tasty-quickcheck ghc-tasty-hunit))
+    (arguments
+     `(#:cabal-revision ("6"
+                         "0m7f9mgw4w9vcch37ja9zgbn0knq8rjppqr9x2ylkcdxfdnmhhif")))
+    (home-page "https://github.com/haskell-hvr/cryptohash-md5")
     (synopsis "MD5 implementation for Haskell")
     (description "This Haskell package provides implementation of MD5.")
     (license license:bsd-3)))
@@ -212,20 +218,20 @@ that hides the C implementation.")
   (package
     (name "ghc-cryptohash-sha1")
     (version "0.11.101.0")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "cryptohash-sha1" version))
-              (sha256
-               (base32
-                "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "cryptohash-sha1" version))
+       (sha256
+        (base32 "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cryptohash-sha1")))
     (native-inputs (list ghc-base16-bytestring ghc-sha ghc-tasty
                          ghc-tasty-quickcheck ghc-tasty-hunit))
     (arguments
-     `(#:cabal-revision ("1"
-                         "0bz9rfl7b2iwn45m0lxcmsyi5rrv3xdgzx2lzr79bds91dw6i25b")))
-    (home-page "https://github.com/hvr/cryptohash-sha1")
+     `(#:cabal-revision ("6"
+                         "1cxdw2y10z4v0mz91wki7f233jziipx85j4qy5msig4nv3djkprb")))
+    (home-page "https://github.com/haskell-hvr/cryptohash-sha1")
     (synopsis "SHA-1 implementation for Haskell")
     (description
      "This Haskell package provides an incremental and one-pass,
@@ -246,20 +252,18 @@ the C implementation.")
        (method url-fetch)
        (uri (hackage-uri "cryptohash-sha256" version))
        (sha256
-        (base32
-         "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"))))
+        (base32 "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cryptohash-sha256")))
+    (native-inputs (list ghc-base16-bytestring ghc-sha ghc-tasty
+                         ghc-tasty-quickcheck ghc-tasty-hunit))
     (arguments
-     `(#:cabal-revision
-       ("1" "1hyzqv30rpj920ddnr0zypyjjlh52vyp2d140pn2byayj820rkgs")
-       #:tests? #f)) ; TODO: tasty ==1.1.*
-    (native-inputs
-     (list ghc-base16-bytestring ghc-sha ghc-tasty ghc-tasty-hunit
-           ghc-tasty-quickcheck))
-    (home-page "https://github.com/hvr/cryptohash-sha1")
+     `(#:cabal-revision ("6"
+                         "01s12sl5mxvraj5fj3cs0pkb03pm8xpjz13y09dpl7i6rv6f578f")))
+    (home-page "https://github.com/haskell-hvr/cryptohash-sha256")
     (synopsis "SHA-256 implementation for Haskell")
-    (description "This Haskell package provides an incremental and
+    (description
+     "This Haskell package provides an incremental and
 one-pass, pure API to the @uref{https://en.wikipedia.org/wiki/SHA-2,
 SHA-256 cryptographic hash algorithm}, with performance close to the
 fastest implementations available in other languages.
@@ -272,12 +276,12 @@ the C implementation.")
   (package
     (name "ghc-cryptonite")
     (version "0.30")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "cryptonite" version))
-              (sha256
-               (base32
-                "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "cryptonite" version))
+       (sha256
+        (base32 "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cryptonite")))
     (inputs (list ghc-memory ghc-basement))
@@ -295,13 +299,13 @@ generators, and more.")
 (define-public ghc-curve25519
   (package
   (name "ghc-curve25519")
-  (version "0.2.7")
+  (version "0.2.8.1")
   (source
    (origin
      (method url-fetch)
      (uri (hackage-uri "curve25519" version))
      (sha256
-      (base32 "1p8b1lppkvc19974hr43lcqdi4nj55j2nf7gsnp8dn7gyf23aayq"))))
+      (base32 "0p2rxad477cxbpxryvp78v8nrrf5gm35106jbqrj5cjgksappkdj"))))
   (build-system haskell-build-system)
   (native-inputs
    (list ghc-hunit
@@ -326,19 +330,17 @@ elsewhere.")
 (define-public ghc-digest
   (package
     (name "ghc-digest")
-    (version "0.0.1.7")
+    (version "0.0.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "digest" version))
        (sha256
-        (base32 "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"))))
+        (base32 "163418p50bqdxn8ajzj6x3455xbch9jq1w6psbkdz5qzw017py6b"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "digest")))
     (arguments
-     `(#:extra-directories ("zlib")
-       #:cabal-revision ("1"
-                         "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl")))
+     `(#:extra-directories ("zlib")))
     (inputs (list zlib))
     (native-inputs (list pkg-config))
     (home-page "http://hackage.haskell.org/package/digest")
@@ -352,13 +354,13 @@ are implemented as FFI bindings to efficient code from zlib.")
 (define-public ghc-entropy
   (package
     (name "ghc-entropy")
-    (version "0.4.1.10")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "entropy" version))
-              (sha256
-               (base32
-                "1rbx4ydabrjs8kkdg9laznkh9nisiq6b5z93vnp9bh6iy59ivb45"))))
+    (version "0.4.1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "entropy" version))
+       (sha256
+        (base32 "1slj5n783k2amsx2hqs5qwvcw4rgfhdhgmiyg7cii0wg4w0mmpgm"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "entropy")))
     (home-page "https://github.com/TomMD/entropy")
@@ -415,6 +417,35 @@ the MD5 digest (hash) algorithm.  This now supports the @code{crypto-api} class
 interface.")
     (license license:bsd-3)))
 
+(define-public ghc-rsa
+  (package
+    (name "ghc-rsa")
+    (version "2.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "RSA" version))
+       (sha256
+        (base32 "0hchsqrxpfw7mqrqwscfy8ig1w2di6w3nxpzi873w0gibv2diibj"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "RSA")))
+    (inputs (list ghc-crypto-api ghc-crypto-pubkey-types ghc-sha))
+    (native-inputs (list ghc-quickcheck ghc-tagged ghc-test-framework
+                         ghc-test-framework-quickcheck2))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "090yzm99fmh7c6z4m9hbkasqhc3xlw104g2b6wnk77n1abd13ryj")))
+    (home-page "http://hackage.haskell.org/package/RSA")
+    (synopsis
+     "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.")
+    (description
+     "This library implements the RSA encryption and signature algorithms for
+arbitrarily-sized @code{ByteStrings}.  While the implementations work, they are
+not necessarily the fastest ones on the planet.  Particularly key generation.
+The algorithms included are based of RFC 3447, or the Public-Key Cryptography
+Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).")
+    (license license:bsd-3)))
+
 (define-public ghc-sha
   (package
     (name "ghc-sha")
@@ -594,6 +625,24 @@ implementation.  If it matters for your case, you should make sure you have
 AES-NI available, or you'll need to use a different implementation.")
     (license license:bsd-3)))
 
+(define-public ghc-crypto-pubkey-types
+  (package
+    (name "ghc-crypto-pubkey-types")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypto-pubkey-types" version))
+       (sha256
+        (base32 "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypto-pubkey-types")))
+    (inputs (list ghc-asn1-types ghc-asn1-encoding))
+    (home-page "http://github.com/vincenthz/hs-crypto-pubkey-types")
+    (synopsis "Generic cryptography Public keys algorithm types")
+    (description "Generic cryptography public keys algorithm types.")
+    (license license:bsd-3)))
+
 (define-public ghc-crypto-random
   (package
     (name "ghc-crypto-random")
@@ -617,13 +666,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton
   (package
     (name "ghc-crypton")
-    (version "0.34")
+    (version "1.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "crypton" version))
        (sha256
-        (base32 "1mhypjhzn95in853bp7ary0a2xc6lsji6j8hrrgn2mfa4ilq8i24"))))
+        (base32 "06h1qjvqd8gmiyzvh31sc061vcgns101l0774c44a8k44015925l"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypton")))
     (inputs (list ghc-memory ghc-basement))
@@ -653,13 +702,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton-x509
   (package
     (name "ghc-crypton-x509")
-    (version "1.7.6")
+    (version "1.7.7")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "crypton-x509" version))
        (sha256
-        (base32 "1zyaz0krf08g36g30zr5wn8f2x51l4dj2zcjnhpiw9h05p54mdzb"))))
+        (base32 "10pkva9wvm6ih48bprxlnyhnn3nr6xq9dhkrk4hfxpsaij6f9v7g"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypton-x509")))
     (inputs (list ghc-memory
@@ -669,13 +718,7 @@ abstraction for CPRNGs.")
                   ghc-asn1-encoding
                   ghc-asn1-parse
                   ghc-crypton))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-x509))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "10a2x47znhbayyfr6fqgq27623akpycyjbfxz4hnavavf1x6ary5")
-       ;; build phase fails when tests are activated.
-       ;; See https://github.com/kazu-yamamoto/crypton-certificate/pull/7
-       #:tests? #f))
+    (native-inputs (list ghc-tasty ghc-tasty-quickcheck))
     (home-page "https://github.com/kazu-yamamoto/crypton-certificate")
     (synopsis "X509 reader and writer")
     (description "This package provides generic X509 support for Haskell.")
@@ -684,13 +727,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton-x509-store
   (package
     (name "ghc-crypton-x509-store")
-    (version "1.6.9")
+    (version "1.6.11")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "crypton-x509-store" version))
        (sha256
-        (base32 "0vr5b9cyf9x016wn1g0bryslf5nz8jq2sy8r3llwqfg02apihqiy"))))
+        (base32 "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypton-x509-store")))
     (inputs (list ghc-pem ghc-asn1-types ghc-asn1-encoding ghc-crypton
@@ -727,24 +770,25 @@ storage methods, and accessors.")
 (define-public ghc-crypton-x509-validation
   (package
     (name "ghc-crypton-x509-validation")
-    (version "1.6.12")
+    (version "1.6.14")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "crypton-x509-validation" version))
        (sha256
-        (base32 "1xjhwvmkcy47a6xiqxb3xy944ca7g660203jdrz5xzd46zibfq0f"))))
+        (base32 "07b09kgrd3m5ahxpj458r5ycd30bz8ldwjwf19mdcnfv4x0kj3pd"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypton-x509-validation")))
     (inputs (list ghc-memory
                   ghc-hourglass
-                  ghc-data-default-class
+                  ghc-data-default
                   ghc-pem
                   ghc-asn1-types
                   ghc-asn1-encoding
                   ghc-crypton-x509
                   ghc-crypton-x509-store
-                  ghc-crypton))
+                  ghc-crypton
+                  ghc-iproute))
     (native-inputs (list ghc-tasty ghc-tasty-hunit))
     (home-page "https://github.com/kazu-yamamoto/crypton-certificate")
     (synopsis "X.509 Certificate and CRL validation")
@@ -752,6 +796,44 @@ storage methods, and accessors.")
 and @dfn{Certificates revocation list} (CRL) validation.")
     (license license:bsd-3)))
 
+(define-public ghc-crypton-socks
+  (package
+    (name "ghc-crypton-socks")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypton-socks" version))
+       (sha256
+        (base32 "0fwzlvndyxjwhxambxdjzzm63yvb6jzsg53dkv3i6x17biz0hdm8"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypton-socks")))
+    (inputs (list ghc-cereal ghc-network ghc-network-bsd))
+    (home-page "http://github.com/mpilgrem/crypton-socks")
+    (synopsis "SOCKS Protocol Version 5")
+    (description
+     "This package provides a library implementing SOCKS Protocol Version 5.")
+    (license license:bsd-3)))
+
+(define-public ghc-crypto-token
+  (package
+    (name "ghc-crypto-token")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypto-token" version))
+       (sha256
+        (base32 "18xphlvn6wzyi6lqrvm5vic97pkcbiph1938p5l1mb22rj5215zm"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypto-token")))
+    (inputs (list ghc-crypton ghc-memory ghc-network-byte-order))
+    (native-inputs (list ghc-hspec hspec-discover))
+    (home-page "http://hackage.haskell.org/package/crypto-token")
+    (synopsis "crypto tokens")
+    (description "Encrypted tokens/tickets to keep state in the client side.")
+    (license license:bsd-3)))
+
 (define-public ghc-cprng-aes
   (package
     (name "ghc-cprng-aes")
@@ -804,20 +886,19 @@ percent.
        (method url-fetch)
        (uri (hackage-uri "ed25519" version))
        (sha256
-        (base32
-         "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
+        (base32 "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "ed25519")))
+    (native-inputs (list ghc-quickcheck ghc-doctest))
     (arguments
-     `(#:cabal-revision
-       ("6" "0qyx6cl52fnll8lp6v9133wfvv3zhvq7v2crn441mng520j9wp48")
-       ;; We omit these test suites because they require old versions of
-       ;; packages and packages we do not have.
-       #:configure-flags
-       '("--flags=-test-hlint -test-doctests -test-properties")))
-    (home-page "http://thoughtpolice.github.com/hs-ed25519")
+     `(#:cabal-revision ("9"
+                         "0y5vfdcys18waa5k5zxiq9n8jq0l05j76riml23i0gxmwgdhsmgi")
+       ;; the tests don't work with current versions of the test frameworks
+       #:tests? #f))
+    (home-page "https://github.com/thoughtpolice/hs-ed25519/")
     (synopsis "Ed25519 cryptographic signatures")
-    (description "This package provides a simple, fast, self-contained
+    (description
+     "This package provides a simple, fast, self-contained
 copy of the Ed25519 public-key signature system with a clean interface.
 It also includes support for detached signatures, and thorough
 documentation on the design and implementation, including usage
@@ -827,29 +908,41 @@ guidelines.")
 (define-public ghc-tls
   (package
     (name "ghc-tls")
-    (version "1.5.8")
+    (version "2.1.8")
     (source (origin
               (method url-fetch)
               (uri (hackage-uri "tls" version))
               (sha256
                (base32
-                "0rxdv8ab98kd4nqql7djmmi51k4vayq21s38s43sx3rzn0iyla3b"))))
+                "1csdy3426lva1a5f7gh9qm96vzfraqj91jbxlm79wbf1jsdzfhsq"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tls")))
-    (inputs (list ghc-cereal
-                  ghc-data-default-class
-                  ghc-memory
-                  ghc-cryptonite
-                  ghc-asn1-types
+    (inputs (list ghc-asn1-types
                   ghc-asn1-encoding
-                  ghc-x509
-                  ghc-x509-store
-                  ghc-x509-validation
-                  ghc-async
-                  ghc-hourglass
-                  ghc-network))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck))
-    (home-page "http://github.com/vincenthz/hs-tls")
+                  ghc-base16-bytestring
+                  ghc-cereal
+                  ghc-crypton
+                  ghc-crypton-x509
+                  ghc-crypton-x509-store
+                  ghc-crypton-x509-validation
+                  ghc-data-default
+                  ghc-memory
+                  ghc-network
+                  ghc-serialise
+                  ghc-transformers
+                  ghc-unix-time
+                  ghc-zlib))
+    (native-inputs (list ghc-quickcheck
+                         ghc-asn1-types
+                         ghc-async
+                         ghc-crypton
+                         ghc-crypton-x509
+                         ghc-crypton-x509-validation
+                         ghc-hourglass
+                         ghc-hspec
+                         ghc-serialise
+                         hspec-discover))
+    (home-page "http://github.com/haskell-tls/hs-tls")
     (synopsis "TLS/SSL protocol native implementation (Server and Client)")
     (description
      "Native Haskell TLS and SSL protocol implementation for server and client.
@@ -861,43 +954,6 @@ Ephemeral (Elliptic curve and regular) Diffie Hellman key exchanges, and many
 extensions.")
     (license license:bsd-3)))
 
-(define-public ghc-tls-1.9
-  (package
-    (name "ghc-tls")
-    (version "1.9.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tls" version))
-       (sha256
-        (base32 "0gj3af9sqd0bw7dpcqfyvbslpxsk2ij00a77kl710fwhw35vj1an"))))
-    (build-system haskell-build-system)
-    (properties '((upstream-name . "tls")))
-    (inputs (list ghc-cereal
-                  ghc-data-default-class
-                  ghc-memory
-                  ghc-crypton
-                  ghc-asn1-types
-                  ghc-asn1-encoding
-                  ghc-crypton-x509
-                  ghc-crypton-x509-store
-                  ghc-crypton-x509-validation
-                  ghc-async
-                  ghc-unix-time
-                  ghc-network))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck))
-    (home-page "https://github.com/haskell-tls/hs-tls")
-    (synopsis "TLS/SSL protocol native implementation (server and client)")
-    (description
-     "This package provides a native Haskell TLS and SSL protocol
-implementation for server and client.  It provides a high-level implementation
-of a sensitive security protocol, eliminating a common set of security issues
-through the use of the advanced type system, high level constructions and
-common Haskell features.  It currently implements the SSL3.0, TLS1.0, TLS1.1
-and TLS1.2 protocol, and supports RSA and Ephemeral (Elliptic curve and
-regular) Diffie Hellman key exchanges, and many extensions.")
-    (license license:bsd-3)))
-
 (define-public ghc-hsopenssl
   (package
     (name "ghc-hsopenssl")
@@ -960,17 +1016,14 @@ the tls package, and borrows some ideas from x509-system.")
        (method url-fetch)
        (uri (hackage-uri "openssl-streams" version))
        (sha256
-        (base32
-         "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
+        (base32 "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "openssl-streams")))
-    (inputs
-     (list ghc-hsopenssl ghc-io-streams ghc-network))
-    (native-inputs
-     (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
+    (inputs (list ghc-hsopenssl ghc-io-streams ghc-network))
+    (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
     (arguments
-     `(#:cabal-revision ("1"
-                         "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp")))
+     `(#:cabal-revision ("3"
+                         "1vizl9yajkbd59rrnfb38xwq7hfj36avbv6vwqnkhbvz3qaj3dwg")))
     (home-page "https://hackage.haskell.org/package/openssl-streams")
     (synopsis "OpenSSL network support for io-streams")
     (description "This library contains io-streams routines for secure

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)
@@ -1686,12 +1686,6 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
               (file-pattern ".*\\.conf\\.d$")
               (file-type 'directory)))))))
 
-;; Versions newer than ghc defined below (i.e. the compiler
-;; haskell-build-system uses) should use ghc-next as their name to
-;; ensure ghc (without version specification) and ghc-* packages are
-;; always compatible. See https://issues.guix.gnu.org/issue/47335.
-(define-public ghc ghc-9.2)
-
 ;; 9.4 is the last version to support the make-based build system,
 ;; but it boot with 9.2, only 9.0 is supported.
 (define ghc-bootstrap-for-9.4 ghc-9.0)
@@ -1755,22 +1749,24 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
   (let ((base ghc-9.2))
     (package
       (inherit base)
-      (name "ghc-next")
-      (version "9.4.4")
+      (name "ghc")
+      (version "9.4.3")
       (source (origin
                 (method url-fetch)
                 (uri (string-append "https://www.haskell.org/ghc/dist/" version
                                     "/ghc-" version "-src.tar.xz"))
                 (sha256
                  (base32
-                  "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8"))
+                  "0nlhx2cbq1jh2yr6zk475lavjkh9sncj57qp77p51pkfad4kkxpa"))
                 (patches (search-patches "ghc-9-StgCRunAsm-only-when-needed.patch"))))
       (arguments
        (substitute-keyword-arguments arguments
          ((#:phases phases '%standard-phases)
           #~(modify-phases #$phases
              ;; Files don’t exist any more.
-             (delete 'skip-tests)))))
+             (delete 'skip-tests)))
+         ((#:tests? _ #f)
+          #f)))
       (native-inputs
        `(;; GHC 9.4 must be built with GHC >= 9.0.
          ("ghc-bootstrap" ,ghc-bootstrap-for-9.4)
@@ -1782,8 +1778,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
                     version "/ghc-" version "-testsuite.tar.xz"))
              (sha256
               (base32
-               "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3"))
-             (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))))
+               "1xbps33pq6mg2bwp5gvmc4qhgdq52yng5993if99b9s3fylqk86l"))))
          ("ghc-alex" ,ghc-alex-bootstrap-for-9.4)
          ("ghc-happy" ,ghc-happy-bootstrap-for-9.4)
          ,@(filter (match-lambda
@@ -1798,4 +1793,326 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
               (file-pattern ".*\\.conf\\.d$")
               (file-type 'directory)))))))
 
+;;; GHC >= 9.6 must be built using it's new haskell-written Hadrian build
+;;; system. Use this opportunity to cut the inheritance chain to simplify
+;;; understanding what building ghc requires with the new build system.
+
+(define-public ghc-9.8
+  (let ((ghc-bootstrap ghc-9.4))
+    (package
+      (name "ghc")
+      (version "9.8.1")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append "https://downloads.haskell.org/~ghc/" version
+                                    "/ghc-" version "-src.tar.xz"))
+                (sha256
+                 (base32
+                  "0l87yb8hmd350klrp6lw2h9hjlla11pgzx1n4jlrfdvkgxmyvy5j"))))
+      (outputs (list "out" "doc"))
+      (arguments
+       (list
+        #:make-flags #~(list "-V" "--docs=no-sphinx")
+       #:configure-flags
+       #~(list
+           (string-append "--with-gmp-libraries="
+                          (assoc-ref %build-inputs "gmp") "/lib")
+           (string-append "--with-gmp-includes="
+                          (assoc-ref %build-inputs "gmp") "/include")
+           "--with-system-libffi"
+           (string-append "--with-ffi-libraries="
+                          (assoc-ref %build-inputs "libffi") "/lib")
+           (string-append "--with-ffi-includes="
+                          (assoc-ref %build-inputs "libffi") "/include")
+           (string-append "--with-curses-libraries="
+                          (assoc-ref %build-inputs "ncurses") "/lib")
+           (string-append "--with-curses-includes="
+                          (assoc-ref %build-inputs "ncurses") "/include"))
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-before 'build 'fix-iserv-rpath
+              (lambda _
+                (mkdir-p "_build")
+                (call-with-output-file
+                 "_build/hadrian.settings"
+                 (lambda (port)
+                   (display
+                    (string-append
+                     "*.iserv.ghc.link.opts += -optl-Wl,-rpath,"
+                     #$output "/lib/ghc-" #$(package-version this-package)
+                     "/lib/" #$(or (%current-target-system)
+                                   (%current-system))
+                     "-ghc-" #$(package-version this-package) "/")
+                    port)))))
+            ;; This phase patches the 'ghc-pkg' command so that it sorts the list
+            ;; of packages in the binary cache it generates.
+            (add-before 'build 'fix-ghc-pkg-nondeterminism
+              (lambda _
+                (substitute* "utils/ghc-pkg/Main.hs"
+                  (("confs = map \\(path </>\\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs")
+                   "confs = map (path </>) $ filter (\".conf\" `isSuffixOf`) (sort fs)"))))
+            (add-after 'unpack 'unpack-testsuite
+              (lambda* (#:key inputs #:allow-other-keys)
+                (with-directory-excursion ".."
+                  (invoke "tar" "xvf" (assoc-ref inputs "ghc-testsuite")))))
+            (add-after 'unpack-testsuite 'fix-/bin/sh-references
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute*
+                 (list "hadrian/src/Rules/BinaryDist.hs"
+                       "hadrian/src/Rules/Test.hs"
+                       "libraries/process/System/Process/Posix.hs"
+                       "libraries/process/jsbits/process.js"
+                       "libraries/unix/cbits/execvpe.c"
+                       "testsuite/tests/driver/T8602/T8602.script"
+                       "testsuite/timeout/timeout.py")
+                 (("/bin/sh") (search-input-file inputs "/bin/sh")))))
+            (add-after 'unpack-testsuite 'fix-cc-reference
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute*
+                 (list "utils/hsc2hs/src/Common.hs")
+                 (("\"cc\"") "\"gcc\""))))
+            ;; XXX: something causes ld-wrapper to see test\ \ \ spaces/... and
+            ;; look for the files "test\", "\", "\" and "spaces/...", which obviously
+            ;; don't exist
+            (add-after 'unpack-testsuite 'fix-testsuite
+              (lambda _
+                (substitute*
+                  (list "testsuite/driver/runtests.py")
+                  (("'test   spaces'") "'dont-test-spaces'"))))
+            (add-before 'configure 'set-target-programs
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((binutils (assoc-ref inputs "binutils"))
+                      (gcc (assoc-ref inputs "gcc"))
+                      (ld-wrapper (assoc-ref inputs "ld-wrapper")))
+                  (setenv "CC" (string-append gcc "/bin/gcc"))
+                  (setenv "CXX" (string-append gcc "/bin/g++"))
+                  (setenv "LD" (string-append ld-wrapper "/bin/ld"))
+                  (setenv "NM" (string-append binutils "/bin/nm"))
+                  (setenv "RANLIB" (string-append binutils "/bin/ranlib"))
+                  (setenv "STRIP" (string-append binutils "/bin/strip"))
+                  ;; The 'ar' command does not follow the same pattern.
+                  (setenv "fp_prog_ar" (string-append binutils "/bin/ar")))))
+            (add-before 'build 'build-hadrian
+              (lambda* (#:key (inputs '()) #:allow-other-keys)
+                (invoke "./hadrian/bootstrap/bootstrap.py"
+                        "-s" (assoc-ref inputs "hadrian-bootstrap")
+                        "-w" (which "ghc"))))
+            (add-before 'build-hadrian 'fix-environment
+              (lambda _
+                (unsetenv "GHC_PACKAGE_PATH")
+                (setenv "CONFIG_SHELL" (which "bash"))))
+            (replace 'build
+              (lambda* (#:key (parallel-build? #f) (make-flags '())
+                       #:allow-other-keys)
+                (apply invoke "_build/bin/hadrian"
+                       `("binary-dist-dir"
+                         ,@(if parallel-build?
+                             (list (string-append
+                                    "-j" (number->string
+                                          (parallel-job-count)))))
+                         ,@make-flags))))
+            (replace 'check
+              (lambda* (#:key (tests? #t) (parallel-tests? #f) (make-flags '())
+                        #:allow-other-keys)
+                (if tests?
+                  (apply invoke "_build/bin/hadrian"
+                         `(,@(if parallel-tests?
+                               (list (string-append
+                                      "-j"
+                                      (number->string (parallel-job-count))))
+                               '())
+                           ,@make-flags
+                           "test"
+                           ,(string-append
+                             "--broken-test="
+                             (string-join
+                              (list  "T15904" ; ld-wrapper, apparently
+                                     "T16521" ; no idea
+                                     ;; These fail due to gcc
+                                     ;; -Wincompatible-pointer-types, which
+                                     ;; apparently is not used in GHC's CI
+                                     ;; https://gitlab.haskell.org/ghc/ghc/-/issues/22263
+                                     "hs_try_putmvar001"
+                                     "list_threads_and_misc_roots"
+                                     "testwsdeque")))
+                           "--skip-perf"))
+                  (format #t "test suite not run~%"))))
+            (replace 'install
+              (lambda* (#:key (make-flags '()) #:allow-other-keys)
+                (apply invoke "_build/bin/hadrian"
+                       `("install"
+                         ,@make-flags
+                         ,(string-append "--prefix=" #$output)))))
+           (add-after 'install 'remove-unnecessary-references
+             (lambda* (#:key outputs #:allow-other-keys)
+               (substitute* (find-files (string-append (assoc-ref outputs "out") "/lib/")
+                                        "settings")
+                 (("/gnu/store/.*/bin/(.*)" m program) program))
+
+               ;; Remove references to "doc" output from "out" by rewriting
+               ;; the "haddock-interfaces" fields and removing the optional
+               ;; "haddock-html" field in the generated .conf files.
+               (let ((doc (assoc-ref outputs "doc"))
+                     (out (assoc-ref outputs "out")))
+                 (with-fluids ((%default-port-encoding #f))
+                   (for-each (lambda (config-file)
+                               (substitute* config-file
+                                 (("^haddock-html: .*") "\n")
+                                 (((format #f "^haddock-interfaces: ~a" doc))
+                                  (string-append "haddock-interfaces: " out))))
+                             (find-files (string-append out "/lib") ".conf")))
+                 ;; Move the referenced files to the "out" output.
+                 (for-each (lambda (haddock-file)
+                             (let* ((subdir (string-drop haddock-file (string-length doc)))
+                                    (new    (string-append out subdir)))
+                               (mkdir-p (dirname new))
+                               (rename-file haddock-file new)))
+                           (find-files doc "\\.haddock$")))))
+            (add-after 'install 'replace-$pkgroot
+              (lambda* (#:key outputs #:allow-other-keys)
+                ((@ (srfi srfi-11) let*-values)
+                  (((out) (assoc-ref outputs "out"))
+                   ((_ version) (package-name->name+version
+                                    (strip-store-file-name out))))
+                 ;; We split out the version because we want this to also work
+                 ;; with packages named "ghc-next" instead of "ghc"
+                 (substitute*
+                   (find-files
+                    (string-append (assoc-ref outputs "out") "/lib/ghc-"
+                                   version "/lib/package.conf.d/")
+                    "^.*\\.conf$")
+                   (("\\$\\{pkgroot\\}/")
+                    (string-append (assoc-ref outputs "out") "/lib/ghc-"
+                                   version "/lib/")))))))))
+      (build-system gnu-build-system)
+      (inputs (list bash-minimal gmp ncurses libffi))
+      (native-inputs
+       `(("perl" ,perl)
+         ("python" ,python)
+         ("git" ,git-minimal/pinned)
+         ("which" ,which)
+         ("ghostscript" ,ghostscript)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+
+         ("ghc-bootstrap" ,ghc-bootstrap)
+         ("ghc-alex" ,ghc-alex-bootstrap-for-9.4)
+         ("ghc-happy" ,ghc-happy-bootstrap-for-9.4)
+         ("ghc-testsuite"
+          ,(origin
+             (method url-fetch)
+             (uri (string-append
+                   "https://www.haskell.org/ghc/dist/"
+                   version "/ghc-" version "-testsuite.tar.xz"))
+             (sha256
+              (base32
+               "1hxylm3nhxzl7yidarlavvcg1240w4bk0hy5jnvwna24jyxz69i6"))
+             (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))))
+         ("hadrian-bootstrap"
+          ,(origin
+             (method url-fetch)
+             (uri (string-append "https://downloads.haskell.org/~ghc/"
+                                 version "/hadrian-bootstrap-sources/"
+                                 "hadrian-bootstrap-sources-"
+                                 (package-version ghc-bootstrap) ".tar.gz"))
+             (sha256
+               (base32
+                 "14dkxif9x4hy85phcj3j0glf95k04g4ab6hfchpw9vxgvk97syi1"))))))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "GHC_PACKAGE_PATH")
+              (files (list (string-append "lib/ghc-" version)))
+              (file-pattern ".*\\.conf\\.d$")
+              (file-type 'directory))))
+      (home-page "https://www.haskell.org/ghc")
+      (synopsis "The Glasgow Haskell Compiler")
+      (description
+        "The Glasgow Haskell Compiler (GHC) is a state-of-the-art compiler and
+interactive environment for the functional language Haskell.")
+      (license license:bsd-3))))
+
+(define-public ghc-9.10
+  (let ((base ghc-9.8))
+    (package
+      (inherit base)
+      (name "ghc")
+      (version "9.10.2")
+      (source
+        (origin
+          (method url-fetch)
+          (uri (string-append "https://downloads.haskell.org/~ghc/" version
+                              "/ghc-" version "-src.tar.xz"))
+          (sha256
+            (base32
+             "1pm84cgr3yg99r3srdjllgz6zig8h7dbwa597srwcnjp0nh41zam"))))
+      (arguments
+        (substitute-keyword-arguments (package-arguments base)
+          ((#:phases phases #~%standard-phases)
+           #~(modify-phases #$phases
+               (replace 'check
+                 (lambda* (#:key (tests? #t) (parallel-tests? #f) (make-flags '())
+                           #:allow-other-keys)
+                   (if tests?
+                     (apply invoke "_build/bin/hadrian"
+                            `(,@(if parallel-tests?
+                                  (list (string-append
+                                         "-j"
+                                         (number->string (parallel-job-count))))
+                                  '())
+                              ,@make-flags
+                              "test"
+                              ,(string-append
+                                "--broken-test="
+                                (string-join
+                                 (list  "T15904" ; ld-wrapper, apparently
+                                        "T16521" ; no idea
+                                        ;; These fail due to gcc
+                                        ;; -Wincompatible-pointer-types, which
+                                        ;; apparently is not used in GHC's CI
+                                        ;; https://gitlab.haskell.org/ghc/ghc/-/issues/22263
+                                        "list_threads_and_misc_roots"
+                                        "stack_misc_closures")))
+                              "--skip-perf"))
+                     (format #t "test suite not run~%"))))))))
+      (native-inputs
+       `(("ghc-bootstrap" ,base)
+         ("ghc-testsuite"
+          ,(origin
+             (method url-fetch)
+             (uri (string-append
+                    "https://downloads.haskell.org/~ghc/"
+                    version "/ghc-" version "-testsuite.tar.xz"))
+             (sha256
+              (base32
+               "143ifc4g3jc6s9hcry5qha913rzwg4hpsvk6pqvxk5r0qigfxjwx"))
+             (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))))
+         ("hadrian-bootstrap"
+          ,(origin
+             (method url-fetch)
+             (uri (string-append "https://downloads.haskell.org/~ghc/" version
+                                 "/hadrian-bootstrap-sources/"
+                                 "hadrian-bootstrap-sources-"
+                                 (package-version base) ".tar.gz"))
+             (sha256
+               (base32
+                 "162lbafvdamfhx1jldax3shgk8jbbqn4an97ny363lxbdjgdn708"))))
+         ,@(filter (match-lambda
+                     (("ghc-bootstrap" . _) #f)
+                     (("ghc-testsuite" . _) #f)
+                     (("hadrian-bootstrap" . _) #f)
+                     (_ #t))
+                   (package-native-inputs base))))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "GHC_PACKAGE_PATH")
+              (files (list (string-append "lib/ghc-" version)))
+              (file-pattern ".*\\.conf\\.d$")
+              (file-type 'directory)))))))
+
+;; Versions newer than ghc defined below (i.e. the compiler
+;; haskell-build-system uses) should use ghc-next as their name to
+;; ensure ghc (without version specification) and ghc-* packages are
+;; always compatible. See https://issues.guix.gnu.org/issue/47335.
+(define-public ghc ghc-9.10)
+
 ;;; haskell.scm ends here

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/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/ibus.scm

@@ -36,7 +36,6 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix gexp)
-  #:use-module (guix deprecation)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
@@ -947,42 +946,37 @@ traditional Chinese output.")
 hanja dictionary and small hangul character classification.")
     (license lgpl2.1+)))
 
-(define-public ibus-hangul
+(define-public ibus-libhangul
   (package
-    (name "ibus-hangul")
-    (version "1.5.5")
+    (name "ibus-libhangul")
+    (version "1.5.3")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/libhangul/ibus-hangul")
-             (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "https://github.com/libhangul/ibus-hangul/"
+                           "releases/download/" version
+                           "/ibus-hangul-" version ".tar.gz"))
        (sha256
-        (base32 "0wsbh6ii223wdai2qwcwy6sj5jr9zzma7511fhkfq4m2qxdhwsn7"))))
+        (base32
+         "1400ba2p34vr9q285lqvjm73f6m677cgfdymmjpiwyrjgbbiqrjy"))))
     (build-system gnu-build-system)
     (arguments
-     (list
-      #:make-flags
-      #~'("DISABLE_GUI_TESTS=ibus-hangul")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'wrap
-            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-program (string-append #$output
-                                           "/libexec/ibus-setup-hangul")
-                `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
-                `("LD_LIBRARY_PATH" ":" prefix
-                  (,(dirname (search-input-file inputs "lib/libhangul.so"))))
-                `("GI_TYPELIB_PATH" ":" prefix
-                  (,(getenv "GI_TYPELIB_PATH")))))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (wrap-program (string-append (assoc-ref outputs "out")
+                                          "/libexec/ibus-setup-hangul")
+               `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
+               `("LD_LIBRARY_PATH" ":" prefix
+                 (,(string-append (assoc-ref inputs "libhangul") "/lib")))
+               `("GI_TYPELIB_PATH" ":" prefix
+                 (,(getenv "GI_TYPELIB_PATH"))))
+             #t)))))
     (native-inputs
-     (list autoconf
-           automake
-           gettext-minimal
-           `(,glib "bin")
-           libtool
-           pkg-config))
+     `(("pkg-config" ,pkg-config)
+       ("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")))
     (inputs
      (list bash-minimal
            ibus
@@ -997,9 +991,6 @@ hanja dictionary and small hangul character classification.")
      "ibus-hangul is a Korean input method engine for IBus.")
     (license gpl2+)))
 
-;; XXX: Deprecated on 2026-05-26.
-(define-deprecated-package ibus-libhangul ibus-hangul)
-
 (define-public ibus-table
   (package
     (name "ibus-table")

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/image-viewers.scm

@@ -39,7 +39,6 @@
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
-;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -95,16 +94,13 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-xyz)
-  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages image-processing)
   #:use-module (gnu packages imagemagick)
-  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages logging)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pdf)
@@ -112,7 +108,6 @@
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages profiling)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
@@ -125,8 +120,6 @@
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages suckless)
   #:use-module (gnu packages stb)
-  #:use-module (gnu packages tbb)
-  #:use-module (gnu packages tls)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages upnp)
   #:use-module (gnu packages version-control)
@@ -1293,84 +1286,6 @@ workspaces.
 (define-deprecated-package python-ueberzug
   ueberzug)
 
-(define-public ueberzugpp
-  (package
-    (name "ueberzugpp")
-    (version "2.9.10")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-              (url "https://github.com/jstkdng/ueberzugpp")
-              (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "1jac2sca4pmcxp8xcvaxhf6j15phyc85gb5n9ymajbahnd4hbcv2"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list #:tests? #f    ; no tests
-           #:configure-flags
-           #~(list "-DENABLE_OPENCV=ON"
-                   "-DENABLE_X11=ON"
-                   "-DENABLE_WAYLAND=ON")))
-    (native-inputs
-     (list extra-cmake-modules
-           gobject-introspection
-           pkg-config))
-    (inputs
-     (list cairo
-           chafa
-           cli11
-           expat
-           fftw
-           fmt
-           imagemagick
-           imath
-           lcms
-           libexif
-           libgsf
-           librsvg
-           libsixel
-           libwebp
-           libxcb
-           matio
-           nlohmann-json
-           opencv
-           openexr
-           openssl
-           orc
-           pango
-           poppler
-           range-v3
-           spdlog
-           tbb
-           vips
-           wayland
-           wayland-protocols
-           xcb-util-image))
-    (home-page "https://github.com/jstkdng/ueberzugpp")
-    (synopsis "Drop in replacement for ueberzug written in C++")
-    (description "Überzug++ is a command line utility written in C++ which
-allows to draw images on terminals by using X11/Wayland child windows, sixels,
- kitty and iterm2.
-
-Advantages over @command{w3mimgdisplay}:
-@itemize
-@item Support for Wayland: Sway, Hyprland, niri and Wayfire
-@item No race conditions as a new window is created to display images
-@item Expose events will be processed, so images will be redrawn on switch
-workspaces
-@item Tmux support on X11, Sway and Hyprland
-@item Terminals without the @env{WINDOWID} environment variable are supported
-@item Chars are used as position - and size unit
-@item No memory leak (usage of smart pointers)
-@item A lot of image formats supported (through OpenCV and libvips).
-@item GIF and animated WEBP support on X11, Sixel, Sway and hyprland
-@item Fast image downscaling (through OpenCV and OpenCL)
-@item Cache resized images for faster viewing
-@end itemize")
-    (license license:gpl3)))
-
 (define-public vv
   (package
     (name "vv")

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/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)