gnu: packages: Update haskell packages to current Stackage

* gnu/packages/patches/ghc-chell-quickcheck-enable-qc-2.15.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/dhall.scm (...): Update Haskell packages to current Stackage. * gnu/packages/finance.scm (...): As above. * gnu/packages/haskell-apps.scm (...): As above. * gnu/packages/haskell-check.scm (...): As above. * gnu/packages/haskell-crypto.scm (...): As above. * gnu/packages/haskell-web.scm (...): As above. * gnu/packages/wm.scm (...): As above. * gnu/packages/haskell-xyz.scm (...): As above. (ghc-chell-quickcheck): Patch testsuite to work with current quickcheck. Change-Id: I8c8bea6755121706c46606a658cba8b590780fe1 FIXUP add the chell patch Change-Id: I5efc8f467efe85b038cd44b18acbb27826036484 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>
guix: import: stackage: Update default LTS version to 24.9
2026-07-11 16:54:09 +02:00 · 2026-04-15 13:17:38 +02:00 · 2026-04-15 13:14:06 +02:00 · 2026-04-15 13:14:06 +02:00 · 2026-04-15 13:14:06 +02:00 · 2026-04-15 13:14:06 +02:00
97 changed files with 9128 additions and 9920 deletions
@@ -68,7 +68,6 @@ guix/discovery\.scm                                @guix/core
 guix/docker\.scm                                   @guix/core
 guix/download\.scm                                 @guix/core
 guix/elf\.scm                                      @guix/core
-guix/fossil-download\.scm                          @guix/core
 guix/ftp-client\.scm                               @guix/core
 guix/gexp\.scm                                     @guix/core
 guix/git-authenticate\.scm                         @guix/core
@@ -485,7 +484,6 @@ gnu/services/version-control\.scm                  @guix/vcs
 gnu/tests/version-control\.scm                     @guix/vcs
 guix/build/bzr\.scm                                @guix/vcs
 guix/build/cvs\.scm                                @guix/vcs
-guix/build/fossil\.scm                             @guix/vcs
 guix/build/git\.scm                                @guix/vcs
 guix/build/hg\.scm                                 @guix/vcs
 guix/build/svn\.scm                                @guix/vcs
@@ -104,7 +104,6 @@ MODULES =					\
  guix/discovery.scm				\
  guix/android-repo-download.scm		\
  guix/bzr-download.scm            		\
-  guix/fossil-download.scm			\
  guix/git-download.scm				\
  guix/hg-download.scm				\
  guix/hash.scm					\
@@ -237,7 +236,6 @@ MODULES =					\
  guix/build/asdf-build-system.scm		\
  guix/build/bzr.scm				\
  guix/build/copy-build-system.scm		\
-  guix/build/fossil.scm				\
  guix/build/git.scm				\
  guix/build/hg.scm				\
  guix/build/glib-or-gtk-build-system.scm	\
@@ -20,9 +20,6 @@ Please send Guix bug reports to bug-guix@gnu.org.
 *** New service for Fossil SCM
 *** TeX Live updated to 2026.1

-** Programming interfaces
-*** New (guix fossil-download) module, for fetching Fossil repositories
-
 * Changes in 1.5.0 (since 1.4.0)
 ** Package management
 *** New ‘rpm’ format for the ‘guix pack’ command
@@ -8737,52 +8737,6 @@ The example below denotes a version of gnu-standards to fetch:

@end deftp

-For Fossil repositories, the module @code{(guix fossil-download)} defines
-the @code{fossil-fetch} origin method and @code{fossil-reference} data type
-for support of the Fossil @abbr{SCM, software configuration management} system.
-
-@deffn {Procedure} fossil-fetch ref hash-algo hash [name]
-Return a fixed-output derivation that fetches @var{ref}, a
-@code{<fossil-reference>} object.  The output is expected to have recursive
-hash @var{hash} of type @var{hash-algo} (a symbol).  Use @var{name} as
-the file name, or a generic name if @code{#f}.
-@end deffn
-
-@deftp {Data Type} fossil-reference
-This data type represents a Fossil reference
-for @code{fossil-fetch} to retrieve.
-
-@table @asis
-@item @code{uri} (type: string)
-The URI of a Fossil repository to clone, in one of the following forms,
-in which @code{[...]} denotes optional elements:
-
-@table @code
-@item http[s]://[userid[:password]@@]host[:port][/path]
-A HTTP/HTTPS URL.
-@item [file://]path/to/repo.fossil
-A file URI, where the path must have an extra leading @code{/}
-to use an absolute path (without the URI scheme, the repository
-is opened directly without cloning).
-@end table
-
-@item @code{check-in} (type: string)
-A @url{https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki,
-name of the check-in} to fetch, e.g.@: its canonical hexadecimal identifier,
-associated tag and/or timestamp.
-@end table
-
-The example below denotes the @code{version-3.51.1} tag
-of the SQLite repository:
-
-@lisp
-(fossil-reference
- (uri "https://sqlite.org/src")
- (check-in "version-3.51.1"))
-@end lisp
-
-@end deftp
-
@node Defining Package Variants
@section Defining Package Variants

@@ -53508,9 +53462,6 @@ Maximum time a cache entry for SSH keys is valid, in seconds.
@item @code{extra-content} (default: @code{""}) (type: raw-configuration-string)
 Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}.

-@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbols)
-List of services that should be started before this service.
-
@end table

@end deftp
@@ -565,7 +565,6 @@ challenges"))
              "guix/docker.scm"
              "guix/download.scm"
              "guix/elf.scm"
-              "guix/fossil-download.scm"
              "guix/ftp-client.scm"
              "guix/gexp.scm"
              "guix/git-authenticate.scm"
@@ -1215,7 +1214,6 @@ the \"texlive\" importer."
                      "gnu/tests/version-control.scm"
                      "guix/build/bzr.scm"
                      "guix/build/cvs.scm"
-                      "guix/build/fossil.scm"
                      "guix/build/git.scm"
                      "guix/build/hg.scm"
                      "guix/build/svn.scm")))
@@ -81,10 +81,7 @@ entry will be expired even if it has been accessed recently.")
   "Maximum time a cache entry for SSH keys is valid, in seconds.")
  (extra-content
   (raw-configuration-string "")
-   "Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}.")
-  (shepherd-requirement
-   (list-of-symbols '())
-   "List of services that should be started before this service."))
+   "Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}."))

 (define (home-gpg-agent-configuration-file config)
  "Return the @file{gpg-agent.conf} file for @var{config}."
@@ -107,7 +104,7 @@ entry will be expired even if it has been accessed recently.")
 (define (home-gpg-agent-shepherd-services config)
  "Return the possibly-empty list of Shepherd services for @var{config}."
  (match-record config <home-gpg-agent-configuration>
-    (gnupg ssh-support? shepherd-requirement)
+    (gnupg ssh-support?)
    ;; 'gpg-agent' is started on demand by GnuPG's programs, but it has to be
    ;; started explicitly when OpenSSH support is enabled (info "(gnupg) Agent
    ;; Options").
@@ -122,21 +119,15 @@ entry will be expired even if it has been accessed recently.")
                             #:socket-directory-permissions #o700))))
          (list (shepherd-service
                 (provision '(gpg-agent ssh-agent))
-                 (requirement shepherd-requirement)
                 (modules '((shepherd support)))  ;for '%user-runtime-dir'
-                 (start
-                  #~(lambda args
-                      ((make-systemd-constructor
-                        (list #$(file-append gnupg "/bin/gpg-agent")
-                              "--supervised" "--enable-ssh-support")
-                        (list #$(endpoint "ssh" "S.gpg-agent.ssh")
-                              #$(endpoint "browser" "S.gpg-agent.browser")
-                              #$(endpoint "extra" "S.gpg-agent.extra")
-                              ;; #$(endpoint "scdaemon" "S.scdaemon")
-                              #$(endpoint "std" "S.gpg-agent"))
-                        ;; Inherit graphical session environment.
-                        #:environment-variables (environ))
-                       args)))
+                 (start #~(make-systemd-constructor
+                           (list #$(file-append gnupg "/bin/gpg-agent")
+                                 "--supervised" "--enable-ssh-support")
+                           (list #$(endpoint "ssh" "S.gpg-agent.ssh")
+                                 #$(endpoint "browser" "S.gpg-agent.browser")
+                                 #$(endpoint "extra" "S.gpg-agent.extra")
+                                 ;; #$(endpoint "scdaemon" "S.scdaemon")
+                                 #$(endpoint "std" "S.gpg-agent"))))
                 (stop #~(make-systemd-destructor))
                 (documentation "Start 'gpg-agent', the GnuPG passphrase
 agent, with support for handling OpenSSH material."))))
@@ -1453,6 +1453,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		\
@@ -1698,7 +1699,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/libcss-check-format.patch		\
  %D%/packages/patches/libeb-gcc-14.patch			\
  %D%/packages/patches/libextractor-tidy-support.patch		\
-  %D%/packages/patches/libfossil-skip-amalgamation.patch	\
  %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch	\
@@ -1745,7 +1745,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/kissfft-tflite-micro.patch               \
  %D%/packages/patches/kitty-fix-wayland-protocols.patch	\
  %D%/packages/patches/kmod-module-directory.patch		\
-  %D%/packages/patches/kmscon-8-runtime-keymap-switch.patch	\
+  %D%/packages/patches/kmscon-runtime-keymap-switch.patch	\
  %D%/packages/patches/knot-remove-runtime-deps.patch		\
  %D%/packages/patches/kobodeluxe-paths.patch			\
  %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
@@ -2258,7 +2258,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-werkzeug-tests.patch		\
  %D%/packages/patches/qdigidoc-bundle-config-files.patch       \
  %D%/packages/patches/qdigidoc-bundle-tsl-files.patch          \
-  %D%/packages/patches/qdigidoc-fix-icon.patch                  \
  %D%/packages/patches/qemu-build-info-manual.patch		\
  %D%/packages/patches/qemu-fix-agent-paths.patch 		\
  %D%/packages/patches/qemu-fix-test-virtio-version.patch       \
@@ -765,7 +765,7 @@ file system.")
       (sha256
        (base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
    (build-system pyproject-build-system)
-    (propagated-inputs (list python-requests python-argcomplete python-urllib3
+    (inputs (list python-requests python-argcomplete python-urllib3
                  python-looseversion gnupg))
    (native-inputs (list python-setuptools python-wheel python-requests-cache
                         python-defusedxml))
@@ -773,7 +773,8 @@ file system.")
     (list $SSL_CERT_FILE))
    (arguments
     (list
-      #:test-backend #~'unittest
+      #:test-flags
+      #~(list "-k" "test_*")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-tests
@@ -792,7 +793,11 @@ file system.")
            (lambda _
              (substitute* "sdkmanager.py"
                (("gpgv")
-                 (string-append #$(this-package-input "gnupg") "/bin/gpgv"))))))))
+                 (string-append #$(this-package-input "gnupg") "/bin/gpgv")))))
+          (replace 'check
+            (lambda* (#:key tests? test-flags #:allow-other-keys)
+              (when tests?
+                (apply invoke "python" "-m" "unittest" test-flags)))))))
    (home-page "https://gitlab.com/fdroid/sdkmanager")
    (synopsis "Replacement for Android sdkmanager written in Python")
    (description
@@ -1177,16 +1182,14 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
 (define-public fdroidserver
  (package
    (name "fdroidserver")
-    (version "2.4.3")
+    (version "2.4.2")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://gitlab.com/fdroid/fdroidserver")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "fdroidserver" version))
       (sha256
-        (base32 "1745fqxr2qfrls4wr6x9w1262b9pxmw9yvzd9b71ya2qmj74q17n"))))
+        (base32
+         "06xybginrwi5c7bw000wz5s5hzi0aqrxskzwh8qc6wv463w2djax"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1197,17 +1200,22 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
            (lambda _
              (setenv "HOME" "/tmp"))))))
    (propagated-inputs
-     (list python-platformdirs
-           python-androguard
+     (list python-androguard
           python-apache-libcloud
+           python-argcomplete
           python-asn1crypto
           python-clint
           python-defusedxml
+           python-docker
           python-gitpython
+           python-mwclient
           python-oscrypto
           python-paramiko
           python-pillow
+           python-platformdirs
           python-puremagic
+           python-pyasn1
+           python-pyasn1-modules
           python-pyyaml
           python-qrcode
           python-requests
@@ -341,7 +341,7 @@ runtime.")
       ("java-jgit" ,java-jgit-4.2)
       ("axoloti-runtime" ,axoloti-runtime)))
    (native-inputs
-     (list ant/java7 zip ; for repacking the jar
+     (list ant zip ; for repacking the jar
           unzip))
    (description
     "The Axoloti patcher offers a “patcher” environment similar to Pure Data
@@ -647,7 +647,7 @@ This package provides the runtime.")
       ("java-slf4j-api" ,java-slf4j-api)
       ("ksoloti-runtime" ,ksoloti-runtime)))
    (native-inputs
-     (list ant/java7 zip                      ;for repacking the jar
+     (list ant zip                      ;for repacking the jar
           unzip))
    (description
     "Ksoloti is an environment for generating and processing digital audio.
@@ -9283,7 +9283,7 @@ VCF.")
       ;; [testng] Exception in thread "main" java.lang.NoClassDefFoundError: com/beust/jcommander/ParameterException
       #:tests? #f
       #:jdk ,icedtea-8
-       #:ant ,ant
+       #:ant ,ant/java8
       ;; This is only used for tests.
       #:make-flags
       (list "-Dsamjdk.intel_deflater_so_path=lib/jni/libIntelDeflater.so")
@@ -9353,10 +9353,11 @@ VCF.")
     (list java-snappy-1
           java-commons-jexl-2
           java-cofoja
-           ant                          ;for bzip2 support at runtime
+           ant/java8                    ;for bzip2 support at runtime
           zlib))
    (native-inputs
     `(("ant-apache-bcel" ,ant-apache-bcel)
+       ("ant-junit" ,ant-junit)
       ("java-testng" ,java-testng)
       ("java-commons-bcel" ,java-commons-bcel)
       ("java-jcommander" ,java-jcommander)
@@ -69,7 +69,6 @@
 ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
 ;;; Copyright © 2025 bdunahu <bdunahu@operationnull.com>
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
-;;; Copyright © 2026 Peter Polidoro <peter@polidoro.io>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3097,64 +3096,6 @@ Driver.")
   ;; COPYING contains copy of lgpl2.1 - but copyright notices just say "LGPL"
   (home-page "https://www.unixodbc.org")))

-(define-public sqliteodbc
-  (package
-    (name "sqliteodbc")
-    (version "0.99991")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://www.ch-werner.de/sqliteodbc/"
-                                  name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0p4avhqxnd2l49g3vpzwrmdi8wxyqzy0vswalaagmqfdsfwav52d"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f                      ; no check target
-      #:configure-flags
-      #~(list "--disable-static"
-              (string-append "--with-sqlite3=" #$(this-package-input "sqlite"))
-              (string-append "--with-odbc=" #$(this-package-input "unixodbc")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'create-lib-directory
-            (lambda _
-              (mkdir-p (string-append #$output "/lib"))))
-          (add-after 'install 'remove-extra-sqlite-extensions
-            (lambda _
-              ;; Keep this package focused on the ODBC driver itself.
-              (for-each delete-file
-                        (find-files (string-append #$output "/lib")
-                                    "^libsqlite3_mod_.*\\.(la|so)$"))))
-          (add-after 'install 'install-odbcinst.ini
-            (lambda _
-              (let ((dir (string-append #$output "/share/sqliteodbc")))
-                (mkdir-p dir)
-                (call-with-output-file (string-append dir "/odbcinst.ini")
-                  (lambda (port)
-                    (display
-                     (string-append
-                      "[SQLite3]\n"
-                      "Description = SQLite3 ODBC Driver\n"
-                      "Driver      = " #$output "/lib/libsqlite3odbc.so\n"
-                      "Setup       = " #$output "/lib/libsqlite3odbc.so\n"
-                      "Threading   = 2\n")
-                     port)))))))))
-    (native-search-paths
-     (list (search-path-specification
-            (variable "ODBCSYSINI")
-            (files '("share/sqliteodbc"))
-            (separator #f))))
-    (inputs (list sqlite unixodbc))
-    (home-page "http://www.ch-werner.de/sqliteodbc/")
-    (synopsis "ODBC driver for SQLite")
-    (description
-     "SQLiteODBC provides an ODBC driver for SQLite 3 databases.  It installs
-the shared library and a driver registration file so applications using
-unixODBC can resolve the @code{SQLite3} driver name from a Guix profile.")
-    (license license:tcl/tk)))
-
 (define-public nanodbc
  (package
    (name "nanodbc")
@@ -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
@@ -77,8 +77,6 @@
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages protobuf)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages ragel)
  #:use-module (gnu packages serialization)
@@ -95,8 +93,6 @@
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
  #:use-module (guix download)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
@@ -307,58 +303,6 @@ protocol.")
      (home-page "https://github.com/earlchew/cloudflare-cli")
      (license license:expat))))

-(define-public ddclient
-  (package
-    (name "ddclient")
-    (version "4.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ddclient/ddclient")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0sz4f7qx4yjg6q6ybhzilb7f0kshz46c54y3i4hq2nww2bhkc8a4"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'bootstrap 'patch-ddclient.in-shebang
-            (lambda _
-              ;; This is run in the bootstrap phase, so patch before
-              (patch-shebang "ddclient.in")))
-          (add-after 'install 'wrap-program
-            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-program (string-append #$output "/bin/ddclient")
-                `("PERL5LIB" ":" prefix
-                  ,(map (lambda (input-name)
-                          (string-append (assoc-ref inputs input-name)
-                                         "/lib/perl5/site_perl"))
-                        '("perl-json")))))))))
-    (native-inputs
-     (list autoconf
-           automake
-           perl-http-daemon
-           perl-plack
-           perl-test-mockmodule
-           perl-test-tcp
-           perl-test-warnings))
-    (inputs
-     (list curl
-           perl
-           perl-json
-           bash-minimal))
-    (home-page "https://github.com/ddclient/ddclient")
-    (synopsis "Dynamic DNS update client")
-    (description
-     "ddclient is used to update dynamic DNS entries for accounts on many
-dynamic DNS services.  It supports a wide range of routers and protocols,
-including Cloudflare, Namecheap, DynDNS, FreeDNS, Google Domains, and many
-more.")
-    (license license:gpl2+)))
-
 (define-public ldns
  (package
    (name "ldns")
@@ -554,39 +498,6 @@ and BOOTP/TFTP for network booting of diskless machines.")
    ;; Source files only say GPL2 and GPL3 are allowed.
    (license (list license:gpl2 license:gpl3))))

-(define-public dnsupdate
-  (package
-    (name "dnsupdate")
-    (version "0.4.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/lopsided98/dnsupdate")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0bp6mm0yhg4hs698xdmvcfad4jqf5rgb1cab88pfzyx9w52x0ag6"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:test-backend #~'unittest
-           #:test-flags #~'("discover" "-p" "*_test.py")))
-    (native-inputs
-     (list python-setuptools))
-    (propagated-inputs
-     (list python-beautifulsoup4
-           python-netifaces
-           python-pyyaml
-           python-requests))
-    (home-page "https://github.com/lopsided98/dnsupdate")
-    (synopsis "Modern and flexible dynamic DNS client")
-    (description
-     "Dnsupdate is a dynamic DNS client that provides support for multiple DNS
-services, including Afraid.org FreeDNS, Cloudflare, IETF standard DNS
-updates (nsupdate), and custom HTTP-based services.  It uses YAML
-configuration files and supports multiple address detection methods.")
-    (license license:gpl3+)))
-
 ;; 'bind' is the name of a built-in Guile procedure, which is why we choose a
 ;; different name here.
 (define-public isc-bind
@@ -1069,7 +1069,7 @@ characterization result in a liberty library file.")
 (define-public kicad
  (package
    (name "kicad")
-    (version "10.0.1")
+    (version "10.0.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1077,7 +1077,7 @@ characterization result in a liberty library file.")
                    (commit version)))
              (sha256
               (base32
-                "1mnlv8fyz03pfg8pkqwdl5gjz6vsk98c6414lf3wkvrkb85ljaav"))
+                "1470x1276yvd8li3w25zjg73fkpl2qp4dsx7adanafq5c4l47rmc"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -1185,9 +1185,7 @@ characterization result in a liberty library file.")
     "Kicad is a program for the formation of printed circuit
 boards and electrical circuits.  The software has a number of programs that
 perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
-electrical diagrams), gerbview (viewing Gerber files) and others.  To use
-SQLite-backed database libraries, install the optional @code{sqliteodbc}
-package.")
+electrical diagrams), gerbview (viewing Gerber files) and others.")
    (license license:gpl3+)))

 (define-public kicad-doc
@@ -1202,7 +1200,7 @@ package.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1c0vn13rp0z12rlqhl321pk2gj9577dyky6xj3i6hb040i3v7zrr"))))
+                "1k0ayxsy0nnv9qxkii9yrxs7jx9y3wfjpsv5yl9wql3vdg3qay69"))))
    (build-system cmake-build-system)
    (arguments
     `(#:configure-flags (list "-DBUILD_FORMATS=html"
@@ -1234,7 +1232,7 @@ package.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0iz4lb33wdsw4f82a0ln8ycgaf39gjws03mvl2j1q9npwj6xl1cm"))))
+                "0khfnln0f2zsz5hy31nw2rr0nflb2z3s9n9f7g41g03m9l3s43v2"))))
    (build-system cmake-build-system)
    (native-inputs (list python-wrapper))
    (arguments
@@ -1264,7 +1262,7 @@ libraries.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0jqgyi1yb2zc6w56ba7xama0wnhrqwbbnf2fqvr47xihvdcvs87v"))))
+                "0ymmd1rzrczpvcqzw1mld9x8xhbka0vvjy3kdqwysg4ri97f5wrm"))))
    (synopsis "Official KiCad footprint libraries")
    (description "This package contains the official KiCad footprint libraries.")))

@@ -1281,7 +1279,7 @@ libraries.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0jr70ry6inzc2fy3s300z0zlmihbq95ba1zckyd1wwbpplaj1gbl"))))
+                "0k91iw661fpzb7saryjxdcdvk1kis7dhbcpzp7xzjk84i4jvxrp5"))))
    (synopsis "Official KiCad 3D model libraries")
    (description "This package contains the official KiCad 3D model libraries.")))

@@ -164,8 +164,7 @@ Mix.CLI.main()"
                       '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
                   programs))))))))
    (outputs '("out" "src"))
-    (inputs (list bash-minimal erlang rebar3))
-    (native-inputs (list git-minimal))
+    (inputs (list bash-minimal erlang rebar3 git))
    (native-search-paths
     (list (search-path-specification
            (variable "GUIX_ELIXIR_LIBS")
@@ -264,7 +264,6 @@
  #:use-module (gnu packages lisp-xyz)
  #:use-module (gnu packages lsof)
  #:use-module (gnu packages lua)
-  #:use-module (gnu packages machine-learning)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages music)
  #:use-module (gnu packages version-control)
@@ -785,7 +784,7 @@ reading the extensive documentation about BookmarkPlus on the Emacs Wiki.")
  (package
    (name "emacs-bqn-mode")
    ;; Upstream releases are tagged by date.
-    (version "2026-02-08")
+    (version "2025-07-06")
    (source
     (origin
       (method git-fetch)
@@ -794,7 +793,7 @@ reading the extensive documentation about BookmarkPlus on the Emacs Wiki.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1m9l4if3a9i6r76v370gh6azgj2lwqcnpavfv2bkvm9ad56f3pa8"))))
+        (base32 "1b25k66nn4qa4ryhm8mzc53qvsvhgjzdngisw28cpdh109627iz3"))))
    (build-system emacs-build-system)
    (arguments
     (list #:tests? #f)) ;No tests found in source.
@@ -4329,39 +4328,25 @@ perform static analysis of Perl code.")
    (license license:gpl3+)))

 (define-public emacs-flymake-flycheck
-  (let ((commit "cbc0fc81bf369b36fe29a49d9e24708027f6da38")
-        (revision "0"))
-    (package
-      (name "emacs-flymake-flycheck")
-      (version (git-version "0.2" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/purcell/flymake-flycheck")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0fda1n8hhklbq6p1s2dlvgc9xd0qy7qzb8yvxq89idx1irjx0785"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ; There is only a lint-check
-      (propagated-inputs
-       (list emacs-flycheck))
-      (home-page "https://github.com/purcell/flymake-flycheck")
-      (synopsis "Use Flycheck checkers as Flymake backends")
-      (description
-       "This package provides support for running any Flycheck checker as a
+  (package
+    (name "emacs-flymake-flycheck")
+    (version "20210404.2128")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://melpa.org/packages/flymake-flycheck-"
+                           version ".el"))
+       (sha256
+        (base32 "1m59ahd5gjlfwf328labwdlpcxh8ywywkwgfrlsy5jyxfc9ss4nv"))))
+    (build-system emacs-build-system)
+    (propagated-inputs (list emacs-flycheck))
+    (home-page "https://github.com/purcell/flymake-flycheck")
+    (synopsis "Use Flycheck checkers as Flymake backends")
+    (description
+     "This package provides support for running any Flycheck checker as a
 Flymake diagnostic backend.  The effect is that Flymake will control when the
 checker runs, and Flymake will receive its errors.")
-      (license license:gpl3+))))
-
-(define-public emacs-flymake-flycheck-superseded-version
-  (package
-    (inherit emacs-flymake-flycheck)
-    (version "20210404.2128")
-    (properties (list (cons 'superseded emacs-flymake-flycheck)))))
+    (license license:gpl3+)))

 (define-public emacs-flymake-quickdef
  ;; This particular commit includes bug fixes on top of 1.0.0 release.
@@ -8493,36 +8478,23 @@ them whenever another command is invoked.")
    (license license:gpl3+)))

 (define-public emacs-keyfreq
-  (let ((commit "c6955162307f37c2ac631d9daf118781009f8dda")
-        (revision "0"))
-    (package
-      (name "emacs-keyfreq")
-      (version (git-version "1.8" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/dacap/keyfreq")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "18iw0jwr9hmxv5vikqf28sknml0k14rvddp80s2cm6bglaz4sdc3"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ; No tests
-      (home-page "https://github.com/dacap/keyfreq")
-      (synopsis "Track Emacs command frequencies")
-      (description
-       "@code{emacs-keyfeq} tracks and shows how many times you used a command.")
-      (license license:gpl3+))))
-
-(define-public emacs-keyfreq-superseded-version
  (package
-    (inherit emacs-keyfreq)
+    (name "emacs-keyfreq")
    (version "20160516.716")
-    (properties (list (cons 'superseded emacs-keyfreq)))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://melpa.org/packages/keyfreq-"
+                           version ".el"))
+       (sha256
+        (base32
+         "008hd7d06qskc3mx0bbdgpgy2pwxr8185fzlyqf9qjg49y74p6g8"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/dacap/keyfreq")
+    (synopsis "Track Emacs command frequencies")
+    (description "@code{emacs-keyfeq} tracks and shows how many times you used
+a command.")
+    (license license:gpl3+)))

 (define-public emacs-khalel
  (package
@@ -13834,28 +13806,6 @@ structure as input representing the HTML tree you want to generate and
 generates it as a string.  Please see the homepage for usage examples.")
      (license license:gpl3+))))

-(define-public emacs-jag
-  (package
-    (name "emacs-jag")
-    (version "0.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/martianh/jag.el")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0hfv3hf0p7y5imrzb6rv90cjxd22ih2n529ggc7fwgd1n40zvgj8"))))
-    (build-system emacs-build-system)
-    (propagated-inputs (list emacs-string-inflection emacs-swagg))
-    (home-page "https://codeberg.org/martianh/jag.el")
-    (synopsis "Generate API client libraries in elisp using swagg.el")
-    (description
-     "This package provides utilities to use swagg.el to generate API client
-libraries from Swagger specs.")
-    (license license:gpl3+)))
-
 (define-public emacs-jedi
  (package
    (name "emacs-jedi")
@@ -15280,39 +15230,25 @@ markdown features.")
    (license license:gpl3)))

 (define-public emacs-2048-game
-  ;; No tagged releases. Version comes from 2048-game.el
-  (let ((changeset "0e7210d05e6faf53c7bdc8be2381dc0d4c8b19f3")
-        (revision "0"))
-    (package
-      (name "emacs-2048-game")
-      (version (hg-version "2023.8.8.1" revision changeset))
-      (source
-       (origin
-         (method hg-fetch)
-         (uri (hg-reference
-                (url "https://hg.sr.ht/~zck/game-2048")
-                (changeset changeset)))
-         (file-name (hg-file-name name version))
-         (sha256
-          (base32
-           "01xzmi2613d4zwnrh9iywipxx8ml76yqik90mx4mpyar19a6ypi8"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ; No tests
-      (home-page "https://hg.sr.ht/~zck/game-2048")
-      (synopsis "Implementation of the game 2048 in Emacs Lisp")
-      (description
-       "This program is an implementation of 2048 for Emacs.
+  (package
+    (name "emacs-2048-game")
+    (version "20151026.1233")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://melpa.org/packages/2048-game-"
+                           version ".el"))
+       (sha256
+        (base32
+         "0gy2pvz79whpavp4jmz8h9krzn7brmvv3diixi1d4w51pcdvaldd"))))
+    (build-system emacs-build-system)
+    (home-page "https://hg.sr.ht/~zck/game-2048")
+    (synopsis "Implementation of the game 2048 in Emacs Lisp")
+    (description
+     "This program is an implementation of 2048 for Emacs.
 The goal of this game is to create a tile with value 2048.  The size of the
 board and goal value can be customized.")
-      (license license:gpl3+))))
-
-(define-public emacs-2048-game-superseded-version
-  (package
-    (inherit emacs-2048-game)
-    (version "20151026.1233")
-    (properties (list (cons 'superseded emacs-2048-game)))))
+    (license license:gpl3+)))

 (define-public emacs-chess
  (package
@@ -16880,32 +16816,6 @@ The following completions are currently available:
@end itemize")
    (license license:gpl3+)))

-(define-public emacs-swagg
-  (package
-    (name "emacs-swagg")
-    (version "0.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/isamert/swagg.el")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1xlknc7j5vz1sv5gwr8v6vyfginflsksjyzx6qz1svibkdwp223g"))))
-    (build-system emacs-build-system)
-    (propagated-inputs (list emacs-compat
-                             emacs-dash
-                             emacs-s
-                             emacs-request
-                             emacs-yaml))
-    (home-page "https://github.com/isamert/swagg.el")
-    (synopsis "UI to interact with OpenAPI definations")
-    (description
-     "This package provides a practical Emacs UI for OpenAPI definitions.  It
-lets you fetch and interact with OpenAPI (formerly Swagger) definitions.")
-    (license license:gpl3+)))
-
 (define-public emacs-sway
  (let ((commit "84eae5e16a643eb00b0a422ded751cceb17cc8f0")
        (revision "0"))
@@ -24670,13 +24580,6 @@ Meow’s motions.")
      #:tests? #f                       ; no test suite
      #:phases
      #~(modify-phases %standard-phases
-          (add-before 'patch-el-files 'patch-xauth-path
-            ;; Uses xauth directly at runtime to authenticate with the X server.
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "xcb.el"
-                (("xauth list")
-                 (string-append (search-input-file inputs "/bin/xauth")
-                                " list")))))
          (add-after 'expand-load-path 'regenerate-el-files
            (lambda* (#:key inputs native-inputs #:allow-other-keys)
              (substitute* "xelb-gen"
@@ -24684,7 +24587,6 @@ Meow’s motions.")
              (invoke "make"
                      (format #f "PROTO_PATH=~a/share/xcb"
                              #$(this-package-native-input "xcb-proto"))))))))
-    (inputs (list xauth))
    (native-inputs (list xcb-proto))
    (propagated-inputs (list emacs-compat))
    (home-page "https://github.com/emacs-exwm/xelb")
@@ -25792,52 +25694,6 @@ available key bindings that follow C-x (or as many as space allows given your
 settings).")
    (license license:gpl3+)))

-(define-public emacs-whisper-el
-  (let ((commit "fd9bf5787a99dd31a4bdf54d2bd9821aacf84e93")
-        (revision "0"))
-    (package
-      (name "emacs-whisper-el")
-      (version "0.4.7")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/natrys/whisper.el")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "0za55s117v7sc7cj4xlxxhkaamjlggs1g319n7fz54saa2wzmdj5"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f                     ;no tests
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'set-external-programs
-              (lambda* (#:key inputs #:allow-other-keys)
-                (substitute* "whisper.el"
-                  (("\\(executable-find \"ffmpeg\"\\)")
-                   "t")
-                  (("\"ffmpeg\"")
-                   (string-append "\"" #$(this-package-input "ffmpeg")
-                                  "/bin/ffmpeg\""))
-                  ((",\\(whisper--find-whispercpp-main\\)")
-                   (string-append "\"" #$(this-package-input "whisper-cpp")
-                                  "/bin/whisper-cli\"")))
-                (emacs-substitute-variables "whisper.el"
-                  ("whisper-install-whispercpp" 'nil)))))))
-      (inputs
-       (list ffmpeg whisper-cpp))
-      (home-page "https://github.com/natrys/whisper.el")
-      (synopsis "Speech to text interface for Emacs")
-      (description
-       "@code{emacs-whisper-el} captures audio with an input device, and
-transcribes text inserted into current Emacs buffer, optionally after
-translating to English from your local language.  Transcription uses the
-C/C++ port whisper.cpp for inference.")
-      (license license:gpl3+))))
-
 ;; Tagged release upstream is from before the package was orphaned.
 ;; The base version is extracted from the "Version" keyword in the main file
 ;; with "-git" suffix removed.
@@ -35556,199 +35412,12 @@ files are easily readable and they work nicely with version control systems.")
      (build-system emacs-build-system)
      (arguments
       (list #:include #~(cons "^data\\/" %default-include)
-             #:tests? #f              ; no tests
-             #:phases
-             #~(modify-phases %standard-phases
-                 ;; The nerd-icons-install-fonts function would otherwise
-                 ;; download fonts from the network.  Replace it with a stub
-                 ;; that instructs the user to install the font via Guix.
-                 (add-after 'unpack 'disable-font-installer
-                   (lambda _
-                     (emacs-batch-edit-file "nerd-icons.el"
-                       '(progn
-                         (search-forward "(defun nerd-icons-install-fonts")
-                         (beginning-of-line)
-                         (kill-sexp)
-                         (insert "\
-(defun nerd-icons-install-fonts (&optional pfx)
-  (interactive \"P\")
-  (message \"To use nerd-icons fonts, install `font-nerd-symbols' using
-`guix package -i font-nerd-symbols' or add it to your manifest or home config.
-Remember, that you may have to run `fc-cache -rv' to refresh the font cache.\
-\"))")
-                         (basic-save-buffer))))))))
+             #:tests? #f))              ; no tests
      (synopsis "Library for easily using nerd font icons inside Emacs")
      (description "Nerd-icons an alternative to all-the-icons.  It works on both
 GUI and terminal, and requires a nerd font installed on your system.")
      (license license:gpl3+))))

-(define-public emacs-nerd-icons-dired
-  ;; No tags provided upstream
-  (let ((commit "adf9a2bb5f3f13be7a676923639337f3fcc5d8c3")
-        (revision "0"))
-    (package
-      (name "emacs-nerd-icons-dired")
-      (version (git-version "0.0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/rainstormstudio/nerd-icons-dired")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0x1xmwlfjgbk5kk4bxvgz4ykwwgiwmdbzhgsw49kpzz678a3qzrp"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ;no tests
-      (propagated-inputs (list emacs-nerd-icons))
-      (home-page "https://github.com/rainstormstudio/nerd-icons-dired")
-      (synopsis "Icons for Dired via Nerd Icons")
-      (description
-       "This package adds icons to Dired, using the @code{nerd-icons} package.")
-      (license license:gpl3+))))
-
-(define-public emacs-nerd-icons-ivy-rich
-  ;; Tagged release is not up-to-date, according to the "Version:" keyword in
-  ;; main file.
-  (let ((commit "5006f91b49e86e232cdc1a628501b76124c41dac")
-        (revision "0"))
-    (package
-      (name "emacs-nerd-icons-ivy-rich")
-      (version (git-version "1.0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/seagle0128/nerd-icons-ivy-rich")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0m62l4cl9j3ssd25rz40vgrv99bmwn6l4ig2sf8zzi0fpzm8axgh"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ;tests require Cask
-      (propagated-inputs
-       (list emacs-ivy-rich
-             emacs-nerd-icons))
-      (home-page "https://github.com/seagle0128/nerd-icons-ivy-rich")
-      (synopsis "Icons for Ivy via Nerd Icons")
-      (description
-       "This package adds icons to Ivy, using the @code{ivy-rich} and
-@code{nerd-icons} packages.")
-      (license license:gpl3+))))
-
-(define-public emacs-nerd-icons-ibuffer
-  (package
-    (name "emacs-nerd-icons-ibuffer")
-    (version "1.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/seagle0128/nerd-icons-ibuffer")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1wj6kcgvh700maj9i5pmgzc48lbj0dbxx849a8w519m4anr7b23s"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:tests? #f))                   ;tests require Cask
-    (propagated-inputs
-     (list emacs-nerd-icons))
-    (home-page "https://github.com/seagle0128/nerd-icons-ibuffer")
-    (synopsis "Icons for Ibuffer via Nerd Icons")
-    (description
-     "This package adds icons to ibuffer in Emacs, using the @code{nerd-icons}
-package.")
-    (license license:gpl3+)))
-
-(define-public emacs-nerd-icons-completion
-  ;; No tags provided upstream
-  (let ((commit "63a6b3f1eb98bb381c86a1658ac401c8967079b8")
-        (revision "0"))
-    (package
-      (name "emacs-nerd-icons-completion")
-      (version (git-version "0.0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/rainstormstudio/nerd-icons-completion")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "08p361rh5mv3ng10av1381kzl9s4msdjyca96hsgsh05qwq5pdrf"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ;no tests
-      (propagated-inputs (list emacs-nerd-icons))
-      (home-page "https://github.com/rainstormstudio/nerd-icons-completion")
-      (synopsis "Icons for Emacs minibuffer completion via Nerd Icons")
-      (description
-       "This package adds icons to minibuffer completion in Emacs, using the
-@code{nerd-icons} package.  It supports @code{vertico} and @code{marginalia}.")
-      (license license:gpl3+))))
-
-(define-public emacs-nerd-icons-corfu
-  (package
-    (name "emacs-nerd-icons-corfu")
-    (version "1.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/LuigiPiucco/nerd-icons-corfu")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "036p45wqwrqhn5xv5sn3gsm2mb79gj6fk24zpkfa7wrv45qqgb21"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:tests? #f))                   ;no tests
-    (propagated-inputs
-     (list emacs-corfu
-           emacs-nerd-icons))
-    (home-page "https://github.com/LuigiPiucco/nerd-icons-corfu")
-    (synopsis "Icons for Corfu via Nerd Icons")
-    (description
-     "This package adds icons to @code{corfu}, using the @code{nerd-icons}
-package.")
-    (license license:gpl3+)))
-
-(define-public emacs-nerd-icons-mode-line
-  ;; No tags provided upstream
-  (let ((commit "23eca8e16799524889d661f4140355e81b8f929c")
-        (revision "0"))
-    (package
-      (name "emacs-nerd-icons-mode-line")
-      (version (git-version "0.0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/grolongo/nerd-icons-mode-line")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0l2bg22cllab9wz5wxd6zhrywavqrlvv1a6y49ij63qhlsfncy6s"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ;no tests
-      (propagated-inputs (list emacs-nerd-icons))
-      (home-page "https://github.com/grolongo/nerd-icons-mode-line")
-      (synopsis "Icons for the Emacs modeline via Nerd Icons")
-      (description
-       "This package adds icons to the modeline in Emacs, using the
-@code{nerd-icons} package.")
-      (license license:gpl3+))))
-
 (define-public emacs-all-the-icons
  ;; The latest release was on 3 June 2021.
  (let ((commit "4778632b29c8c8d2b7cd9ce69535d0be01d846f9")
@@ -41420,7 +41089,7 @@ time.")
 (define-public emacs-mastodon
  (package
    (name "emacs-mastodon")
-    (version "2.0.16")
+    (version "2.0.12")
    (source
     (origin
       (method git-fetch)
@@ -41429,7 +41098,7 @@ time.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1z8qwnc01d9hx5m1xj3acpdzllfh4rxmypzcr3jl4ipp6dybzbx6"))))
+        (base32 "0q02v1vizzj1r35b7b6cw185jjibhc6izj9ih4sm6c83l9yb99yh"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -41542,17 +41211,7 @@ Lisp's (relatively new) EIEIO object oriented libraries.")
       (sha256
        (base32 "1y3k82q5iii7ddm6yj7397x2jscbcnvapd04zc5wjkqdr50cay3l"))))
    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:test-command #~(list "make" "tests")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'remove-cask
-            (lambda _
-              (substitute* "Makefile"
-                (("cask ") "")))))))
-    (native-inputs
-     (list emacs-el-mock emacs-exemplify-ert emacs-exemplify-eval))
+    (arguments (list #:tests? #f))      ;depends on exemplify-ert
    (propagated-inputs (list emacs-fedi emacs-magit emacs-tp emacs-transient))
    (home-page "https://codeberg.org/martianh/fj.el")
    (synopsis "Client for Forgejo instances")
@@ -45245,57 +44904,6 @@ Features:
@end itemize\n")
    (license license:gpl3+)))

-(define-public emacs-exemplify-ert
-  (package
-    (name "emacs-exemplify-ert")
-    (version "0.6.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~flandrew/exemplify-ert")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0y98pf3hq595h7vkqs1rrwhdsizi22y32mv345drvrc6xysyb7hr"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:test-command #~(list "emacs" "-Q" "--batch"
-                             "-l" "dev/examples.el"
-                             "-f" "ert-run-tests-batch-and-exit")))
-    (propagated-inputs (list emacs-dash emacs-f emacs-s))
-    (home-page "https://git.sr.ht/~flandrew/exemplify-ert")
-    (synopsis "Emacs library to implement regression tests")
-    (description
-     "This Emacs package is an extension to @code{ert}.  It aims at writing
-test cases in a simplified form.")
-    (license license:gpl3+)))
-
-(define-public emacs-exemplify-eval
-  (package
-    (name "emacs-exemplify-eval")
-    (version "0.3.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~flandrew/exemplify-eval")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0f2rfgjcmpw45y0ayx8ww9d9q86y0jwkb46ixp1qd7782qxpa5lg"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list #:tests? #f))                ;no tests
-    (home-page "https://git.sr.ht/~flandrew/exemplify-eval")
-    (synopsis "Create arrowified examples from sexps")
-    (description
-     "This Emacs package is an extension to @code{ert}, and creates
-@code{emacs-exemplify-ert}–like examples.  It aims at writing test cases in a
-simplified form.")
-    (license license:gpl3+)))
-
 (define-public emacs-pcmpl-args
  (package
    (name "emacs-pcmpl-args")
@@ -2730,7 +2730,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
 (define-public freecad
  (package
    (name "freecad")
-    (version "1.1.1")
+    (version "1.1.0")
    (source
     (origin
       (method git-fetch)
@@ -2740,7 +2740,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
             (recursive? #t)))          ;needed for the AddonManager
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05dx7ifx33705mxb0vc82j0mzzkazakgadfgq5bws30qrxp49xgg"))
+        (base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
       (snippet
        #~(begin
            (use-modules (guix build utils))
@@ -148,11 +148,6 @@ client.")
     (list (search-path-specification
            (variable "FCITX_ADDON_DIRS")
            (files '("lib/fcitx5")))
-           (search-path-specification
-            (variable "GUIX_GTK2_IM_MODULE_FILE")
-            (file-type 'regular)
-            (separator #f)
-            (files '("lib/gtk-2.0/2.10.0/immodules-gtk2.cache")))
           (search-path-specification
            (variable "GUIX_GTK3_IM_MODULE_FILE")
            (file-type 'regular)
@@ -323,37 +323,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
@@ -384,8 +388,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")))))))))
@@ -2308,13 +2312,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
@@ -2322,7 +2326,6 @@ textual ledgers to Beancount files.")
                  ghc-base64
                  ghc-blaze-html
                  ghc-blaze-markup
-                  ghc-breakpoint
                  ghc-case-insensitive
                  ghc-clientsession
                  ghc-cmdargs
@@ -2330,6 +2333,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
@@ -2339,6 +2344,7 @@ textual ledgers to Beancount files.")
                  ghc-http-types
                  ghc-megaparsec
                  ghc-network
+                  ghc-safe
                  ghc-shakespeare
                  ghc-unix-compat
                  ghc-unordered-containers
@@ -5559,39 +5559,6 @@ technical and idiosyncratic feel—perfect for headers and pull-quotes.  Made to
 work well together with Mona Sans.")
    (license license:silofl1.1)))

-(define-public font-open-sans
-  (package
-    (name "font-open-sans")
-    (version "3.003")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/googlefonts/opensans")
-             (commit "bd7e37632246368c60fdcbd374dbf9bad11969b6")))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1mlnybaci1cr8z5xzxm7l2xpwfq27x9hqv649hc2ni1cjsyhpjp8"))))
-    (build-system font-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              ;; Install the variable fonts only.
-              (let ((%install (assoc-ref %standard-phases 'install)))
-                (with-directory-excursion "fonts/variable"
-                  (%install #:outputs outputs))))))))
-    (home-page "https://github.com/googlefonts/opensans")
-    (synopsis "Humanist sans-serif typeface by Steve Matteson")
-    (description
-     "Open Sans is an open source humanist sans-serif typeface
-that was designed by Steve Matteson under commission from Google.  It was
-released in 2011 and is based on his earlier design called Droid Sans, which
-was specifically created for Android mobile devices but with slight
-modifications to its width.")
-    (license license:silofl1.1)))

 (define-public font-peppercarrot
  (package
@@ -13508,8 +13508,8 @@ rules to solve permissions issues.")

 (define-public steam-devices-udev-rules
  ;; Last release from 2019-04-10
-  (let ((commit "7dde9ecb3c386363ecd9bd0a3b77e4756d200704")
-        (revision "2"))
+  (let ((commit "13443480a64fe8f10676606bd57da6de89f8ccb1")
+        (revision "1"))
    (package
      (name "steam-devices-udev-rules")
      (version (git-version "1.0.0.61" revision commit))
@@ -13521,7 +13521,7 @@ rules to solve permissions issues.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "0w0xkgi9fpvdbpl57f8fy2nwy2icm6iag39b8ifpkijlxgclx1p3"))))
+                  "0i086gmnk93q76sw1laa9br6b7zj2r6nrrw7d64y4q9wcrlxw2bi"))))
      (build-system copy-build-system)
      (arguments
       '(#:install-plan '(("./" "lib/udev/rules.d"
@@ -1335,74 +1335,6 @@ animation of closing windowed applications.")
 GNOME Shell, including the top panel, dash and overview.")
    (license license:gpl3)))

-(define-public gnome-shell-extension-caffeine
-  (package
-    (name "gnome-shell-extension-caffeine")
-    (version "59")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url
-              "https://github.com/eonpatapon/gnome-shell-extension-caffeine")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0sv0iqfb6kjhgcg4pb59n91dyf667vax96kfhz5ik5hhx9n0z43w"))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:install-plan
-      #~'(("caffeine@patapon.info"
-           "share/gnome-shell/extensions/caffeine@patapon.info"
-           #:include-regexp ("icons" "locale" "preferences" "schemas"
-                             "\\.js(on)?$")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'compile-schemas
-            (lambda _
-              (with-directory-excursion "caffeine@patapon.info/schemas"
-                (invoke "glib-compile-schemas" ".")))))))
-    (native-inputs (list `(,glib "bin")))
-    (synopsis "Disable screensaver and auto suspend in Gnome")
-    (description "This extension provides a quick setting toggle to enable or
-disable the Gnome auto-suspend and screensaver.")
-    (home-page "https://github.com/eonpatapon/gnome-shell-extension-caffeine")
-    (license license:gpl2+)))
-
-(define-public gnome-shell-extension-hot-edge
-  (package
-    (name "gnome-shell-extension-hot-edge")
-    (version "27")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/jdoda/hotedge")
-             (commit "90e9cdd6f2a171a676a96a4e6ad0126316317e4d")))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "08jqz6n04yvqa77930sghgip5qfj8i4dm8wsm5cqjc4sqm4pn9yy"))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:install-plan
-      #~'(("." "share/gnome-shell/extensions/hotedge@jonathan.jdoda.ca"
-           #:include-regexp ("\\.css$" "\\.js(on)?$" "schemas")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'compile-schemas
-            (lambda _
-              (with-directory-excursion "schemas"
-                (invoke "glib-compile-schemas" ".")))))))
-    (native-inputs (list `(,glib "bin")))
-    (synopsis "Add a hot edge to the bottom of the screen in Gnome")
-    (description
-     "Add a hot edge that activates the overview to the bottom of the screen.
-This provides a better mouse-based workflow and can be an alternative to a dock.")
-    (home-page "https://github.com/jdoda/hotedge")
-    (license license:gpl2+)))
-
 (define-public gnome-shell-extension-radio
  (let ((commit "860e55b9e704eb3dde43e6bbeccec5748242498e")
        (revision "0"))
@@ -2598,92 +2598,6 @@ of Evince is to replace the multiple document viewers that exist
 on the GNOME Desktop with a single simple application.")
    (license license:gpl2+)))

-(define-public papers
-  (package
-    (name "papers")
-    (version "50.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/papers/"
-                                  (version-major version) "/"
-                                  "papers-" version ".tar.xz"))
-              (sha256
-               (base32 "01dws72fb19i9jwp3r0khr7ym2ns51fifdzafb5dcr5w8vmj06rh"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:glib-or-gtk? #t
-      #:configure-flags
-      #~(list (string-append "-Dc_link_args=-Wl,-rpath=" #$output "/lib"))
-      #:imported-modules `(,@%meson-build-system-modules
-                           ,@%cargo-build-system-modules)
-      #:modules `(((guix build cargo-build-system) #:prefix cargo:)
-                  (guix build meson-build-system)
-                  (guix build utils))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'prepare-for-build
-            (lambda _
-              (substitute* "meson.build"
-                (("gtk_update_icon_cache: true")
-                 "gtk_update_icon_cache: false")
-                (("update_desktop_database: true")
-                 "update_desktop_database: false"))
-              (substitute* "meson.build"
-                (("'Cargo.lock',")
-                  ""))
-              (delete-file "Cargo.lock")))
-          (add-after 'configure 'prepare-cargo-build-system
-            (lambda args
-              (for-each
-               (lambda (phase)
-                 (format #t "Running cargo phase: ~a~%" phase)
-                 (apply (assoc-ref cargo:%standard-phases phase)
-                        #:vendor-dir "vendor"
-                        #:cargo-target #$(cargo-triplet)
-                        args))
-               '(unpack-rust-crates
-                 configure
-                 check-for-pregenerated-files
-                 patch-cargo-checksums))
-
-              (setenv "RUSTFLAGS"
-                      (string-append (or (getenv "RUSTFLAGS") "")
-                                     " -C link-arg=-Wl,-rpath,"
-                                     #$output "/lib")))))))
-    (native-inputs
-     (cons* blueprint-compiler
-            gettext-minimal
-            `(,glib "bin")
-            gobject-introspection
-            gi-docgen
-            itstool
-            pkg-config
-            rust
-            `(,rust "cargo")
-            (or (and=> (%current-target-system)
-                       (compose list make-rust-sysroot))
-                '())))
-    (inputs
-     (cons* appstream
-            djvulibre
-            exempi
-            gtk
-            libadwaita
-            libarchive
-            libspelling
-            libtiff
-            nautilus                    ; for nautilus extension
-            poppler-next
-            zlib
-            (cargo-inputs 'papers)))
-    (home-page "https://apps.gnome.org/Papers")
-    ;; TODO: drop “new” when updating to GNOME 49 or newer.
-    (synopsis "GNOME's new document viewer")
-    (description "Papers is a document viewer capable of displaying multiple
-and single page document formats like PDF and DejaVu.")
-    (license license:gpl2+)))
-
 (define-public gsettings-desktop-schemas
  (package
    (name "gsettings-desktop-schemas")
@@ -10628,6 +10542,7 @@ playing media, scanning, and much more.")
           cheese
           decibels
           epiphany
+           evince
           file-roller
           gnome-calculator
           gnome-calendar
@@ -10647,7 +10562,6 @@ playing media, scanning, and much more.")
           localsearch
           loupe
           nautilus
-           papers
           simple-scan
           showtime
           xdg-desktop-portal-gnome
@@ -48,34 +48,6 @@
  #:use-module (gnu packages xml)
  #:use-module (ice-9 match))

-(define-public fsviewer
-  (package
-    (name "fsviewer")
-    (version "0.2.7")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/roblillack/fsviewer")
-              (commit (string-append "v" version))))
-       (sha256
-        (base32
-         "067fvbq7b4lbnn1flmwf8lm0vq4n6qz5yz6hhab30l4gksfk51cg"))
-       (file-name (git-file-name name version))))
-    (build-system cmake-build-system)
-    (arguments (list #:tests? #f))      ;no tests
-    (inputs
-     (list windowmaker libxmu libxpm))
-    (native-inputs
-     (list pkg-config))
-    (home-page "https://github.com/roblillack/fsviewer")
-    (synopsis "File viewer for Window Maker")
-    (description "FSViewer is a NeXT FileViewer lookalike for Window
-Maker supporting browser mode and list mode.  This version is a fork of
-FSViewer.app originally written by George Clernon (1998-99) and later
-maintained by Guido Scholz (2002-07).")
-    (license license:gpl2)))
-
 (define-public gnustep-make
  (package
    (name "gnustep-make")
@@ -412,7 +412,7 @@ similar to javadoc."))))
      (inherit base)
      (arguments
       `(;#:tests? #f;Requires spock-framework which is a circular dependency
-         #:ant ,ant; ant is actually a dependency of this package, and we need 1.10
+         #:ant ,ant/java8; ant is actually a dependency of this package, and we need 1.10
         ,@(substitute-keyword-arguments arguments
             ((#:phases phases)
              `(modify-phases ,phases
@@ -431,7 +431,8 @@ similar to javadoc."))))
         ("java-asm-analysis" ,java-asm-analysis-8)
         ,@(package-inputs base)))
      (native-inputs
-       `(("groovy-bootstrap" ,groovy-bootstrap)
+       `(("ant-junit" ,ant-junit)
+         ("groovy-bootstrap" ,groovy-bootstrap)
         ("groovy-xml" ,groovy-xml)
         ("groovy-test" ,groovy-test)
         ("groovy-tests-bootstrap" ,groovy-tests-bootstrap)
@@ -517,19 +517,22 @@ functions which were removed.")
                "0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
    (build-system waf-build-system)
    (arguments
-     (list
-      #:tests? #f ; no check target
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'set-flags
-            (lambda _
-              ;; Allow 'bin/ganv_bench' to find libganv-1.so.
-              (setenv "LDFLAGS"
-                      (string-append "-Wl,-rpath=" #$output "/lib")))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'set-flags
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Allow 'bin/ganv_bench' to find libganv-1.so.
+             (setenv "LDFLAGS"
+                     (string-append "-Wl,-rpath="
+                                    (assoc-ref outputs "out") "/lib"))
+             #t)))
+       #:tests? #f)) ; no check target
+    (inputs
+     `(("gtk" ,gtk+-2)
+       ("gtkmm" ,gtkmm-2)))
    (native-inputs
     (list `(,glib "bin") ; for glib-genmarshal, etc.
           pkg-config))
-    (inputs (list gtk+-2 gtkmm-2))
    (home-page "https://drobilla.net/software/ganv/")
    (synopsis "GTK+ widget for interactive graph-like environments")
    (description
@@ -1457,9 +1460,10 @@ exceptions, macros, and a dynamic programming environment.")
    (inherit guile-cairo)
    (name "guile2.2-cairo")
    (inputs
-     (modify-inputs inputs
-       (delete "guile" "guile-lib")
-       (append guile-2.2 guile2.2-lib)))))
+     `(("guile" ,guile-2.2)
+       ("guile-lib" ,guile2.2-lib)
+       ,@(fold alist-delete (package-inputs guile-cairo)
+               '("guile" "guile-lib"))))))

 (define-public guile-cairo-next
  ;; A commit with cairo-pointer->context, missing from guile-cairo@1.11.2
@@ -1575,10 +1579,11 @@ images onto Cairo surfaces.")
    (inherit guile-rsvg)
    (name "guile2.2-rsvg")
    (inputs
-     (modify-inputs inputs
-       (delete "guile" "guile-lib")
-       (append guile-2.2 guile2.2-lib)))
-    (propagated-inputs (list guile2.2-cairo))))
+     `(("guile" ,guile-2.2)
+       ("guile-lib" ,guile2.2-lib)
+       ,@(fold alist-delete (package-inputs guile-rsvg)
+               '("guile" "guile-lib"))))
+    (propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))

 (define-public guile-present
  (package
@@ -1644,7 +1649,9 @@ documents.")
    (name "guile2.2-present")
    (inputs (list guile-2.2))
    (propagated-inputs
-     (list guile2.2-lib guile2.2-cairo guile2.2-rsvg))))
+     `(("guile-lib" ,guile2.2-lib)
+       ("guile-cairo" ,guile2.2-cairo)
+       ("guile-rsvg" ,guile2.2-rsvg)))))

 ;;;
 ;;; C++ bindings.
@@ -5790,7 +5790,7 @@ processing filters.")
 (define-public guile-pnm
  (package
    (name "guile-pnm")
-    (version "0.2.0")
+    (version "0.1.0")
    (source
     (origin
       (method git-fetch)
@@ -5799,7 +5799,7 @@ processing filters.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "06kgp1gh8hdj1j6w7i981prx93wfjpayrnjlydlzs7l5j04l4m3a"))))
+        (base32 "1yvsni4hll20g99zq4wl734f9i8gpjr1sqsnk3a93k2dd7b6ymac"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -7691,11 +7691,11 @@ is an attempt to combine both into something useful.")
      (license license:asl2.0))))

 (define-public guile-knots
-  (let ((commit "f767eca066495e6582e89ba1b91907c0c5657878")
-        (revision "34"))
+  (let ((commit "d79284b4715efc347b22d510c3e3134a0c584b17")
+        (revision "32"))
    (package
    (name "guile-knots")
-    (version (git-version "0.1" revision commit))
+    (version (git-version "0" revision commit))
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -7703,7 +7703,7 @@ is an attempt to combine both into something useful.")
                    (commit commit)))
              (sha256
               (base32
-                "18fqmpyrrxy8phxxm5b7d1qhhvc3rsrs243xiinkj2hn2ca1cqi8"))
+                "0i87jc3dznw6pdib0yy49d8066c1jvwp2m01xi92amx45dkl8ixc"))
              (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -7938,16 +7938,14 @@ This module implements this interface by use of Guile's dynamic FFI.")
 (define-public guile-bstructs
  (package
    (name "guile-bstructs")
-    (version "0.2.0")
+    (version "0.1.0")
    (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://git.dthompson.us/guile-bstructs.git")
-               (commit (string-append "v" version))))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "18dwhcsbcjix61hy32ckjyvgmg1r9smq2krp2m1yc6sinlszh0f2"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://files.dthompson.us/releases"
+                           "/guile-bstructs/guile-bstructs-" version ".tar.gz"))
+       (sha256
+        (base32 "0f847aiyzhrlvd2jmckyqrkrvi7i9mg8rmyhbh7fs1vzykcf67wb"))))
    (build-system gnu-build-system)
    (native-inputs (list autoconf automake guile-3.0 pkg-config texinfo))
    (inputs (list guile-3.0))
@@ -96,13 +96,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 +117,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 +167,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 +290,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 +423,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 +534,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 +557,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 +572,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 +588,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 +601,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 +613,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 +627,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,7 +782,7 @@ 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
@@ -954,6 +976,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 +1016,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 +1045,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 +1070,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 +1086,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))
@@ -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
@@ -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))
@@ -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,17 @@ 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")))
+    (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 +906,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 +952,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 +1014,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
@@ -1626,12 +1626,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)
@@ -1695,22 +1689,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)
@@ -1722,8 +1718,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
@@ -1738,4 +1733,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
@@ -75,7 +75,7 @@
    (inputs
     (list openblas))
    (native-inputs
-     `(("ant" ,ant/java7)
+     `(("ant" ,ant)
       ("ruby" ,ruby)                   ; for configure script
       ("gfortran" ,gfortran)
       ("jdk" ,icedtea "jdk")))
@@ -1964,7 +1964,8 @@ OpenJDK.")
    (home-page "https://www.jetbrains.com/")
    (license license:gpl2+)))

-(define-public ant
+
+(define-public ant/java8
  (package
    (name "ant")
    (version "1.10.15")
@@ -1979,12 +1980,15 @@ OpenJDK.")
              (snippet
               '(begin
                  (for-each delete-file
-                            (find-files "lib/optional" "\\.jar$"))))))
-    (build-system ant-build-system)
+                            (find-files "lib/optional" "\\.jar$"))
+                  #t))))
+    (build-system gnu-build-system)
    (arguments
     (list
-      #:ant ant/java7
-      #:test-target "test"
+      #:modules '((srfi srfi-1)
+                  (guix build gnu-build-system)
+                  (guix build utils))
+      #:tests? #f                       ;no "check" target
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'remove-scripts
@@ -1994,100 +1998,11 @@ OpenJDK.")
              (for-each delete-file
                        (find-files "src/script"
                                    "(.*\\.(bat|cmd)|runant.*|antRun.*)"))))
-          (add-after 'unpack 'link-test-dependencies
-            (lambda* (#:key inputs #:allow-other-keys)
-              (for-each (lambda (file)
-                          (symlink file
-                                   (string-append "lib/optional/"
-                                                  (basename file))))
-                        (append
-                          (find-files (assoc-ref inputs "java-hamcrest-core")
-                                      "\\.jar$")
-                          (find-files (assoc-ref inputs "java-hamcrest-library")
-                                      "\\.jar$")
-                          (find-files (assoc-ref inputs "java-junit")
-                                      "\\.jar$")))))
-          (add-before 'build 'fix-test-failures
-            (lambda _
-              ;; Failure because the directory does not exist
-              (substitute* "src/etc/testcases/taskdefs/exec/exec-with-redirector.xml"
-                (("/usr/bin") (getcwd)))
-              ;; Failure because it cannot read root's name in the build
-              ;; container
-              (delete-file "src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java")
-              ;; Cause timestamp issue when trying to rollback time by a few
-              ;; seconds.
-              (for-each (lambda (file) (utime file 5000))
-                        (find-files "src/etc/testcases/taskdefs" "" #:directories? #t))))
          (delete 'bootstrap)
          (delete 'configure)
          (replace 'build
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
-              (invoke "bash" "bootstrap.sh"
-                      (string-append "-Ddist.dir=" #$output))))
-          (add-after 'build 'fix-executables-paths
-            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-script (string-append #$output "/bin/ant")
-                `("PATH" suffix
-                  (,(dirname (search-input-file inputs "/bin/sed"))
-                   ,(dirname (search-input-file inputs "/bin/uname"))
-                   ,(dirname (search-input-file inputs "/bin/which")))))
-              (patch-shebang
-               (string-append #$output "/bin/complete-ant-cmd.pl")
-               (list (dirname (search-input-file inputs "/bin/perl"))))))
-          (delete 'install))))
-    (inputs
-     (list coreutils-minimal
-           guile-3.0/pinned
-           java-hamcrest-core
-           java-hamcrest-library
-           java-junit
-           perl
-           sed
-           which))
-    (home-page "https://ant.apache.org")
-    (synopsis "Build tool for Java")
-    (description
-     "Ant is a platform-independent build tool for Java.  It is similar to
-make but is implemented using the Java language, requires the Java platform,
-and is best suited to building Java projects.  Ant uses XML to describe the
-build process and its dependencies, whereas Make uses Makefile format.")
-    (license license:asl2.0)))
-
-;; The 1.9.x series is the last that can be built with GCJ.  The 1.10.x series
-;; requires Java 8.
-(define-public ant/java7
-  (package
-    (name "ant")
-    (version "1.9.15")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://apache/ant/source/apache-ant-"
-                                  version "-src.tar.gz"))
-              (sha256
-               (base32
-                "1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd"))))
-    (build-system gnu-build-system)
-    (arguments
-      `(#:modules ((srfi srfi-1)
-                   (guix build gnu-build-system)
-                   (guix build utils))
-        #:tests? #f                  ; no "check" target
-        #:phases
-        (modify-phases %standard-phases
-          (delete 'bootstrap)
-          (delete 'configure)
-          (add-after 'unpack 'remove-scripts
-            ;; Remove bat / cmd scripts for DOS as well as the antRun and runant
-            ;; wrappers.
-            (lambda _
-              (for-each delete-file
-                        (find-files "src/script"
-                                    "(.*\\.(bat|cmd)|runant.*|antRun.*)"))))
-          (replace 'build
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))

              ;; Disable tests to avoid dependency on hamcrest-core, which needs
              ;; Ant to build.  This is necessary in addition to disabling the
@@ -2096,10 +2011,9 @@ build process and its dependencies, whereas Make uses Makefile format.")
              (substitute* "build.xml"
                (("depends=\"jars,test-jar") "depends=\"jars"))
              (invoke "bash" "bootstrap.sh"
-                      (string-append "-Ddist.dir="
-                                     (assoc-ref outputs "out")))))
+                      (string-append "-Ddist.dir=" #$output))))
          (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
-            (lambda* (#:key outputs #:allow-other-keys)
+            (lambda _
              (define (repack-archive jar)
                (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
                       (manifest (string-append dir "/META-INF/MANIFESTS.MF")))
@@ -2125,11 +2039,11 @@ build process and its dependencies, whereas Make uses Makefile format.")
                      (apply invoke command)))))
              (for-each repack-archive
                        (find-files
-                         (string-append (assoc-ref %outputs "out") "/lib")
+                         (string-append #$output "/lib")
                         "\\.jar$"))))
          (delete 'install))))
    (native-inputs
-     `(("jdk" ,icedtea-7 "jdk")
+     `(("jdk" ,icedtea-8 "jdk")
       ("zip" ,zip)
       ("unzip" ,unzip)))
    (home-page "https://ant.apache.org")
@@ -2141,12 +2055,131 @@ and is best suited to building Java projects.  Ant uses XML to describe the
 build process and its dependencies, whereas Make uses Makefile format.")
    (license license:asl2.0)))

+;; The 1.9.x series is the last that can be built with GCJ.  The 1.10.x series
+;; requires Java 8.
+(define-public ant
+  (package (inherit ant/java8)
+    (version "1.9.15")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://apache/ant/source/apache-ant-"
+                                  version "-src.tar.gz"))
+              (sha256
+               (base32
+                "1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd"))))
+    ;; XXX: we do this to avoid a rebuild.  This mess will be cleaned up
+    ;; later.
+    (arguments
+     (substitute-keyword-arguments
+         `(#:modules ((srfi srfi-1)
+                      (guix build gnu-build-system)
+                      (guix build utils))
+           #:tests? #f                  ; no "check" target
+           #:phases
+           (modify-phases %standard-phases
+             (delete 'bootstrap)
+             (delete 'configure)
+             (add-before 'build 'define-java-environment-variables
+               (lambda* (#:key inputs #:allow-other-keys)
+                 ;; First, set environment variables (eases debugging on -K).
+                 (setenv "JAVA_HOME" (assoc-ref inputs "jamvm"))
+                 (setenv "JAVACMD" (search-input-file inputs "/bin/jamvm"))
+                 (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
+                 (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
+             (replace 'build
+               (lambda* (#:key inputs outputs #:allow-other-keys)
+                 ;; Ant complains if this file doesn't exist.
+                 (setenv "HOME" "/tmp")
+                 (with-output-to-file "/tmp/.ant.properties"
+                   (lambda _ (display "")))
+
+                 ;; Use jikes instead of javac for <javac ...> tags in build.xml
+                 (setenv "ANT_OPTS" "-Dbuild.compiler=jikes")
+
+                 ;; jikes produces lots of warnings, but they are not very
+                 ;; interesting, so we silence them.
+                 (setenv "$BOOTJAVAC_OPTS" "-nowarn")
+
+                 ;; Without these JamVM options the build may freeze.
+                 (substitute* "bootstrap.sh"
+                   (("^\"\\$\\{JAVACMD\\}\" " m)
+                    ,@(if (string-prefix? "armhf" (or (%current-system)
+                                                      (%current-target-system)))
+                          `((string-append m "-Xnocompact "))
+                          `((string-append m "-Xnocompact -Xnoinlining ")))))
+
+                 ;; Disable tests because we are bootstrapping and thus don't have
+                 ;; any of the dependencies required to build and run the tests.
+                 (substitute* "build.xml"
+                   (("depends=\"jars,test-jar\"") "depends=\"jars\""))
+                 (invoke "bash" "bootstrap.sh"
+                         (string-append "-Ddist.dir="
+                                        (assoc-ref outputs "out")))))
+             (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (define (repack-archive jar)
+                   (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
+                          (manifest (string-append dir "/META-INF/MANIFESTS.MF")))
+                     (with-directory-excursion dir
+                       (invoke "unzip" jar))
+                     (delete-file jar)
+                     ;; XXX: copied from (gnu build install)
+                     (for-each (lambda (file)
+                                 (let ((s (lstat file)))
+                                   (unless (eq? (stat:type s) 'symlink)
+                                     (utime file  0 0 0 0))))
+                               (find-files dir #:directories? #t))
+                     ;; It is important that the manifest appears first.
+                     (with-directory-excursion dir
+                       (let* ((files (find-files "." ".*" #:directories? #t))
+                              ;; To ensure that the reference scanner can
+                              ;; detect all store references in the jars
+                              ;; we disable compression with the "-0" option.
+                              (command (if (file-exists? manifest)
+                                           `("zip" "-0" "-X" ,jar ,manifest
+                                             ,@files)
+                                           `("zip" "-0" "-X" ,jar ,@files))))
+                         (apply invoke command)))))
+                 (for-each repack-archive
+                           (find-files
+                            (string-append (assoc-ref %outputs "out") "/lib")
+                            "\\.jar$"))))
+             (delete 'install)))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (delete 'define-java-environment-variables)
+           (add-after 'unpack 'remove-scripts
+             ;; Remove bat / cmd scripts for DOS as well as the antRun and runant
+             ;; wrappers.
+             (lambda _
+               (for-each delete-file
+                         (find-files "src/script"
+                                     "(.*\\.(bat|cmd)|runant.*|antRun.*)"))
+               #t))
+           (replace 'build
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
+
+               ;; Disable tests to avoid dependency on hamcrest-core, which needs
+               ;; Ant to build.  This is necessary in addition to disabling the
+               ;; "check" phase, because the dependency on "test-jar" would always
+               ;; result in the tests to be run.
+               (substitute* "build.xml"
+                 (("depends=\"jars,test-jar") "depends=\"jars"))
+               (invoke "bash" "bootstrap.sh"
+                       (string-append "-Ddist.dir="
+                                      (assoc-ref outputs "out")))))))))
+    (native-inputs
+     `(("jdk" ,icedtea-7 "jdk")
+       ("zip" ,zip)
+       ("unzip" ,unzip)))))
+
 (define-public ant-apache-bcel
  (package
-    (inherit ant)
+    (inherit ant/java8)
    (name "ant-apache-bcel")
    (arguments
-     (substitute-keyword-arguments (package-arguments ant)
+     (substitute-keyword-arguments (package-arguments ant/java8)
       ((#:phases phases)
        #~(modify-phases #$phases
            (add-after 'unpack 'link-bcel
@@ -2167,11 +2200,37 @@ build process and its dependencies, whereas Make uses Makefile format.")
                  (delete-file-recursively bin)
                  (delete-file-recursively lib))))))))
    (inputs
-     (modify-inputs (package-inputs ant)
+     (modify-inputs (package-inputs ant/java8)
       (prepend java-commons-bcel)))))

-(define-deprecated-package ant-junit
-  ant)
+(define-public ant-junit
+  (package
+    (inherit ant/java8)
+    (name "ant-junit")
+    (arguments
+     (substitute-keyword-arguments (package-arguments ant/java8)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'link-junit
+              (lambda* (#:key inputs #:allow-other-keys)
+                (for-each (lambda (file)
+                            (symlink file
+                                     (string-append "lib/optional/"
+                                                    (basename file))))
+                          (find-files (assoc-ref inputs "java-junit")
+                                      "\\.jar$"))))
+            (add-after 'build 'install
+              (lambda _
+                (let ((share (string-append #$output "/share/java"))
+                      (bin   (string-append #$output "/bin"))
+                      (lib   (string-append #$output "/lib")))
+                  (mkdir-p share)
+                  (install-file (string-append lib "/ant-junit.jar") share)
+                  (delete-file-recursively bin)
+                  (delete-file-recursively lib))))))))
+    (inputs
+     (modify-inputs (package-inputs ant/java8)
+       (prepend java-junit)))))

 (define-public libantlr3c
  (package
@@ -3278,9 +3337,6 @@ is implemented.")
     `(;; Tests require junit
       #:tests? #f
       #:jar-name "qdox.jar"
-       ;; Explicitely use an ant version that includes the junit tasks, since
-       ;; it is a dependency of junit.
-       #:ant ,ant/java7
       #:phases
       (modify-phases %standard-phases
         (replace 'unpack
@@ -3389,9 +3445,6 @@ documentation tools.")
     `(;; Tests require junit, which ultimately depends on this package.
       #:tests? #f
       #:build-target "jar"
-       ;; Explicitely use an ant version that includes the junit tasks, since
-       ;; it is a dependency of junit.
-       #:ant ,ant/java7
       #:phases
       (modify-phases %standard-phases
         (add-before 'build 'do-not-use-bundled-asm
@@ -3490,9 +3543,6 @@ testing frameworks, mocking libraries and UI validation rules.")
    (build-system ant-build-system)
    (arguments
     `(#:tests? #f ; Tests require junit
-       ;; Explicitely use an ant version that includes the junit tasks, since
-       ;; it is a dependency of junit.
-       #:ant ,ant/java7
       #:modules ((guix build ant-build-system)
                  (guix build java-utils)
                  (guix build utils)
@@ -3578,9 +3628,6 @@ testing frameworks, mocking libraries and UI validation rules.")
    (native-inputs '())
    (arguments
     `(#:tests? #f
-       ;; Explicitely use an ant version that includes the junit tasks, since
-       ;; it is a dependency of junit.
-       #:ant ,ant/java7
       #:phases
       (modify-phases %standard-phases
         (delete 'configure)
@@ -3622,7 +3669,7 @@ testing frameworks, mocking libraries and UI validation rules.")
 (define-public java-junit
  (package
    (name "java-junit")
-    (version "4.13.2")
+    (version "4.12")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3631,7 +3678,7 @@ testing frameworks, mocking libraries and UI validation rules.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1r7k4zzscc8019np3is3bzfigw8fxd6s3259cbhzzh02q6d5p9h3"))
+                "1j8avi91px1z8rjc89cfikwrvfifdmmsarwiyrcnr59ynvpz0v8h"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -3643,9 +3690,6 @@ testing frameworks, mocking libraries and UI validation rules.")
     `(#:jar-name "junit.jar"
       #:source-dir "src/main/java"
       #:test-dir "src/test"
-       ;; Explicitely use an ant version that includes the junit tasks, so
-       ;; we can run the tests.
-       #:ant ,ant/java7
       #:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java"
                            "**/RuleChainTest.java" "**/TestWatchmanTest.java")
       #:phases
@@ -3686,13 +3730,7 @@ sharing common test data, and test runners for running tests.")
     `(#:jar-name "junitparams.jar"
       #:source-dir "src/main/java"
       #:test-dir "src/test"
-       #:test-exclude (list
-                        ;; Abstract class: no tests
-                        "**/SuperclassTest.java"
-                        ;; Incompatible tests with junit 4.13.2
-                        "**/BeforeAfterClassTest.java"
-                        "**/FilterableTest.java"
-                        "**/RulesTest.java")))
+       #:test-exclude (list "**/SuperclassTest.java")))
    (inputs
     (list java-junit))
    (native-inputs
@@ -5161,9 +5199,6 @@ complex transformations and code analysis tools.")
    (build-system ant-build-system)
    (arguments
     `(#:tests? #f
-       ;; Explicitely use an ant version that includes the junit tasks, since
-       ;; it is a dependency of junit.
-       #:ant ,ant/java7
       #:phases
       (modify-phases %standard-phases
         (delete 'unpack)
@@ -5185,9 +5220,6 @@ including java-asm.")
    (properties '((hidden? . #t)))
    (arguments
     (substitute-keyword-arguments (package-arguments java-asm)
-       ;; Explicitely use an ant version that includes the junit tasks, since
-       ;; it is a dependency of junit.
-       ((#:ant _ ant/java7) ant/java7)
       ((#:tests? _) #f)))
    (native-inputs `())))

@@ -37,7 +37,6 @@
  #:use-module (guix packages)
  #:use-module (guix utils)
  #:use-module (gnu packages)
-  #:use-module (gnu packages bash)
  #:use-module (gnu packages boost)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages crypto)
@@ -190,17 +189,16 @@ framework.  It builds XMPP clients complying with the XMPP Compliance Suites
  (package
    (name "kaidan")
    (version "0.15.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://kde/unstable/kaidan/" version
-                           "/kaidan-" version ".tar.xz"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            (delete-file-recursively "3rdparty")))
-       (sha256
-        (base32 "11g4lifji6gh9zmpgyx4dnmxyzzwkhhj84j2w9r4bvgqm2pxdhnd"))))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/unstable/kaidan/" version
+                                  "/kaidan-" version ".tar.xz"))
+              (modules '((guix build utils)))
+              (snippet
+               #~(begin
+                   (delete-file-recursively "3rdparty")))
+              (sha256
+               (base32 "11g4lifji6gh9zmpgyx4dnmxyzzwkhhj84j2w9r4bvgqm2pxdhnd"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -211,18 +209,10 @@ framework.  It builds XMPP clients complying with the XMPP Compliance Suites
           (add-before 'check 'set-home
             (lambda _
               ;; Tests need write permission in $HOME.
-               (setenv "HOME" "/tmp")))
-           (add-after 'install 'wrap-program
-             (lambda _
-               (let ((gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
-                 (wrap-program (string-append #$output "/bin/kaidan")
-                   `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
-                     (,gst-plugin-path)))))))))
+               (setenv "HOME" "/tmp"))))))
    (native-inputs (list extra-cmake-modules
                         pkg-config))
-    (inputs (list bash-minimal
-                  gst-plugins-good-qt
-                  gstreamer
+    (inputs (list gstreamer
                  icu4c
                  kcrash
                  kdsingleapplication
@@ -1853,9 +1853,6 @@ for xdg-desktop-portal that is using Qt/KF5.")
                             breeze-icons ;default mouse icon
                             colord
                             discover
-                             ffmpegthumbs
-                             flatpak ;for discover
-                             flatpak-kcm ;to manage flatpak app permissions
                             kactivitymanagerd
                             kdeclarative ;required by sddm breeze theme
                             kde-cli-tools
@@ -33,7 +33,6 @@
  #:use-module (gnu packages libusb)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages swig)
  #:use-module (gnu packages textutils))

@@ -96,7 +95,7 @@
                                                 "/html"))))))
      #:tests? #f))                     ; tests fail without access to USB
    (native-inputs
-     (list doxygen graphviz pkg-config python python-setuptools swig))
+     (list doxygen graphviz pkg-config python swig-4.0))
    (inputs
     (list boost libconfuse))
    (propagated-inputs
@@ -4914,7 +4914,7 @@ transparently through a bridge.")
 (define-public libnl
  (package
    (name "libnl")
-    (version "3.12.0")
+    (version "3.7.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -4923,7 +4923,7 @@ transparently through a bridge.")
                    "/libnl-" version ".tar.gz"))
              (sha256
               (base32
-                "066xq01y2mx0xi7bwa5y6ciw1ygla15qdlzzyvyzb8zijrqwllgw"))))
+                "0faryrbvp0x4s2zhg5d78vd5q4w34lrr736gpm9wcwpaxv5krr4z"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("bison" ,bison)
@@ -4938,7 +4938,7 @@ transparently through a bridge.")
                 (string-join (string-split version #\.) "_")
                 "/libnl-doc-" version ".tar.gz"))
           (sha256
-            (base32 "18f14pdycghy6fcd27faqgh19zpam6b45s8bgsk85kb9wwzq3yd4"))))))
+            (base32 "1ra8xdf06q9hlsrnc1yz67xkp4kd9sd27ff02mlixixnyyjp32sp"))))))
    (outputs `("out" "doc"))
    (arguments
     `(#:phases
@@ -57,7 +57,7 @@
 (define-public luanti
  (package
    (name "luanti")
-    (version "5.15.2")
+    (version "5.15.1")
    (source
     (origin
       (method git-fetch)
@@ -66,7 +66,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1mcbsgf549y2jg9qds95wwgd1699mkk4byv9ls4lpg43bd829dhk"))
+        (base32 "07g41ljv117pmw6402mqznccwl1hd9jp2l8wkb4l211cbm4c6vv9"))
       (modules '((guix build utils)
                  (srfi srfi-26)
                  (ice-9 ftw)))
@@ -488,7 +488,7 @@ with different rules and mechanics.")
 (define-public luanti-mineclonia
  (package
    (name "luanti-mineclonia")
-    (version "0.121.1")
+    (version "0.120.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -497,7 +497,7 @@ with different rules and mechanics.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1c3x59iq04vfc0fa09z6g8davrr2vhdywppdbgyw64n7vk4f6br9"))))
+                "135xllkvdravry25y1f94wqn7nxb0pnrpn7xiagh2b5vjbajhdg4"))))
    (build-system copy-build-system)
    (arguments
     `(#:install-plan
@@ -3437,14 +3437,14 @@ notifications.")
 (define-public pounce
  (package
    (name "pounce")
-    (version "3.2")
+    (version "3.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://git.causal.agency/pounce/snapshot/pounce-"
                           version ".tar.gz"))
       (sha256
-        (base32 "1i0s76mip9kfmi85bfk10p4k1kg5wkq1gm4l9gadnq9ssxnvzvjs"))
+        (base32 "0kk0jrfiwfaybr0i5xih3b0yd4i6v3bz866a7xal1j8wddalbwlp"))
       (patches (search-patches "pounce-readable-checks.patch"))))
    (outputs '("out" "debug"))
    (build-system gnu-build-system)
@@ -171,7 +171,6 @@
  #:use-module (gnu packages lua)
  #:use-module (gnu packages machine-learning)
  #:use-module (gnu packages man)
-  #:use-module (gnu packages messaging)
  #:use-module (gnu packages mp3)
  #:use-module (gnu packages mpd)
  #:use-module (gnu packages mruby-xyz)
@@ -594,38 +593,6 @@ updates via @command{mopidy local scan} while Mopidy is running, so you can
 scan your media library periodically, for example from a cron job.")
    (license license:asl2.0)))

-(define-public mopidy-mopiqtt
-  (package
-    (name "mopidy-mopiqtt")
-    (version "1.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/fmarzocca/mopiqtt")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1gaxxbpws9xshsbknq78h0c1k3ynvc466hkq4952pv00q203zqk4"))
-       ;; XXX: https://github.com/fmarzocca/Mopiqtt/issues/6
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (substitute* "tests/test_smoke.py"
-             (("mqtt")
-              "mopiqtt"))
-           (substitute* "tests/conftest.py"
-             (("mqtt")
-              "mopiqtt"))))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-setuptools))
-    (propagated-inputs (list mopidy python-paho-mqtt python-pykka))
-    (home-page "https://github.com/fmarzocca/mopiqtt")
-    (synopsis "MQTT interface for Mopidy")
-    (description
-     "This package provides an MQTT interface extension for Mopidy music server.")
-    (license license:asl2.0)))
-
 (define-public clementine
  ;; Clementine has one automatic release per commit at
  ;; <https://github.com/clementine-player/Clementine/releases>.
@@ -1,4 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
+;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,8 +20,98 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages nvi)
-  #:use-module (gnu packages text-editors)
-  #:use-module (guix deprecation))
+  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages dbm)
+  #:use-module (gnu packages ncurses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
+  #:use-module (guix licenses)
+  #:use-module (guix utils))

-(define-deprecated/public-alias nvi
-  (@ (gnu packages text-editors) nvi))
+(define-public nvi
+  (package
+    (name "nvi")
+    (version "1.81.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri          ;; sites.google.coma/bostic.com/keithbostic/vi is stale.
+          (string-append "http://harrier.slackbuilds.org/misc/nvi-" version
+                         ".tar.bz2"))
+        (sha256
+          (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
+        (patches (search-patches "nvi-assume-preserve-path.patch"
+                                 "nvi-dbpagesize-binpower.patch"
+                                 "nvi-add-function-prototypes.patch"
+                                 "nvi-db4.patch"))
+        (modules '((guix build utils)))
+        (snippet
+          ;; Create a wrapper for the configure script, make it executable.
+          '(let ((conf-wrap (open-output-file "configure")))
+             (display "#!/bin/sh" conf-wrap)
+             (newline conf-wrap)
+             (display
+               "../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@"
+               conf-wrap)
+             (newline conf-wrap)
+             (close-output-port conf-wrap)
+             (chmod "configure" #o0755)
+
+             ;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
+             ;; to the internal PTY allocation logic.
+             (substitute* "ex/ex_script.c"
+               (("#ifdef HAVE_SYS5_PTY")
+                "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))
+             #t))))
+
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:out-of-source? #t
+      #:configure-flags
+      #~'("--enable-widechar"
+          #$@(if (%current-target-system)
+                 '("vi_cv_sprintf_count=yes")
+                 '()))
+      #:make-flags
+      #~(list
+         ;; Add CFLAGS to relax gcc-14's strictness.
+         ;; nvi's configure chokes on passing CFLAGS and ignores
+         ;; CFLAGS set in the environment.
+         (string-append "CFLAGS=-g -O2"
+                        " -Wno-error=incompatible-pointer-types"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'fix-configure
+            (lambda* (#:key inputs native-inputs #:allow-other-keys)
+              ;; Replace outdated config.sub and config.guess:
+              (with-directory-excursion "dist"
+                (for-each
+                 (lambda (file)
+                   (chmod file #o755)
+                   (install-file
+                    (format #f "~a/share/automake-~a/~a"
+                            (assoc-ref (or native-inputs inputs)
+                                       "automake")
+                            #$(version-major+minor
+                               (package-version automake))
+                            file)
+                    "."))
+                 '("config.sub" "config.guess"))))))))
+    (inputs
+      (list bdb ncurses))
+    (native-inputs
+     (list automake)) ;Up to date 'config.guess' and 'config.sub'.
+    (synopsis "The Berkeley Vi Editor")
+    (description
+      "Vi is the original screen based text editor for Unix systems.  It is
+considered the standard text editor, and is available on almost all Unix
+systems.  Nvi is intended as a \"bug-for-bug compatible\" clone of the
+original BSD vi editor.  As such, it doesn't have a lot of snazzy features as
+do some of the other vi clones such as elvis and vim.  However, if all you
+want is vi, this is the one to get.")
+    (home-page "https://sites.google.com/a/bostic.com/keithbostic/vi")
+    (license bsd-3)))
@@ -6153,7 +6153,7 @@ serializers and deserializers from type definitions.")
    (build-system dune-build-system)
    (propagated-inputs (list ocaml-yojson))
    (properties `((upstream-name . "ppx_yojson_conv_lib")))
-    (synopsis "Runtime library used by ocaml PPX yojson converter")
+    (synopsis "Runtime library used by ocaml PPX yojson convertor")
    (description "Ppx_yojson_conv_lib is the runtime library used by
 ppx_yojson_conv, a ppx rewriter that can be used to convert ocaml types
 to a Yojson.Safe value.")
@@ -75,7 +75,7 @@
          (add-after 'unpack 'relax-requirements
            (lambda _
              (substitute* "setup.py"
-                ;; Relax hard requirement of PIP.
+                ;; Relax hard requirment of PIP.
                ((".*pip>=18.0.*") ""))))
          (add-before 'check 'pre-check
            (lambda _
@@ -32,7 +32,6 @@
 ;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2025 unwox <me@unwox.com>
-;;; Copyright © 2026 Owen T. Heisler <writer@owenh.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1499,7 +1498,7 @@ manage (install/update) them for you.")
              "--ignore=tests/trust/test_signature_verification.py"
              "-k" (string-join
                    ;; XXX: Issues salad: network access, can't detect Conda
-                    ;; environment, assertion failed; review if they may be
+                    ;; environemnt, assertion failed; review if they may be
                    ;; fixed.
                    ;;
                    ;; test_info_all: Fails due to parallel test interference.
@@ -2134,8 +2133,8 @@ environments.")
                  "153bgcjqw6jp0yl0vj0k67k9c8lw82vac6b0cnacrjrcb24lcpdq")))))))

 (define-public guix-build-coordinator
-  (let ((commit "a52e17ae733de601ef3d4aa72b88ff7ed02aceb7")
-        (revision "138"))
+  (let ((commit "bd3467e7b60f22089c4a3bf6d32caafbd03625f0")
+        (revision "137"))
    (package
      (name "guix-build-coordinator")
      (version (git-version "0" revision commit))
@@ -2146,7 +2145,7 @@ environments.")
                      (commit commit)))
                (sha256
                 (base32
-                  "164k3ygn69h0z6bbsqpk22psnn2b1lbpidmaixf3kaj6kfjvz7xw"))
+                  "0h9kxpijilrn9v2s8dy7sdifshri4fxvdgvxxacvvbw01fb3llmv"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
      (arguments
@@ -2389,8 +2388,8 @@ in an isolated environment, in separate namespaces.")
    (license license:gpl3+)))

 (define-public nar-herder
-  (let ((commit "44ca801e2352b64e19921c72177b35b2e49a7a09")
-        (revision "53"))
+  (let ((commit "cc1e9052785de0a08b05f85a7c7c400d95e339e7")
+        (revision "52"))
    (package
      (name "nar-herder")
      (version (git-version "0" revision commit))
@@ -2401,7 +2400,7 @@ in an isolated environment, in separate namespaces.")
                      (commit commit)))
                (sha256
                 (base32
-                  "15sc9rgna1fxsns1q9q1xlrqfqc4r5lcmmddw0af2lhll75kj7v2"))
+                  "0qsyvmxr5kkayvvda8f5lmamz098vcjrfgpbwd5519fcw8xbnk8q"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
      (arguments
@@ -2468,7 +2467,6 @@ in an isolated environment, in separate namespaces.")

             ;; Guile libraries are needed here for cross-compilation.
             guile-next
-             guile-aws
             guile-json-4
             guile-gcrypt
             guix
@@ -2483,8 +2481,7 @@ in an isolated environment, in separate namespaces.")
       (list bash-minimal
             guile-next))
      (propagated-inputs
-       (list guile-aws
-             guile-json-4
+       (list guile-json-4
             guile-gcrypt
             guix
             guile-fibers-next
@@ -2745,8 +2742,6 @@ cp -r /tmp/locale/*/en_US.*")))
    (propagated-inputs (list glib-networking
                             gnupg
                             gsettings-desktop-schemas
-                             ;; Required for flatpak-validate-icon SVG validation.
-                             (librsvg-for-system)
                             ;; The following are listed in Requires.private of
                             ;; `flatpak.pc'.
                             curl
@@ -1798,7 +1798,7 @@ is the community-enhanced, \"jumbo\" version of John the Ripper.")
    (home-page "https://github.com/hashcat/maskprocessor")
    (synopsis "High-Performance word generator")
    (description "Maskprocessor is a high-performance word generator with a
-per-position configurable charset.")
+per-position configureable charset.")
    (license (list license:expat))))

 (define-public fpm2
@@ -0,0 +1,58 @@
+From 4617d2682738aeaece613ea61390dd47447c2d9f Mon Sep 17 00:00:00 2001
+From: Potato Hatsue <1793913507@qq.com>
+Date: Fri, 12 Sep 2025 06:07:02 -0700
+Subject: [PATCH] Allow QuickCheck 2.15.0
+
+---
+ Test/Chell/QuickCheck.hs | 8 ++++++++
+ chell-quickcheck.cabal   | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Test/Chell/QuickCheck.hs b/Test/Chell/QuickCheck.hs
+index ea1c488..3227b8e 100644
+--- a/Test/Chell/QuickCheck.hs
+++ b/Test/Chell/QuickCheck.hs
+@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
+ module Test.Chell.QuickCheck (property) where
+ 
+ import Test.Chell qualified as Chell
+@@ -30,7 +31,12 @@ property name prop = Chell.test name $ \opts -> Text.withNullTerminal $ \term ->
+             { State.terminal = term,
+               State.maxSuccessTests = QuickCheck.maxSuccess args,
+               State.maxDiscardedRatio = QuickCheck.maxDiscardRatio args,
+#if MIN_VERSION_QuickCheck(2,15,0)
+              State.replayStartSize = Nothing,
+              State.maxTestSize = QuickCheck.maxSize args,
+#else
+               State.computeSize = computeSize (QuickCheck.maxSize args) (QuickCheck.maxSuccess args),
+#endif
+               State.numSuccessTests = 0,
+               State.numDiscardedTests = 0,
+               State.classes = mempty,
+@@ -59,6 +65,7 @@ property name prop = Chell.test name $ \opts -> Text.withNullTerminal $ \term ->
+         Test.GaveUp {} -> Chell.TestAborted notes output
+         Test.NoExpectedFailure {} -> Chell.TestFailed notes [failure]
+ 
+#if !MIN_VERSION_QuickCheck(2,15,0)
+ -- copied from quickcheck-2.4.1.1/src/Test/QuickCheck/Test.hs
+ computeSize :: Int -> Int -> Int -> Int -> Int
+ computeSize maxSize maxSuccess n d
+@@ -79,3 +86,4 @@ computeSize maxSize maxSuccess n d
+ 
+ roundTo :: Int -> Int -> Int
+ roundTo n m = (n `div` m) * m
+#endif
+diff --git a/chell-quickcheck.cabal b/chell-quickcheck.cabal
+index e854412..1f3a1d9 100644
+--- a/chell-quickcheck.cabal
+++ b/chell-quickcheck.cabal
+@@ -34,7 +34,7 @@ library
+     build-depends:
+       , base ^>= 4.16 || ^>= 4.17 || ^>= 4.18 || ^>= 4.19 || ^>= 4.20 || ^>= 4.21
+       , chell ^>= 0.5
+-      , QuickCheck ^>= 2.14.2
+      , QuickCheck ^>= 2.14.2 || ^>= 2.15.0
+       , random ^>= 1.2.1 || ^>= 1.3.0
+ 
+     exposed-modules:
@@ -4,7 +4,7 @@
 	# number of sections)
 	'$(TEST_HC)' $(TEST_HC_OPTS) Generate.hs
 	./Generate > ManySections.s
-+	echo '.section .note.GNU-stack,"",@progbits' > ManySections.s
+	echo '.section .note.GNU-stack,"",@progbits' >> ManySections.s
 	echo 'main = putStrLn "Running main..."' > Main.hs
 	'$(TEST_HC)' $(TEST_HC_OPTS) -c ManySections.s
 	'$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ManySections.o
@@ -1,43 +0,0 @@
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -265,15 +265,11 @@
- amal.flags     = -nc
- amal.run       = TOPDIR="$(DIR.top)" $(SHELL.bash) $(bin.make-amal) --quiet
- 
- libfossil.c: $(amal.deps)
- 	$(amal.run) $(amal.flags)
-libfossil.h: libfossil.c
-all: libfossil.c
- @if ENABLE_CXX
-libfossil.hpp: libfossil.c
-libfossil.c++: libfossil.c
- amal.flags += -c++
- @endif
- 
- .PHONY: amal
- amal: libfossil.c
-@@ -287,19 +283,16 @@
- 	fossil uv sync
- @endif
- @endif
- 
- install: install-headers
-install-headers: libfossil.h $(install-dir.include)
-	$(INSTALL.noexec) libfossil.h $(install-dir.include)
-+install-headers: include/libfossil.h $(install-dir.include)
-+	$(INSTALL.noexec) $< $(install-dir.include)
- @if ENABLE_CXX
-libfossil++.hpp: libfossil.h
-libfossil++.cpp: libfossil++.hpp
-all: libfossil++.cpp
- install-headers: install-headers++
-install-headers++: libfossil++.hpp $(install-dir.include)
-	$(INSTALL.noexec) libfossil++.hpp $(install-dir.include)
-+install-headers++: include/libfossil.hpp $(install-dir.include)
-+	$(INSTALL.noexec) $< $(install-dir.include)
- @endif # ENABLE_CXX
- clean: clean-amalgamation
- clean-amalgamation:
- 	rm -f libfossil.c libfossil.h libfossil++.cpp libfossil++.hpp
- 	rm -f libfossil-config.h libfossil-amalgamation.zip VERSION.h
-
@@ -1,14 +0,0 @@
-Upstream-status: https://github.com/open-eid/DigiDoc4-Client/pull/1398
-
-diff --git a/client/Application.cpp b/client/Application.cpp
-index c979020..dac13d9 100644
--- a/client/Application.cpp
-+++ b/client/Application.cpp
-@@ -307,6 +307,7 @@ Application::Application( int &argc, char **argv )
- {
- 	setApplicationName(QStringLiteral("qdigidoc4"));
- 	setApplicationVersion(QStringLiteral(VERSION_STR));
-+	setDesktopFileName("ee.ria.qdigidoc4");
- 	setOrganizationDomain(QStringLiteral("ria.ee"));
- 	setOrganizationName(QStringLiteral("RIA"));
- 	setWindowIcon(QIcon(QStringLiteral(":/images/Icon.svg")));
@@ -472,34 +472,6 @@ Poppler gives access to the following binary programs:
   (license license:gpl2+)
   (home-page "https://poppler.freedesktop.org/")))

-(define-public poppler-next
-  (package
-    (inherit poppler)
-    (name "poppler-next")
-    (version "26.04.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://poppler.freedesktop.org/poppler-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "14q69q6ipy3m4ywdhlr48qlscwzrv8jcns3g2306pyaa25im35dh"))))
-    (arguments (substitute-keyword-arguments arguments
-                 ((#:configure-flags flags)
-                  #~(cons*
-                     "-DENABLE_GPGME=OFF"
-                     "-DENABLE_QT5=OFF"
-                     "-DENABLE_QT6=OFF"
-                     #$flags))
-                 ((#:phases phases)
-                  #~(modify-phases #$phases
-                      (add-after 'install 'sanitize-pkg-config-files
-                        (lambda _
-                          (substitute* (find-files #$output "\\.pc$")
-                            (("^Requires.private:.*" all)
-                             (string-append "# " all)))))))))
-    (inputs (modify-inputs inputs (prepend curl)))))
-
 (define-public poppler-data
  (package
    (name "poppler-data")
@@ -1892,7 +1864,7 @@ presentation.  The input files processed by pdfpc are PDF documents.")
    (license license:gpl3+)))

 (define-public paps
-  ;; Fails to build in latest release.
+  ;; Fails to build in lastest release.
  (let ((commit "199b478ca3884df4c0786948aae09c7928c6498f")
        (revision "0"))
    (package
@@ -510,7 +510,7 @@ of the same class using @code{JSON::Unmarshal}.")
@code{JSON::Unmarshal} in order to save duplication, it is intended to store a
 separate JSON name for an attribute where the name of the JSON attribute might be
 changed, either for aesthetic reasons or the name is not a valid Perl identifier.
-It will of course also be needed in classes that are going to use
+It will of course also be needed in classes thar are going to use
@code{JSON::Marshal} or @code{JSON::Unmarshal} for serialization/deserialization.")
    (license license:artistic2.0)))

@@ -311,7 +311,7 @@
                 ;; This test fails on most architectures.
                 "sapi/cli/tests/upload_2G.phpt"))

-              ;; Accommodate two extra openssl errors flanking the expected one:
+              ;; Accomodate two extra openssl errors flanking the expected one:
              ;; random number generator:RAND_{load,write}_file:Cannot open file
              ;; This is due to an invalid $HOME, but changing it in the test
              ;; still prints the first one & changing it globally is overkill.
@@ -91,7 +91,7 @@
         "--with-nologin=/run/apcupsd"
         "--with-pwrfail-dir=/run/apcupsd"

-         ;; Configure requires these, but we do not use the generated
+         ;; Configure requires these, but we do not use the genenerated
         ;; apcupsd.conf, so in order to reduce dependencies of the package,
         ;; provide fake values.
         (string-append "ac_cv_path_SHUTDOWN=/nope")
@@ -237,7 +237,7 @@ it.")
 (define-public trealla
  (package
    (name "trealla")
-    (version "2.92.41")
+    (version "2.92.30")
    (source
     (origin
       (method git-fetch)
@@ -246,7 +246,7 @@ it.")
          (url "https://github.com/trealla-prolog/trealla")
          (commit (string-append "v" version))))
       (sha256
-        (base32 "0ial37h0i9zjxgxvkai2vmaafn4djprliw0nzppnhwwy3jbcd14p"))
+        (base32 "1vbjv2nf3c2npf349i9y0zknc2g0hizksv0yhgscdpwzvzfp6n9m"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (inputs
@@ -446,7 +446,7 @@ Prometheus metrics.")
      #:import-path "github.com/prometheus/common"
      #:test-subdirs
      #~(list
-         ;; Skip, as it requires
+         ;; Skipp, as it requires
         ;; <github.com/prometheus/client_golang/prometheus>, which introduces
         ;; cycle.
         ;; "./config/..."
@@ -524,7 +524,7 @@ from protobuf specification files.")
            (lambda _
              (copy-file "extra/poetry/pyproject.toml" "pyproject.toml")
              (delete-file "build.py")
-              ;; Mimic extra/poetry/poetry_build.sh.
+              ;; Mimick extra/poetry/poetry_build.sh.
              (mkdir "nanopb")
              (copy-recursively "generator" "nanopb/generator")
              (invoke "touch" "nanopb/__init__.py"
@@ -1807,7 +1807,7 @@ HTTP @code{multipart/form-data} parsers and generators.")
     (list
      #:test-flags
      #~(list "--numprocesses" (number->string (parallel-job-count))
-              ;; It tries to download hatchling and install additional test
+              ;; It tries to download hatchling and install aditional test
              ;; dependencies.
              "--ignore=mypy/test/testpep561.py")
      #:phases
@@ -3032,7 +3032,7 @@ sub-package.")

 (define-public python-pytest-fixture-config
  ;; TODO: Master branch has removed all Python 2 support such Six, consider
-  ;; to update and drop python-six from closure in the next update cycle.
+  ;; to update and drop python-six from closure in the next update cyle.
  (package
    (name "python-pytest-fixture-config")
    (version "1.8.0")
@@ -3121,7 +3121,7 @@ compliance.")
    (home-page "https://github.com/dropbox/pytest-flakefinder")
    (synopsis "Pytest plugin for finding flaky tests")
    (description "This package provides a Pytest plugin to run tests multiple
-times and detect flakiness.")
+times and detect flakyness.")
    (license license:asl2.0)))

 (define-public python-pytest-flask
@@ -3706,7 +3706,7 @@ interaction, like key presses and mouse clicks.")
      ;; tests: 23 passed, 13 deselected
      #:test-flags
      #~(list "-p" "no:randomly"
-              ;; Skip tests requiring python-factory-boy, python-faker,
+              ;; Skip tests requireing python-factory-boy, python-faker,
              ;; python-numpy, and python-pytest-xdist to reduce closure size.
              "-k" (string-join
                    (list "not test_entrypoint_injection"
@@ -974,7 +974,7 @@ provides handling of symlinks, and exception management.")
       (sha256
        (base32 "0rj182i2d7d2bz067zrk39s19j09xsxkzprl82fqql8ji9c5fwd0"))))
    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f))       ;TODO: Tests require extra packaging
+    (arguments (list #:tests? #f))       ;TODO: Tests requrie extra packaging
    (native-inputs
     (list ;; python-big-o
           ;; python-coherent-licensed
@@ -263,7 +263,7 @@ Python interface around SSH networking concepts.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; Test fails with error: AssertionError: KeyboardInterrupt not raised.
+      ;; Test failes with error: AssertionError: KeyboardInterrupt not raised.
      #:test-flags #~(list "-k" "not test_multithreading_with_interrupts")))
    (native-inputs
     (list openssl
@@ -1840,7 +1840,7 @@ interacting with a U2F device over USB.")
    (synopsis "Stateless OpenPGP Command-Line Interface")
    (description
     "The Stateless OpenPGP Command-Line Interface (or sop) is a
-specification that encourages OpenPGP implementers to provide a common,
+specification that encourages OpenPGP implementors to provide a common,
 relatively simple command-line API for purposes of object security.

 This Python module helps implementers build such a CLI from any implementation
@@ -1862,7 +1862,7 @@ density maps, both for interactive and non-interactive use.")
      (home-page "https://github.com/jararias/mpsplines")
      (synopsis "Mean preserving interpolation with splines")
      (description
-       "This package implements a functionality for mean-preserving
+       "Thi package implements a functionality for mean-preserving
 interpolation of 1D data (for example, time series) with splines.")
      (license license:bsd-3))))

@@ -2067,7 +2067,7 @@ indices of @code{ndarrays}.")
                                  ;; AttributeError: 'Series' object has no
                                  ;; attribute 'iteritems'
                                  " and not test_kde_plot_df"
-                                  ;; Test is not deterministic and fails with
+                                  ;; Test is not determenistic and fails with
                                  ;; assertion not equal for DF array.
                                  " and not test_summary_df"))
      #:phases
@@ -3421,7 +3421,7 @@ cross-validation.")
              "--numprocesses" (number->string (min 4 (parallel-job-count)))
              "--pyargs" "scipy"
              "-k" (string-join
-                    ;; Network access is required.
+                    ;; Network access is requied.
                    (list "not test_ascent"
                          "test_electrocardiogram"
                          "test_existence_all"
@@ -3468,7 +3468,7 @@ cross-validation.")
            (lambda* (#:key test-flags tests? #:allow-other-keys)
              (when tests?
                ;; Step out of the source directory to avoid interference.
-                ;; See: <.github/workflows/linux.yml> for any other possible
+                ;; See: <.github/workflows/linux.yml> for any other posible
                ;; tests setup.
                (with-directory-excursion "/tmp"
                  (setenv "HOME" "/tmp")
@@ -3818,7 +3818,7 @@ depends on @code{scipy.sparse} for some computations.")
         "--deselect=tdda/test_tdda.py::TestPandasDataFrames::test_types_match")
      #:phases
      #~(modify-phases %standard-phases
-          ;; "datetime.UTC" is not available in Python 3.10 but in
+          ;; "datetime.UTC" is not availalbe in Python 3.10 but in
          ;; 3.11 it's present
          ;; <https://docs.python.org/3/library/datetime.html#datetime.UTC>.
          (add-after 'unpack 'fix-Python3.11-datetime.UTC
@@ -4263,7 +4263,7 @@ idea of the remaining amount of computation to be done.")
              "--ignore=tests/pyspark"
              ;; E ModuleNotFoundError: No module named 'sphinx'
              "--ignore=tests/pandas/test_docs_setting_column_widths.py"
-              ;; Network access is required.
+              ;; Nework access is required.
              "--ignore=tests/fastapi/test_app.py"
              ;; TypeError: __class__ assignment: 'GeoDataFrame' object layout
              ;; differs from 'DataFrame'
@@ -4271,7 +4271,7 @@ idea of the remaining amount of computation to be done.")
                    (list "not test_schema_model[data0-True]"
                          "test_schema_from_dataframe[data1-True]"
                          "test_schema_no_geometry"
-                          ;; The most of the tests from this group XFAIL or fail.
+                          ;; The most of the tests from this goup XFAIL or fail.
                          "test_pandas_stubs_false_positives")
                    " and not "))))
    (native-inputs
@@ -4797,7 +4797,7 @@ readable.")
    (arguments
     (list
      ;; TODO: Require vaex.server and others, which require vaex-core;
-      ;; implement bootstrapping.
+      ;; implement bootsrapping.
      #:tests? #f
      #:phases
      #~(modify-phases %standard-phases
@@ -5223,7 +5223,7 @@ objects.")
                             python-numba
                             python-numpy
                             python-scipy
-                             ;; [optional]
+                             ;; [optinal]
                             ;; python-jaxlib
                             ;; python-jax
                             #;python-llvmlite))
@@ -870,7 +870,7 @@ caching server.")
    (home-page "https://github.com/ImagingDataCommons/dicomweb-client")
    (synopsis "Python client for DICOMweb RESTful services")
    (description
-     "@code{dicomweb_client} provides client interfaces for DICOMweb RESTful
+     "@code{dicomweb_client} provides client intefaces for DICOMweb RESTful
 services QIDO-RS, WADO-RS and STOW-RS to search, retrieve and store
 DICOM objects over the web, respectively.")
    (license license:expat)))
@@ -1322,7 +1322,7 @@ Rate limits can be configured at different levels such as:
    (synopsis "Google Drive Public File/Folder Downloader")
    (description
     "This package implements a functionality to download large files
-recursively from Google Drive with option to filter them by file
+recursivly from Google Drive with option to filter them by file
 formats (PDF/XML/CSV).")
    (license license:expat)))

@@ -2653,7 +2653,7 @@ comes with a SOCKS proxy client.")
    (version "0.7.0")
    (source
     (origin
-       (method git-fetch)        ;no tests in PyPI archive
+       (method git-fetch)        ;no tests in PyPI archvie
       (uri (git-reference
              (url "https://github.com/vxgmichel/aiostream")
              (commit (string-append "v" version))))
@@ -3441,7 +3441,7 @@ classes
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; XXX: The last commit's tests are incompatible with the more recent
+      ;; XXX: The last commit's tests are uncompatible with the more recent
      ;; version of python-falcon.
      #:tests? #f))
    (native-inputs
@@ -4150,7 +4150,7 @@ Python HTTP implementation.")
 (define-public python-slixmpp
  (package
    (name "python-slixmpp")
-    (version "1.8.6") ; XXX: The latest version which does not require Rust
+    (version "1.8.6") ; XXX: The latest version which does not requrie Rust
    (source
     (origin
       (method git-fetch)
@@ -4393,7 +4393,7 @@ storage.")
        (base32 "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj"))))
    (build-system pyproject-build-system)
    (arguments
-     '(#:tests? #f))    ;tests depend on dated pytest-expect
+     '(#:tests? #f))    ;tests depent on dated pytest-expect
    (native-inputs
     (list python-setuptools))
    (propagated-inputs
@@ -4744,7 +4744,7 @@ the Trio framework}.")

 (define-public python-txacme
  ;; 0.9.3 tag was placed in 2020 and there a lot of changes providing
-  ;; compatibility with twisted, use the latest commit from trunk branch.
+  ;; compatibility wit twisted, use the latest commit from trunk branch.
  ;;
  ;;See: <https://github.com/twisted/txacme/issues/165>.
  (let ((commit "ac18f92f6dde971a6b38f2ecfae44665815db583")
@@ -7883,7 +7883,7 @@ basic TCP/IP protocols.")
 (define-public python-geventhttpclient
  (package
    (name "python-geventhttpclient")
-    (version "2.3.9")
+    (version "2.3.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -7893,7 +7893,7 @@ basic TCP/IP protocols.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1diq6n9sr92rsqbpxlbhbn1d22hrlzp6swykz9bfzh7sxpywa6j8"))))
+                "1ya0i0fbx054mfx5d1k75fcf64xzp7vva8lkwwzan41xbnc56nyj"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -8631,7 +8631,7 @@ this it tries to be opinion-free and very extendable.")
    (version "1.1.4")
    (source
     (origin
-       (method git-fetch)       ;no tests in PyPI archive
+       (method git-fetch)       ;no tests in PyPI archvie
       (uri (git-reference
              (url "https://github.com/Yelp/ephemeral-port-reserve")
              (commit (string-append "v" version))))
@@ -10778,7 +10778,7 @@ request/response web apps to larger, grown applications.")
    (license license:repoze)))

 (define-public python-pyramid-chameleon
-  ;; PyPI lacks a fresh release, use the latest commit associated with
+  ;; PyPI lacks a fresh release, use the latest commit assosiated with
  ;; unrleased version, see:
  ;; <https://github.com/Pylons/pyramid_chameleon/issues/27>
  (let ((commit "956c77ba37120c430e871c834d3cd4ed5ac8dccf")
@@ -10887,7 +10887,7 @@ Pyramid web framework.")
    (license license:repoze)))

 (define-public python-pyramid-mako
-  ;; 1.1.0 was released in 2019, there a lot of compatibility changes on
+  ;; 1.1.0 was released in 2019, there a lot of compatability changes on
  ;; master, us the latest commit for now.
  (let ((commit "1a6f4c00c7134530d2975f34d904b64a41b28b21")
        (revision "0"))
@@ -13486,7 +13486,7 @@ services until one succeeds.")
    (name "python-whitenoise")
    (version "6.9.0")
    (source (origin
-              (method git-fetch) ; PyPI missing test fails
+              (method git-fetch) ; PyPI missing test failes
              (uri (git-reference
                    (url "https://github.com/evansd/whitenoise")
                    (commit version)))
@@ -461,7 +461,7 @@ user.")
    (home-page "https://github.com/fastapi/annotated-doc")
    (synopsis "Annotated for some Python objects")
    (description
-     "This package implements a functionality for document parameters, class
+     "This package implements a funtionality for document parameters, class
 attributes, return types, and variables inline, with
 Annotated.")
    (license license:expat)))
@@ -704,7 +704,7 @@ line drawing algorithm}.")
           python-matplotlib python-pygments python-rich))
    (home-page "https://github.com/catppuccin/python")
    (synopsis "Pastel palette for Python libraries")
-    (description "Catppuccin for Python is a soothing pastel palette for Python
+    (description "Catppuccin for Python is a soothing pastel pallete for Python
 libraries.  It aims to be the middle ground between low and high contrast
 themes.  It also includes themes for IPython, Matplotlib, Pygments and Rich.")
    (license license:expat)))
@@ -1154,7 +1154,7 @@ implemented in pure Python, and most of them are also implemented in C.")
    (home-page "https://github.com/domdfcoding/domdf_python_tools")
    (synopsis "Helpful functions for Python")
    (description
-     "This package provide helpful functions for Python's testing and
+     "This package provide helpfull functions for Python's testing and
 packaging tasks.")
    (license license:expat)))

@@ -5560,7 +5560,7 @@ concepts.")
    (license license:bsd-3)))

 (define-public python-hdf5storage
-  ;; XXX: Use the latest commit containing compatibility with Pytest and Python
+  ;; XXX: Use the latest commit containing compatability with Pytest and Python
  ;; 3.11, see: <https://github.com/frejanordsiek/hdf5storage/issues/135>.
  ;;
  ;; This package probably is sun setting, consider to remove when stops
@@ -5618,7 +5618,7 @@ untrusted sources, pickling is avoided in this package.")
                    (substitute* "test_prctl.py"
                      ;; actual suffix used in cpython build output dir name
                      (("sys.version\\[0:3\\]") "sys.implementation.cache_tag")
-                      ;; test_no_new_privs assumes existence of /bin/ping, but
+                      ;; test_no_new_privs assumes existance of /bin/ping, but
                      ;; can never run anyway due to it requiring setuid ping.
                      ;; just short circuit it instead.
                      (("os.stat\\('/bin/ping'\\)\\.st_mode") "0")))))))
@@ -6270,7 +6270,7 @@ other machines, such as over the network.")
        (base32 "1xwqp37ii9kql49agmkipawjbndwxg6y8sxax1wc4l6kkaxvk9ap"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f))        ;require dated inputs
+     (list #:tests? #f))        ;requir dated inputs
    (native-inputs
     (list python-setuptools-scm))
    (propagated-inputs
@@ -6854,7 +6854,7 @@ files are easily readable and they work nicely with version control systems.")
         "0hi5rl17rj9gay7yw7ikrkyp5qhyw5bzp4ig1sj6ahzclsia8y1h"))))
    (build-system pyproject-build-system)
    (arguments
-     ;; It requires additional modules for integration tests.
+     ;; It requres additional modules for integration tests.
     (list #:test-flags #~(list "--ignore=tests/modules/")))
    (native-inputs
     (list python-pytest
@@ -9974,8 +9974,8 @@ naturally be used also by other projects.")
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
-                ;; TODO: Some acceptance failed and took near 30min to
-                ;; complete: 6765 tests, 6745 passed, 20 failed; find out how
+                ;; TODO: Some acceptance faile and took near 30min to
+                ;; complete: 6765 tests, 6745 passed, 20 failed; findout how
                ;; to skip failing ones.
                (format #t "Running unit tests...~%")
                (invoke "utest/run.py")))))))
@@ -13582,7 +13582,7 @@ that requires its specific capabilities.")
    (license license:bsd-3)))

 (define-public python-ffmpeg-python
-  ;; The latest release (0.2.0) is old and its test suite crashes on Python 3.10.
+  ;; The latest release (0.2.0) is old and its test suite crashs on Python 3.10.
  (package
    (name "python-ffmpeg-python")
    (properties '((commit . "df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6")
@@ -13643,7 +13643,7 @@ arguments.  It handles arbitrarily large (directed-acyclic) signal graphs.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      #:tests? #f       ;XXX: tests require network access to get FFmpeg data
+      #:tests? #f       ;XXX: tests requrie network access to get FFmpeg data
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'hardcode-ffmpeg
@@ -13730,7 +13730,7 @@ data, and scientific formats.")
      (synopsis "Generate pseudorandom numbers by using algebra")
      (description
       "The @code{pyudorandom} module lets you iterate over a list
-in a non-succsessive, yet deterministic way based on integer modulo.
+in a non-succsessive, yet deterministic way based on interger modulo.
 It comes in handy when you want to mix up the items, but don't need
 any guarantees of randomness.  It might be slow on small data,
 but shall be significantly faster than @code{random.shuffle}
@@ -16694,9 +16694,9 @@ markdown_py is also provided to convert Markdown files to HTML.")
            (lambda _
              (chdir "test"))))))
    (native-inputs
-     (list ;; python-pygments      ;optional, tests fail when added
-           ;; python-wavedrom      ;optional, not packaged
-           ;; python-latex2mathml  ;optional, not packaged
+     (list ;; python-pygments      ;optinal, tests fail when added
+           ;; python-wavedrom      ;optinal, not packaged
+           ;; python-latex2mathml  ;optinal, not packaged
           python-setuptools))
    (home-page "https://github.com/trentm/python-markdown2")
    (synopsis "Fast and complete Python implementation of Markdown")
@@ -17011,7 +17011,7 @@ It has a flexible system of @samp{authorizers} able to manage both
    (propagated-inputs
     (list python-appdirs
           python-pytz
-           python-six))         ;still hard integrated
+           python-six))         ;still hard itegrated
    (home-page "https://github.com/PyFilesystem/pyfilesystem2/")
    (synopsis "File system abstraction layer for Python")
    (description
@@ -17731,7 +17731,7 @@ implementations of ASN.1-based codecs and protocols.")
      #:test-flags
      #~(list "-k" (string-join
                    ;; Tests fail with error: IndexError: string index out of
-                    ;; range.  It may be some incompatibility with pyparsing,
+                    ;; range.  It may be some incompatability wit pyparsing,
                    ;; see <https://github.com/eerimoq/asn1tools/issues/167>.
                    (list "not test_c_source"
                          "test_command_line_generate_c_source_oer"
@@ -19391,7 +19391,7 @@ explicit subcommand name.")
       (sha256
        (base32 "03ay7j57mfh4sa8vh9qwid1ggwdc0lasyw3ycsmgv5r6z2j63an7"))))
    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f)) ;no tests in PyPI archive
+    (arguments (list #:tests? #f)) ;no tests in PyPI archvie
    (native-inputs
     (list python-hatch-vcs
           python-hatchling))
@@ -21595,7 +21595,7 @@ and makes it easier to build concurrent applications.")
        (sha256
          (base32 "18qx113g9bi1ac4indd5phma82zcdq601lxncp3vjn43m2mc3iq0"))))
    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f)) ;XXX: not tests in PyPI archive, there are in Git
+    (arguments (list #:tests? #f)) ;XXX: not tests in PyPI archvie, there are in Git
    (native-inputs
     (list python-setuptools
           python-wheel))
@@ -23055,21 +23055,16 @@ completes.")
 (define-public python-asyncinject
  (package
    (name "python-asyncinject")
-    (version "0.6.1")
+    (version "0.6")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/simonw/asyncinject")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "asyncinject" version))
       (sha256
-        (base32 "127ahb32x2qqjk17a667adrvrl63ima8khifq6dfm0q3vlfslxnn"))))
+        (base32 "0x57idiy19lzyn32klgm06r223z8gr2aqqk91gysbshq7jg8g3pf"))))
    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-pytest
-           python-pytest-asyncio
-           python-setuptools))
+    (native-inputs (list python-pytest python-pytest-asyncio
+                         python-setuptools python-wheel))
    (home-page "https://github.com/simonw/asyncinject")
    (synopsis
     "Run async workflows using pytest-fixtures-style dependency injection")
@@ -23971,7 +23966,7 @@ protocols written in pure Python.")
      #~(list "-k" "not test__version__from_git__shallow")
      #:phases
      #~(modify-phases %standard-phases
-          ;; These steps are taken from NixOS package definition:
+          ;; These steps are taked from NixOS package definition:
          ;; nixpkgs/pkgs/development/python-modules/dunamai/default.nix
          (add-before 'check 'pre-check
            (lambda _
@@ -25553,7 +25548,7 @@ created by running @code{python setup.py develop}).")
    (license license:expat)))

 ;; XXX: This project was archived by the owner on Oct 4, 2023. It is now
-;; read-only.  Consider to remove when nothing depends on it.
+;; read-only.  Consider to remvoe when nothing depends on it.
 (define-public python-ratelimiter
  ;; From https://github.com/RazerM/ratelimiter/pull/11
  (let ((commit "59a0827c434706d62b89e16a220e4ae12e618858")
@@ -25718,7 +25713,7 @@ Git.")
        (base32 "1h3nbg1nlshzrqy7vz4q4g9wbz85dqkn6385p0ad7kjj48ww9avx"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f))        ;tests require Cargo
+     (list #:tests? #f))        ;tests rquire Cargo
    (propagated-inputs
     (list python-semantic-version
           python-setuptools))
@@ -27371,7 +27366,7 @@ validation testing and application logic.")
    (license license:expat)))

 ;; Make sure to upgrade python-llvmlite in (gnu packages llvm) together with
-;; python-numba.  They have a very inflexible relationship.
+;; python-numba.  They have a very unflexible relationship.
 (define-public python-numba
  (package
    (name "python-numba")
@@ -27836,7 +27831,7 @@ values.  Partd excels at shuffling operations.")
      #:test-flags
      #~(list "--ignore=fsspec/implementations/tests/test_github.py"
              "-k" (string-join
-                    ;; Test requires nentwork access
+                    ;; Test requirs nentwork access
                    (list "not test_async_cat_file_ranges"
                          "test_gist_public_all_files"
                          "test_gist_public_missing_file"
@@ -32230,7 +32225,7 @@ syllables, and sentences.")
     (list python-chardet
           python-cssselect
           python-lxml
-           python-lxml-html-clean))    ;XXX: it should be part of python-lxml lib
+           python-lxml-html-clean))    ;XXX: it sould be part of python-lxml lib
    (home-page "http://github.com/buriy/python-readability")
    (synopsis "HTML to text parser")
    (description
@@ -33682,7 +33677,7 @@ It implements advanced Python dictionaries with dot notation access.")
                           python-wheel))
      (home-page "https://python-fields.readthedocs.io/")
      (synopsis "Python container class boilerplate killer")
-      (description "Avoid repetitive boilerplate code in Python classes.")
+      (description "Avoid repetetive boilerplate code in Python classes.")
      (license license:bsd-3))))

 (define-public python-aspectlib
@@ -34841,7 +34836,7 @@ parsing.")

 (define-public python-flatten-json
  ;; The latest version was not tagged on GitHub, PyPI provides no tests, use
-  ;; the commit associated with 0.1.14 version.
+  ;; the commit assosiated with 0.1.14 version.
  (let ((commit "900c4feebcfcd831ddb6143c4b246024ecf911ec")
        (revision "0"))
    (package
@@ -35327,7 +35322,7 @@ colors.")
           #~(modify-phases %standard-phases
               ;; This package requires python-packaging~=23.1 which is not yet
               ;; updated to. As per pyproject.toml, it is required to provide
-               ;; a nice version_info object.
+               ;; a nice version_info opbject.
               ;; TODO: After updating python-packaging, fix this.
               (delete 'sanity-check))))
    (propagated-inputs (list python-importlib-metadata python-packaging))
@@ -36798,7 +36793,7 @@ as possible in order to be comprehensible and easily extensible.")
 (define-public python-tables
  (package
    (name "python-tables")
-    ;; XXX: Compatibility fix for numexpr 2.13.0, see:
+    ;; XXX: Compatability fix for numexpr 2.13.0, see:
    ;; <https://github.com/PyTables/PyTables/pull/1256>.
    (properties '((commit . "aad9079c80ce3ae7f385d00af760d171dcc10535")
                  (revision . "0")))
@@ -37725,7 +37720,7 @@ to TIFF, BigTIFF, and ImageJ hyperstack compatible files.")
    (license license:expat)))

 (define-public python-timeout-decorator
-  ;; TODO: Remove when python-requests-caches releases a fresh version dropping
+  ;; TODO: Remove when python-requests-caches releses a fresh version dropping
  ;; it, see, <https://github.com/requests-cache/requests-cache/pull/1111>.
  (package
    (name "python-timeout-decorator")
@@ -39645,7 +39640,7 @@ features useful for text console applications.")
  python-urwid)            ;may be removed after 2025-11-12

 (define-public python-urwid-for-zulip-term
-  ;; zulip-term@0.7.0 requires exact 2.1.2 version otherwise some tests fail
+  ;; zulip-term@0.7.0 requires exact 2.1.2 version otherewise some tests fail
  ;; to pass, remove when no longer required.
  (hidden-package
   (package
@@ -39979,7 +39974,7 @@ store, forked from redis-py.")
         "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f))        ;no tests in PyPI archive
+     (list #:tests? #f))        ;no tests in PyPI archvie
    (native-inputs
     (list python-setuptools))
    (home-page "https://github.com/habnabit/vcversioner")
@@ -4366,7 +4366,7 @@ linux/libcurl_wrapper.h"
              (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
                (("libudev.so.1")
                 (search-input-file inputs "lib/libudev.so.1")))
-              ;; Patch the location of the X11 keyboard layouts.
+              ;; Patch the location of the X11 keywoard layouts.
              (substitute* "src/3rdparty/chromium/ui/events/ozone/layout/xkb\
 /xkb_keyboard_layout_engine.cc"
                (("/usr/share/X11/xkb")
@@ -5028,7 +5028,7 @@ top of the PyQt bindings for Qt.  PyQt-builder is used to build PyQt itself.")
                (("--cov-report=term-missing") "")
                (("--cov-report=xml") "")))))))
    ;; XXX: Do not include, even supported: Qt5, PySide2 PySide6, only test
-    ;; against Qt6 to reduce closure size..
+    ;; agains Qt6 to reduce closure size..
    (native-inputs
     (list python-pyqt-6
           python-pytest
@@ -5085,7 +5085,7 @@ bindings (PySide, PySide2, PyQt4 and PyQt5).")
@item Multi-handle slider for float values
@item Spinbox with arbitrarily large integers
@item Magnitude combined with unit dropdown
-@item Label that will elide text
+@item Label that willl elide text
@item Searchable ComboBox populated from Enum
@item Searchable List
@item Searchable Tree
@@ -103,7 +103,7 @@
 ;; development.)
 ;;
 ;; The top-level 'Makefile' is more like a directory of scripts: it has
-;; convenience targets for developing Racket, and it cooperates with the
+;; convienience targets for developing Racket, and it cooperates with the
 ;; 'distro-build' package to assemble custom Racket distributions. (Again,
 ;; the makefile just delegates to Zuo.) It is not part of Racket source
 ;; distributions: the root of a source distribution is basically 'racket/src'
@@ -178,7 +178,7 @@
 ;; README file applies to all such subsystems:
 ;;
 ;;     The Racket version must be practically the same as the current Racket
-;;     version, although it can be the Racket BC implementation (instead of
+;;     verson, although it can be the Racket BC implementation (instead of
 ;;     the Racket CS implementation).
 ;;
 ;;     Unlike Chez Scheme boot files, the files generated in "schemified"
@@ -197,7 +197,7 @@
 ;; Zuo is notably *not* a problem for bootstrapping. The implementation is a
 ;; single hand-written C file designed to build with just `cc -o zuo zuo.c`,
 ;; even with very old or limited compilers. (We use the Autoconf support for
-;; convenience.) As of Zuo 1.8, Zuo has tagged releases in its own repository
+;; convienience.) As of Zuo 1.8, Zuo has tagged releases in its own repository
 ;; independent of the Racket release cycle.
 ;;
 ;; CODE:
@@ -2013,7 +2013,7 @@ operators.")
         ;; kernel specific headers.
         "-DBUILD_DRIVERS_LIMEPCIE=false"
         ;; Specify the udev rules installation path into
-         ;; the output profile.
+         ;; the ouput profile.
         (string-append "-DUDEV_RULES_INSTALL_PATH="
                        #$output "/lib/udev/rules.d")
         ;; Do not reload udev rules after build.
@@ -256,7 +256,7 @@ Turtle/N3 and read them in SPARQL XML, RDF/XML and Turtle/N3.")
    (license license:lgpl2.1+))) ; or any choice of gpl2+ or asl2.0

 (define-public redland
-  ;; XXX: No tags for the last release, although it's clear from
+  ;; XXX: No tags for the last release, altough it's clear from
  ;; Github and logs a new release has been made.
  (let ((commit "3ec9bda623107f9b1c86c0a3f261ffd3f8a40965")
        (revision "0"))
@@ -242,7 +242,7 @@ and in-process/in-memory compilation.")
     (list rocm-comgr rocminfo))
    (synopsis "ROCm HIP Runtime")
    (description "HIP language runtime, allowing execution of HIP kernels
-on AMD hardware, with library support for in-process/in-memory
+on AMD harware, with library support for in-process/in-memory
 compilation (hipclr) of HIP kernel code, and its execution on AMD hardware.")
    (license license:expat)))

@@ -425,7 +425,7 @@ particular CPU vendor or architecture.")
                (("find_program\\(LD_LLD_PATH ld\\.lld\\)")
                 "#find_program(LD_LLD_PATH ld.lld)"))))
          ;; This is just cosmetic and removes superfluous rpath entries
-          ;; involving a nonexistent relative llvm/lib path.
+          ;; involving a nonexistant relative llvm/lib path.
          ;; XXX: RUNPATH checks are okay with $ORIGIN, but it looks like
          ;; other packages are removing it altogether -- what to do?
          (add-after 'unpack 'remove-dubious-rpath
@@ -268,7 +268,7 @@ HTTP/2-based RPC framework gRPC.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      #:tests? #f       ;XXX: no tests in PyPI, try to build from Git
+      #:tests? #f       ;XXX: no tests in PyPI, try to bulid from Git
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'configure
@@ -812,7 +812,7 @@ configured correctly.

 Serverspec tests your servers’ actual state by executing command locally, via
 SSH, via WinRM, via Docker API and so on.  So you don’t need to install any
-agent software on your servers and can use any configuration management
+agent softwares on your servers and can use any configuration management
 tools, Puppet, Ansible, CFEngine, Itamae and so on.

 But the true aim of Serverspec is to help refactoring infrastructure code.")
@@ -2888,7 +2888,7 @@ extensions.")
      #~(modify-phases %standard-phases
          ;; tests: 393 runs, 42523 assertions, 0 failures, 0 errors, 20 skips
          ;;
-          ;; TODO: Implement #:test-flags in ruby-build-system and figure out
+          ;; TODO: Impliment #:test-flags in ruby-build-system and figure out
          ;; how to skip tests more elegant.
          (add-after 'unpack 'skip-failing-tests
            (lambda _
@@ -9477,7 +9477,7 @@ variable length integers (varint) in Ruby Protocol Buffers.")
    (native-inputs (list ruby-rspec ruby-rspec-block-is-expected))
    (synopsis "Improved @code{Version} module for Ruby")
    (description "VersionGem aims to provide introspection of a @code{Version}
-module based on a @code{Version::VERSION} constant string while not interfering
+module based on a @code{Version::VERSION} constant string wile not interfering
 with gemspec parsing where the @code{VERSION} string is traditionally used.")
    (home-page "https://gitlab.com/oauth-xx/version_gem")
    (license license:expat)))
@@ -11902,7 +11902,7 @@ part of the Prawn PDF generator.")
                ;; zombie process reaping (see:
                ;; https://issues.guix.gnu.org/30948).
                ;; Many of these tests seem to only fail on the 'cli' portion
-                ;; due to something causing them to hang indefinitely
+                ;; due to something causing them to hang indefinately
                (skip-tests "test/test_plugin.rb"
                            "test_plugin")
                (skip-tests "test/test_plugin_systemd.rb"
@@ -1399,7 +1399,7 @@ defaults for 80% of the use cases.")
 (define-public forgejo-cli
  (package
    (name "forgejo-cli")
-    (version "0.5.0")
+    (version "0.4.1")
    (source
     (origin
       (method git-fetch)
@@ -1408,7 +1408,7 @@ defaults for 80% of the use cases.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1x3v56my22lckrpkcnpmf90vrn8m45ysdn0k12dfssldr8cjxapa"))))
+        (base32 "1279cvdbgvl8yaqrxm8mg1swqn623xdfqjx13s9clrxp923zjrmm"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -2863,7 +2863,7 @@ touchscreen devices.")
        #:phases
        #~(modify-phases %standard-phases
            (add-after 'unpack 'set-cc
-              ;; Tests assume `cc' is available in PATH, but Guix does not
+              ;; Tests assume `cc' is avaliable in PATH, but Guix does not
              ;; provide that with the `gcc' or `clang' packages.
              (lambda _
                (substitute* '("tests/integration/build_description_tests.rs"
@@ -132,7 +132,7 @@
       (replace "rustc-bootstrap" base-rust)
       (replace "cargo-bootstrap" (list base-rust "cargo"))))))

-;;; Note: mrustc's only purpose is to be able to bootstrap Rust; it's designed
+;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed
 ;;; to be used in source form.
 (define %mrustc-commit "06b87d1af49d2db3bd850fdee8888055dd540dd1")
 (define %mrustc-source
@@ -1273,8 +1273,7 @@ contactless (RFID) and contact USB chipcard readers.")
       (sha256
        (base32 "1by4jnr3sx4s8sxv1iw8ja9iln3aw6k583kdl3r92cbcdfasm7xj"))
       (patches (search-patches "qdigidoc-bundle-config-files.patch"
-                                "qdigidoc-bundle-tsl-files.patch"
-                                "qdigidoc-fix-icon.patch"))))
+                                "qdigidoc-bundle-tsl-files.patch"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -511,14 +511,14 @@ POSIX Shell}, @url{https://www.gnu.org/software/bash/, Bash}, and
 (define-public starship
  (package
    (name "starship")
-    (version "1.25.0")
+    (version "1.24.2")
    (source
     (origin
       (method url-fetch)
       (uri (crate-uri "starship" version))
       (file-name (string-append name "-" version ".tar.gz"))
       (sha256
-        (base32 "0l0104a7f0ad636fzhybssjl76c5axkx241qq0f7f051kg34l5nj"))))
+        (base32 "0q57nb66fww6c8kwfyl5dpv9c2gr721nbbqcpsrh9c6wd6c26339"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -573,14 +573,22 @@ POSIX Shell}, @url{https://www.gnu.org/software/bash/, Bash}, and
           '())
       (list git-minimal)))
    (home-page "https://starship.rs")
-    (synopsis "Fast and customizable shell prompt")
+    (synopsis
+     "The minimal, blazing-fast, and infinitely customizable prompt for any shell!")
    (description
-     "Starship is a shell prompt that is fast and configurable, and works on
-most common shells. It shows information from various sources in a way easy to
-grasp at a glance, including but not limited to: the hostname/username/cwd trio,
-git, project language and runtime.
+     "This package provides The minimal, blazing-fast, and infinitely customizable
+prompt for any shell!

-Note: Users must have a nerd font installed and enabled in their terminal.")
+@itemize
+@item Fast: it's fast - *really really* fast :rocket:
+@item Customizable: configure every aspect of your prompt
+@item Universal: works on any shell, on any operating system
+@item Intelligent: shows relevant information at a glance
+@item Feature rich: support for all your favorite tools
+@item Easy: quick to install - start using it in minutes
+@end itemize
+
+Note: users must have a nerd font installed and enabled in their terminal")
    (license license:isc)))

 (define-public envstore
@@ -536,7 +536,7 @@ applications.")
 (define-public garage
  (package
    (name "garage")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method git-fetch)
@@ -545,7 +545,7 @@ applications.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "12zigcvnv662lk31gh30hg37ljnclkgmrfxaivivyp50a5lxr88a"))
+        (base32 "0nqda782by02ybqv44lpjagn3aqsgpaszvqbicg9iz3lymj8g9ai"))
       (snippet
        #~(begin (use-modules (guix build utils))
                 (delete-file-recursively "doc")))))
@@ -566,10 +566,6 @@ applications.")
                        "syslog"
                        "telemetry-otlp")
      #:install-source? #f
-      #:modules
-      '((guix build cargo-build-system)
-        (guix build utils)
-        (ice-9 match))
      #:phases
      #~(modify-phases %standard-phases
           ;; The 'check phase doesn't honor #:features
@@ -596,31 +592,10 @@ applications.")
                           "--features" (string-join features)))
                 (if (null? cargo-install-paths)
                     '(".")
-                     cargo-install-paths))))
-           (add-after 'install 'install-completions
-             (lambda* (#:key native-inputs #:allow-other-keys)
-               (for-each
-                (match-lambda
-                  ((shell . path)
-                   (mkdir-p (in-vicinity #$output (dirname path)))
-                   (let ((binary
-                          (if #$(%current-target-system)
-                              (search-input-file native-inputs "bin/garage")
-                              (in-vicinity #$output "bin/garage"))))
-                     (with-output-to-file (in-vicinity #$output path)
-                       (lambda _
-                         (invoke binary "completions" shell))))))
-                '(("bash"   . "share/bash-completion/completions/garage")
-                  ("elvish" . "share/elvish/lib/garage")
-                  ("fish"   . "share/fish/vendor_completions.d/garage.fish")
-                  ("zsh"    . "share/zsh/site-functions/_garage"))))))))
-    (native-inputs
-     (append (if (%current-target-system)
-                 (list this-package)
-                 '())
-             (list nss-certs-for-test
-                   pkg-config
-                   protobuf)))
+                     cargo-install-paths)))))))
+    (native-inputs (list nss-certs-for-test
+                         pkg-config
+                         protobuf))
    (inputs
     (cons* libsodium
            lmdb
@@ -822,7 +822,7 @@ your calls and messages.")
              (substitute* "self-test.mak"
                ;; Fails with: pjlib-util-test-x86_64-unknown-linux-gnu:
                ;; ../src/pjlib-util-test/resolver_test.c:1501: action2_1:
-                ;; Assertion `pj_strcmp2(&pkt->q[0].name, "_sip._udp."
+                ;; Assertio n `pj_strcmp2(&pkt->q[0].name, "_sip._udp."
                ;; "domain2.com")==0' failed.
                ((" pjlib_util_test ") ""))
              (substitute* "pjsip/src/test/test.h"
@@ -405,69 +405,6 @@ multi-seat support, a replacement for @command{mingetty}, and more.")
    (supported-systems (filter (cut string-suffix? "-linux" <>)
                               %supported-systems))))

-;;; INFO: kmscon-8 is a dependency of Guix System installer. When upgrading,
-;;; remember to test it; you can fire a VM by following the procedure below:
-;;;
-;;; 1. Manually change `(gnu system install)' module so that in procedure
-;;;    `%installation-services' the key `guix-for-system' refers to `guix'
-;;;    instead of `(current-guix)'.
-;;;    With this temporary change, you will need neither to rebuild guix
-;;;    nor to have commit rights.
-;;;
-;;; 2. Execute `./pre-inst-env guix system vm gnu/system/install.scm' in the
-;;;    development environment.
-;;;
-(define-public kmscon-8
-  (let ((commit "db868619fbb785f184f38c729cd4842012ef4478")
-        (revision "2"))
-    (package
-      (inherit kmscon)
-      (name "kmscon")
-      (version (git-version "8" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/kmscon/kmscon")
-                (commit commit)))
-         (sha256
-          (base32
-           "0rj3icrfm584pq3916div0chd9h3gxwd1qgw7inf5x508yvgrgxl"))
-         (file-name (git-file-name name version))
-         (patches
-          ;; INFO: This Guix-specific patch is useful for making keyboard
-          ;; selection in Guix System installer work as intended.
-          ;; TODO: port it to 9.x series.
-          (search-patches "kmscon-8-runtime-keymap-switch.patch"))))
-      (build-system gnu-build-system)
-      (arguments
-       (list
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-before 'configure 'remove-systemd
-              ;; Use elogind instead of systemd.
-              (lambda _
-                (substitute* "configure"
-                  (("libsystemd-daemon libsystemd-login")
-                   "libelogind"))
-                (substitute* "src/uterm_systemd.c"
-                  (("#include <systemd/sd-login.h>")
-                   "#include <elogind/sd-login.h>")
-                  ;; We don't have this header.
-                  (("#include <systemd/sd-daemon\\.h>")
-                   "")
-                  ;; Replace the call to 'sd_booted' by the truth value.
-                  (("sd_booted\\(\\)")
-                   "1")))))))
-      (native-inputs
-       (list autoconf
-             automake
-             libtool
-             pkg-config
-             ;; to generate the man page
-             docbook-xsl
-             libxslt)))))
-
 (define-public libtermkey
  (package
    (name "libtermkey")
@@ -1,7 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
 ;;; Copyright © 2015-2022, 2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
@@ -43,7 +42,6 @@
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright © 2025 Junker <dk@junkeria.club>
 ;;; Copyright © 2025 benjamin wil <hey@benjaminwil.info>
-;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2026 Ignatius Menzies <ignatius.menzies@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -94,7 +92,6 @@
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages datastructures)
-  #:use-module (gnu packages dbm)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages enchant)
  #:use-module (gnu packages fontutils)
@@ -990,90 +987,6 @@ justifying, auto-indentation, bracket matching, interactive search-and-replace
 (with regular expressions), and the editing of multiple files.")
    (license license:gpl3+))) ; some files are under GPLv2+

-(define-public nvi
-  (package
-    (name "nvi")
-    (version "1.81.6")
-    (source
-     (origin
-       (method url-fetch)
-       ;; The home-page does not provide the latest version.
-       (uri (string-append "http://harrier.slackbuilds.org/misc/nvi-"
-                           version ".tar.bz2"))
-       (sha256
-        (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
-       (patches (search-patches "nvi-assume-preserve-path.patch"
-                                "nvi-dbpagesize-binpower.patch"
-                                "nvi-add-function-prototypes.patch"
-                                "nvi-db4.patch"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Create a wrapper for the configure script, make it executable.
-        #~(let ((conf-wrap (open-output-file "configure")))
-            (display "#!/bin/sh" conf-wrap)
-            (newline conf-wrap)
-            (display
-              "../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@"
-              conf-wrap)
-            (newline conf-wrap)
-            (close-output-port conf-wrap)
-            (chmod "configure" #o0755)
-
-            ;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
-            ;; to the internal PTY allocation logic.
-            (substitute* "ex/ex_script.c"
-              (("#ifdef HAVE_SYS5_PTY")
-               "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:out-of-source? #t
-      #:configure-flags
-      #~'("--enable-widechar"
-          #$@(if (%current-target-system)
-                 '("vi_cv_sprintf_count=yes")
-                 '()))
-      #:make-flags
-      #~(list
-         ;; Add CFLAGS to relax gcc-14's strictness.
-         ;; nvi's configure chokes on passing CFLAGS and ignores
-         ;; CFLAGS set in the environment.
-         (string-append "CFLAGS=-g -O2"
-                        " -Wno-error=incompatible-pointer-types"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'fix-configure
-            (lambda* (#:key inputs native-inputs #:allow-other-keys)
-              ;; Replace outdated config.sub and config.guess:
-              (with-directory-excursion "dist"
-                (for-each
-                 (lambda (file)
-                   (chmod file #o755)
-                   (install-file
-                    (format #f "~a/share/automake-~a/~a"
-                            (assoc-ref (or native-inputs inputs)
-                                       "automake")
-                            #$(version-major+minor
-                               (package-version automake))
-                            file)
-                    "."))
-                 '("config.sub" "config.guess"))))))))
-    (inputs (list bdb ncurses))
-    (native-inputs
-     (list automake)) ;Up to date 'config.guess' and 'config.sub'.
-    (synopsis "The Berkeley Vi Editor")
-    (description
-     "Vi is the original screen based text editor for Unix systems.  It
-is considered the standard text editor, and is available on almost all
-Unix systems.  Nvi is intended as a \"bug-for-bug compatible\" clone of
-the original BSD vi editor.  As such, it doesn't have a lot of snazzy
-features as do some of the other vi clones such as elvis and vim.
-However, if all you want is vi, this is the one to get.")
-    (home-page
-     (string-append "https://sites.google.com/a/bostic.com/keithbostic/"
-                    "the-berkeley-vi-editor-home-page"))
-    (license license:bsd-3)))
-
 (define-public qemacs
  (package
    (name "qemacs")
@@ -105,7 +105,7 @@ counts forward or for just showing the current time.")
 (define-public time
  (package
    (name "time")
-    (version "1.10")
+    (version "1.9")
    (source
     (origin
       (method url-fetch)
@@ -113,7 +113,7 @@ counts forward or for just showing the current time.")
                           version ".tar.gz"))
       (sha256
        (base32
-         "1hq9vvam1bi8xz9d09xgj2fdxbmq1psii1hywiw897armfs9zhp8"))))
+         "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v"))))
    (build-system gnu-build-system)
    (home-page "https://www.gnu.org/software/time/")
    (synopsis "Run a command, then display its resource usage")
@@ -562,7 +562,7 @@ time, a duration, a timezone, but not a range or interval.")
    (arguments
     (list
      ;; tests: 106 passed, 1 deselected
-      ;;
+      ;; 
      ;; TODO: Guix has lower python-pytz than required in the latest
      ;; version:  pytz.exceptions.UnknownTimeZoneError:
      ;; 'America/Ciudad_Juarez'
@@ -68,7 +68,6 @@
 ;;; Copyright © 2025 Matthew Elwin <elwin@northwestern.edu>
 ;;; Copyright © 2025 Roman Scherer <roman@burningswell.com>
 ;;; Copyright © 2026 Ingar <ingar@onionmail.info>
-;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -92,7 +91,6 @@
  #:use-module (guix deprecation)
  #:use-module (guix gexp)
  #:use-module (guix download)
-  #:use-module (guix fossil-download)
  #:use-module (guix git-download)
  #:use-module (guix hg-download)
  #:use-module (guix build-system cargo)
@@ -113,7 +111,6 @@
  #:use-module (gnu packages bash)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages boost)
-  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages check)
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
@@ -3522,74 +3519,6 @@ output of the @code{git} command.")
 modification time.")
    (license license:bsd-2)))

-(define-public libfossil
-  (let ((ci "914ed6dcaff13bf7209c9f27ccfb77c2d8fdf36b8d2133aa1590258b0708f035")
-        (revision "0"))
-    (package
-      (name "libfossil")
-      (version (fossil-version "0.6.0" revision ci))
-      (source
-       (origin
-         (method fossil-fetch)
-         (uri (fossil-reference
-               (uri "https://fossil.wanderinghorse.net/r/libfossil")
-               (check-in ci)))
-         (file-name (fossil-file-name name version))
-         (sha256
-          (base32 "0a0ycnnba2izmiqjj8hgvjgjdwhpn0x36lhy3vmw4j7bhny0df52"))
-         (patches (search-patches "libfossil-skip-amalgamation.patch"))
-         (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-all-but "autosetup" "proj.tcl" "wh-common.tcl")
-              (delete-file-recursively "extsrc")
-              ;; Re-create Fossil check-out manifests,
-              ;; whose content does not affect in semantics.
-              (for-each
-                (lambda (file)
-                  (call-with-output-file file (const #t)))
-                '("manifest" "manifest.uuid"))))))
-      (build-system gnu-build-system)
-      (arguments
-       (list #:configure-flags
-             #~(list "--no-debug" "--no-fnc" ;TODO: C++ and Tcl binding?
-                     (string-append "--with-sqlite="
-                                    #$(this-package-input "sqlite"))
-                     (string-append "--soname=libfossil.so"))
-             #:phases
-             #~(modify-phases %standard-phases
-                 (replace 'configure
-                   (lambda* (#:key configure-flags #:allow-other-keys)
-                     (apply invoke "autosetup"
-                            (string-append "--prefix=" #$output)
-                            configure-flags)))
-                 (replace 'check
-                   (lambda* (#:key tests? #:allow-other-keys)
-                     (when tests?
-                       (substitute* "sanity-checks.sh"
-                         ;; FIXME: these tests requires a Fossil checkout.
-                         (("\\./f-sanity.*") "")
-                         (("\\./f-parseparty.*") ""))
-                       (setenv "LD_LIBRARY_PATH" (getcwd))
-                       (invoke "./sanity-checks.sh")))))))
-      (native-inputs (list autosetup))
-      (inputs (list sqlite-next zlib))
-      (home-page "https://fossil.wanderinghorse.net/r/libfossil")
-      (synopsis "Unofficial Fossil SCM Library API")
-      (description
-       "@code{libfossil} is an alternative interface into Fossil repositories,
-as opposed to a replacement for the core fossil application,
-intended for new ways to access and manipulate fossil repositories.")
-      (license license:bsd-2))))
-
 (define-public fnc
  (package
    (name "fnc")
@@ -93,7 +93,7 @@
 (define-public vim
  (package
    (name "vim")
-    (version "9.2.0333")
+    (version "9.2.0232")
    (source
     (origin
       (method git-fetch)
@@ -102,7 +102,7 @@
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "15qmligkgrzsp8c88i8cmji6vjvq5wmf3hjw2g8lz7dh9i901xdx"))))
+        (base32 "0z5b77qq5rmddf42f8sqd4sbf81y1r8d9i9f0naczb9bz762wx0r"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -169,7 +169,6 @@
                             "sh_15.sh"
                             "sh_bash.bash"
                             "sh_bash_alias.sh"
-                             "sh_functions_bash.sh"
                             "sh_sundrous.bash")))))
           (add-before 'install 'fix-installman.sh
             (lambda _
@@ -1653,13 +1653,13 @@ tiled on several screens.")
 (define-public ghc-xmobar
  (package
    (name "ghc-xmobar")
-    (version "0.48.1")
+    (version "0.50")
    (source (origin
              (method url-fetch)
              (uri (hackage-uri "xmobar" version))
              (sha256
               (base32
-                "1infcisv7l00a4z4byjwjisg4yndk0cymibfii1c7yzyzrlvavhl"))))
+                "026s0q718z89vzjgva19vg58dm1l016i67mzi0wbj7kgai89w909"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "xmobar")))
    (native-inputs
@@ -4535,7 +4535,7 @@ read and write, and compatible with JSON.")
 (define-public labwc
  (package
    (name "labwc")
-    (version "0.9.7")
+    (version "0.9.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -4544,7 +4544,7 @@ read and write, and compatible with JSON.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "12mm4w9djgh7q30lswhl1q1cxf6h0pf8xr744jkcyjcqqsavynpf"))))
+                "0v8gv539jl8qnzjh9d91gpk03gn1xkc8i8xl33gs9k2x46fx1jyy"))))
    (build-system meson-build-system)
    (native-inputs
     (list pkg-config gettext-minimal scdoc))
@@ -76,7 +76,6 @@
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Untrusem <mysticmoksh@riseup.net>
 ;;; Copyright © 2026 VnPower <vnpower@loang.net>
-;;; Copyright © 2026 Sughosha <sughosha@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3200,7 +3199,7 @@ introspection files (Python, Vala, etc, see using the library below).")
 (define-public wl-color-picker
  (package
    (name "wl-color-picker")
-    (version "1.4")
+    (version "1.3")
    (home-page "https://github.com/jgmdev/wl-color-picker")
    (source (origin
              (method git-fetch)
@@ -3210,7 +3209,7 @@ introspection files (Python, Vala, etc, see using the library below).")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0z0pmfk99zicny9308zf4b4aygrb6r6c6zc8296l080zjhxiwkmv"))))
+                "0h5b8qfwri7a1invk8dran3436ac37x6r8fic3l5cxqj5rgnky4n"))))
    (build-system copy-build-system)
    (arguments
     `(#:install-plan '(("wl-color-picker.sh" "bin/wl-color-picker")
@@ -3219,25 +3218,17 @@ introspection files (Python, Vala, etc, see using the library below).")
                         "share/icons/hicolor/scalable/apps/")
                        ("wl-color-picker.desktop" "share/applications/"))
       #:phases (modify-phases %standard-phases
-                  (add-after 'install 'wrap-program
+                  (add-after 'install 'wrap-script
                    (lambda* (#:key outputs #:allow-other-keys)
                      (wrap-program (string-append (assoc-ref outputs "out")
                                                   "/bin/wl-color-picker")
                                    `("PATH" =
-                                      (,(dirname (which "convert"))
-                                       ,(dirname (which "cut"))
-                                       ,(dirname (which "grep"))
-                                       ,(dirname (which "grim"))
-                                       ,(dirname (which "notify-send"))
-                                       ,(dirname (which "slurp"))
-                                       ,(dirname (which "wl-copy"))
-                                       ,(dirname (which "zenity"))))))))))
-    (inputs (list bash-minimal
-                  coreutils-minimal
+                                      (,(getenv "PATH")))))))))
+    (inputs (list coreutils-minimal
+                  bash-minimal
                  grim
                  hicolor-icon-theme
                  imagemagick
-                  libnotify
                  slurp
                  wl-clipboard
                  zenity))
@@ -303,6 +303,9 @@
                      (guix-build-coordinator build-allocator)
                      (guix-build-coordinator coordinator))

+         (setvbuf (current-output-port) 'line)
+         (setvbuf (current-error-port) 'line)
+
         (simple-format #t "starting the guix-build-coordinator:\n  ~A\n"
                        (current-filename))
         (let* ((hooks
@@ -1139,6 +1142,9 @@ ca-certificates.crt file in the system profile."
           (use-modules (bffe)
                        (bffe manage-builds))

+           (setvbuf (current-output-port) 'line)
+           (setvbuf (current-error-port) 'line)
+
           (simple-format #t "starting the bffe:\n  ~A\n"
                          (current-filename))

@@ -895,18 +895,16 @@ requirements.
 If @var{config} contains SMB mounts, adds samba-nmbd and samba-winbindd to the
 service requirements.
 "
-  (fold
-   (lambda (fs-type acc)
-     (cond
-      ((string= "nfs" fs-type)
-       (append acc '(rpc.statd)))
-      ((string= "smb" fs-type)
-       (append acc '(samba-nmbd samba-winbindd)))
-      (else acc)))
-   '()
-   (delete-duplicates
-    (map autofs-map-entry-type
-         (autofs-configuration->raw-entries config)))))
+  (delete-duplicates
+   (fold
+    (lambda (fs-type acc)
+      (cond
+       ((string= "nfs" fs-type)
+        (append acc '(rpc.statd)))
+       ((string= "smb" fs-type)
+        (append acc '(samba-nmbd samba-winbindd)))))
+    '()
+    (map autofs-map-entry-type (autofs-configuration->raw-entries config)))))

 (define (autofs-shepherd-service config)
  (match-record config <autofs-configuration> (autofs timeout)
@@ -62,6 +62,7 @@
  #:use-module (gnu packages less)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages man)
+  #:use-module (gnu packages nvi)
  #:use-module (gnu packages package-management)
  #:use-module (gnu packages pciutils)
  #:use-module (gnu packages texinfo)
@@ -63,7 +63,6 @@
  #:use-module (gnu packages guile)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages package-management)
-  #:use-module (gnu packages terminals)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages xorg)
  #:use-module (ice-9 match)
@@ -465,7 +464,6 @@ or by starting the installer, using `guix-system-installer` command.

         (service kmscon-service-type
                  (kmscon-configuration
-                    (kmscon kmscon-8)
                    (virtual-terminal "tty1")
                    (login-program installer)))

@@ -1,59 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Nguyễn Gia Phong <cnx@loang.net>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-;;; Commentary:
-;;;
-;;; This is the build-side support code of (guix fossil-download).
-;;; It allows a Fossil repository to be opened at a specific revision.
-;;;
-;;; Code:
-
-(define-module (guix build fossil)
-  #:use-module (guix build utils)
-  #:use-module (ice-9 match)
-  #:use-module (srfi srfi-26)
-  #:use-module (srfi srfi-34)
-  #:use-module (srfi srfi-35)
-  #:use-module (web uri)
-  #:export (fossil-fetch))
-
-(define* (fossil-fetch uri check-in file #:key (fossil-command "fossil"))
-  "Fetch CHECK-IN from URI into DIRECTORY.  CHECK-IN must be a valid
-Fossil check-in name.  Return #t on success, else raise an exception."
-  (setenv "FOSSIL_HOME" "/tmp")
-  (invoke fossil-command
-    "tarball" check-in file "-R"
-    (case (uri-scheme (string->uri-reference uri))
-      ((file https)                     ;clone the repository first
-       (match-let ((repository (simple-format #f "/tmp/~a.fossil"
-                                 (basename file ".tar.gz")))
-                   ((input . output) (pipe)))
-         ;; Trust the TLS certificate of the server,
-         ;; since we'll later verify the tarball's checksum.
-         (display "y" output)
-         (close-port output)
-         (with-input-from-port input
-           (cut invoke fossil-command "clone"
-                "--no-open" "--once" uri repository))
-         (close-port input)
-         repository))
-      ((ssh)                            ;TODO: authentication for SSH
-       (let ((message (string-append "fetching a Fossil repository through SSH"
-                                     " is not supported: " uri)))
-         (raise (condition (&message (message message))))))
-      ((#f) uri))))                     ;local file
@@ -84,7 +84,6 @@ and parameters ~s~%"
         (lib (assoc-ref outputs "lib"))
         (name-version (strip-store-file-name out))
         (extra-dirs (filter-map (cut assoc-ref inputs <>) extra-directories))
-         (ghc-path (getenv "GHC_PACKAGE_PATH"))
         (params `(,(string-append "--prefix=" out)
                   ,(string-append "--libdir=" (or lib out) "/lib")
                   ,(string-append "--docdir=" (or doc out)
@@ -120,9 +119,7 @@ and parameters ~s~%"
    ;; <https://www.haskell.org/cabal/users-guide/developing-packages.html>.
    (when (file-exists? "configure")
      (setenv "CONFIG_SHELL" "sh"))
-    (run-setuphs "configure" params)
-
-    (setenv "GHC_PACKAGE_PATH" ghc-path)))
+    (run-setuphs "configure" params)))

 (define* (build #:key parallel-build? #:allow-other-keys)
  "Build a given Haskell package."
@@ -1,125 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Nguyễn Gia Phong <cnx@loang.net>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-;;; Commentary:
-;;;
-;;; An <origin> method that open Fossil checkout at a specific version.
-;;; The repository URI and version are specified
-;;; with a <fossil-reference> object.
-;;;
-;;; Code:
-
-(define-module (guix fossil-download)
-  #:use-module (guix build-system)
-  #:use-module (guix gexp)
-  #:use-module (guix modules)
-  #:use-module (guix monads)
-  #:use-module (guix packages)
-  #:use-module (guix records)
-  #:use-module (guix store)
-  #:use-module (ice-9 match)
-  #:use-module (srfi srfi-34)
-  #:use-module (srfi srfi-35)
-  #:use-module (web uri)
-  #:export (fossil-reference
-            fossil-reference?
-            fossil-reference-uri
-            fossil-reference-check-in
-
-            fossil-fetch
-            fossil-version
-            fossil-file-name))
-
-(define-record-type* <fossil-reference>
-  fossil-reference make-fossil-reference fossil-reference?
-  (uri      fossil-reference-uri)
-  (check-in fossil-reference-check-in))
-
-(define (fossil-version version revision check-in)
-  "Return the version string for packages using fossil-download."
-  ;; fossil-version is almost exclusively executed while modules
-  ;; are being loaded, leading to any errors hiding their backtrace.
-  ;; Avoid the mysterious error "Value out of range 0 to N: 10"
-  ;; when the check-in ID is too short, which can happen, for example,
-  ;; when the user swapped the revision and check-in arguments by mistake.
-  (when (< (string-length check-in) 10)
-    (raise
-      (condition
-       (&message (message "fossil-version: check-in ID unexpectedly short")))))
-  (string-append version "-" revision "." (string-take check-in 10)))
-
-(define (fossil-file-name name version)
-  "Return the file-name for packages using fossil-download."
-  (string-append name "-" version ".tar.gz"))
-
-(define* (fossil-fetch ref hash-algo hash
-                       #:optional name
-                       #:key (system (%current-system))
-                             (guile (default-guile))
-                             (fossil (@* (gnu packages version-control)
-                                         fossil)))
-  "Return a fixed-output derivation that fetches REF, a <fossil-reference>
-object.  The output is expected to have recursive hash HASH of type
-HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
-  (let* ((modules (source-module-closure '((guix build fossil)
-                                           (guix build download)
-                                           (guix build download-nar))))
-         (uri (fossil-reference-uri ref))
-         (scheme-of-uri (uri-scheme (string->uri-reference uri)))
-         (check-in (fossil-reference-check-in ref))
-         (tarball-name (or name (fossil-file-name (basename uri) check-in)))
-         (tarball-url (and (eq? 'https scheme-of-uri)
-                           (simple-format #f "~a/tarball/~a/~a"
-                             uri check-in tarball-name)))
-         (guile-json (@* (gnu packages guile) guile-json-4))
-         (gnutls (@* (gnu packages tls) guile-gnutls))
-         (guile-lzlib (@* (gnu packages guile) guile-lzlib))
-         (build
-          (with-imported-modules modules
-            (with-extensions (list guile-json gnutls ;for (guix swh)
-                                   guile-lzlib)
-              #~(begin
-                  (use-modules (guix build fossil)
-                               ((guix build download)
-                                #:select (download-method-enabled? url-fetch))
-                               (guix build download-nar))
-                  (or (and (download-method-enabled? 'upstream)
-                           (or (and #$tarball-url
-                                    (url-fetch #$tarball-url #$output))
-                               (fossil-fetch
-                                #$(if scheme-of-uri uri (local-file uri))
-                                #$check-in
-                                #$output
-                                #:fossil-command
-                                #+(file-append fossil "/bin/fossil"))))
-                      (and (download-method-enabled? 'nar)
-                           (download-nar #$output))))))))
-    (mlet %store-monad ((guile (package->derivation guile system)))
-      (gexp->derivation tarball-name build
-                        #:leaked-env-vars '("http_proxy" "https_proxy"
-                                            "COLUMNS" "USER")
-                        #:env-vars (match (getenv "GUIX_DOWNLOAD_METHODS")
-                                     (#f '())
-                                     (value
-                                      `(("GUIX_DOWNLOAD_METHODS" . ,value))))
-                        #:system system
-                        #:hash-algo hash-algo
-                        #:hash hash
-                        #:recursive? #t
-                        #:guile-for-build guile
-                        #:local-build? #t))))
@@ -29,7 +29,7 @@

 (define %vcs-directories
  ;; Directory used for determining the kind of VCS.
-  (list ".bzr" ".git" ".hg" ".jj" ".svn" "CVS"))
+  (list ".bzr" ".git" ".hg" ".svn" "CVS"))

 (define* (vcs-file? file stat
                    #:optional
@@ -50,7 +50,7 @@
  (make-parameter "https://www.stackage.org/api/v1/snapshot"))

 ;; Latest LTS version compatible with current GHC.
-(define %default-lts-version "20.26")
+(define %default-lts-version "24.9")

 (define-json-mapping <stackage-lts> make-stackage-lts
  stackage-lts?
@@ -2,7 +2,6 @@
 ;;; Copyright © 2012-2013, 2015-2020, 2022, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Remco van 't Veer <remco@remworks.net>
-;;; Copyright © 2026 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -141,9 +140,6 @@ current one."

        (option '("vacuum-database") #f #f
                (lambda args
-                  (unless (zero? (getuid))
-                    (leave
-                      (G_ "vacuuming the database can only be used by root~%")))
                  (vacuum-database)
                  (exit 0)))

@@ -347,7 +347,7 @@ test "`guix build superseded -d`" = "`guix build bar -d`"

 # Parsing package names and versions.
 guix build -n time		# PASS
-guix build -n time@1.10	# PASS, version found
+guix build -n time@1.9		# PASS, version found
 guix build -n time@3.2 && false	# FAIL, version not found
 guix build -n something-that-will-never-exist && false	# FAIL
Author	SHA1	Message	Date
Saku Laesvuori	f0a9b062ac	gnu: packages: Update haskell packages to current Stackage * gnu/packages/patches/ghc-chell-quickcheck-enable-qc-2.15.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/dhall.scm (...): Update Haskell packages to current Stackage. * gnu/packages/finance.scm (...): As above. * gnu/packages/haskell-apps.scm (...): As above. * gnu/packages/haskell-check.scm (...): As above. * gnu/packages/haskell-crypto.scm (...): As above. * gnu/packages/haskell-web.scm (...): As above. * gnu/packages/wm.scm (...): As above. * gnu/packages/haskell-xyz.scm (...): As above. (ghc-chell-quickcheck): Patch testsuite to work with current quickcheck. Change-Id: I8c8bea6755121706c46606a658cba8b590780fe1 FIXUP add the chell patch Change-Id: I5efc8f467efe85b038cd44b18acbb27826036484 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>	2026-04-15 13:17:38 +02:00
Saku Laesvuori	03401147f2	guix: import: stackage: Update default LTS version to 24.9 * guix/import/stackage.scm (%default-lts-version): Update to 24.9. Change-Id: I4bd431ef79d0ecf28b9a10c46847f1d59f670c89 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>	2026-04-15 13:14:06 +02:00
Saku Laesvuori	b4f7c683cd	haskell-build-system: Do not re-set GHC_PACKAGE_PATH after configure The Cabal shipped with GHC 9.10 refuses to run tests if GHC_PACKAGE_PATH is set. Since Cabal anyway uses the package database that it was given in configure, this environment variable is not needed for any later phases and we may just unset it. * guix/build/haskell-build-system.scm (configure): Do not set GHC_PACKAGE_PATH after unsetting it. Change-Id: I5b2c662c31d84be79eb39688d6dd43285fbddcb3 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>	2026-04-15 13:14:06 +02:00
Saku Laesvuori	b87ca9a3d5	gnu: ghc: Update to version 9.10.2 * gnu/packages/haskell.scm (ghc): Update to ghc-9.10 Change-Id: I40da6cacc4d260902cd66d7d626375038fba4346 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>	2026-04-15 13:14:06 +02:00
Saku Laesvuori	97f8dd37cd	gnu: Add ghc-9.10 * gnu/packages/haskell.scm (ghc-9.10): New variable. Change-Id: I4e4c9c4b8f135936a52ff8df16924f50de4ce726 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>	2026-04-15 13:14:06 +02:00
Saku Laesvuori	f63700e8d3	gnu: Add ghc-9.8 * gnu/packages/haskell.scm (ghc-9.8): New variable. Change-Id: I6883ed973bdd1d6eaf981605c1bc8f855f850187 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>	2026-04-15 13:14:06 +02:00
Saku Laesvuori	e8c35a2d49	gnu: ghc-9.4: Fix build for bootstrapping GHC 9.8's Hadrian The testsuite driver's worker thread pool gets filled with zombie processes which causes it to hang and the build to time out. No idea what might be causing that, but as 9.4 is only used to build later GHC versions it should be enough that they pass their testsuites. * gnu/packages/haskell.scm (ghc-9.4): Downgrade to 9.4.3 for bootstrapping GHC 9.8's hadrian. <arguments>[#:tests?]: Set to #f to disable failing testsuite. Change-Id: I2c889f5fc7a6898562fcb8377fc1f582ad835434 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>	2026-04-15 13:14:06 +02:00
Saku Laesvuori	eda1a86685	gnu: patches: Fix recomp015 test in GHC testsuite * gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch: Append non-executable stack marker to ManySections.s instead of replacing the entire file with it. Change-Id: I3c3cfbeb1a156412db7b4a633db2030fb0f0ee30 Signed-off-by: Lars-Dominik Braun <lars@6xq.net>	2026-04-15 13:14:05 +02:00