gnu: ghc-haskeline: Fix build

* gnu/packages/haskell-xyz.scm (ghc-haskeline): Update to version 0.8.4.1. [native-inputs]: Add which. [phases]: Add example binary to PATH before running tests. Change-Id: I0c006c89b766397dd144da76ae20c5326ad776f4 Signed-off-by: Andreas Enge <andreas@enge.fr>
gnu: ghc-selective: Fix build
2026-04-28 06:34:05 +00:00 · 2026-04-20 17:10:23 +02:00 · 2026-04-20 17:10:23 +02:00 · 2026-04-20 17:10:23 +02:00 · 2026-04-20 17:10:23 +02:00 · 2026-04-20 17:10:23 +02:00
204 changed files with 41662 additions and 20875 deletions
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -141,6 +141,7 @@
   (eval . (put 'substitute* 'scheme-indent-function 1))
   (eval . (put 'match-record 'scheme-indent-function 3))
   (eval . (put 'match-record-lambda 'scheme-indent-function 2))
+   (eval . (put 'with-fluids 'scheme-indent-function 2))

   ;; TODO: Contribute these to Emacs' scheme-mode.
   (eval . (put 'let-keywords 'scheme-indent-function 3))
--- a/Makefile.am
+++ b/Makefile.am
@@ -802,17 +802,17 @@ EXTRA_DIST +=						\
  etc/manifests/upgrade.scm				\
  scripts/guix.in					\
  tests/cve-sample.json					\
-  tests/keys/civodul.pub				\
-  tests/keys/dsa.pub					\
-  tests/keys/ed25519-2.pub				\
-  tests/keys/ed25519-2.sec				\
-  tests/keys/ed25519-3.pub				\
-  tests/keys/ed25519-3.sec				\
-  tests/keys/ed25519.pub				\
-  tests/keys/ed25519.sec				\
-  tests/keys/rsa.pub					\
-  tests/keys/signing-key.pub				\
-  tests/keys/signing-key.sec				\
+  tests/keys/openpgp/civodul.pub			\
+  tests/keys/openpgp/dsa.pub				\
+  tests/keys/openpgp/ed25519-2.pub			\
+  tests/keys/openpgp/ed25519-2.sec			\
+  tests/keys/openpgp/ed25519-3.pub			\
+  tests/keys/openpgp/ed25519-3.sec			\
+  tests/keys/openpgp/ed25519.pub			\
+  tests/keys/openpgp/ed25519.sec			\
+  tests/keys/openpgp/rsa.pub				\
+  tests/keys/openpgp/signing-key.pub			\
+  tests/keys/openpgp/signing-key.sec			\
  tests/test.drv					\
  $(TESTS)

--- a/1
+++ b/1
@@ -18,6 +18,7 @@ Please send Guix bug reports to bug-guix@gnu.org.
 ** Distribution
 *** GNOME updated to version 48
 *** New service for Fossil SCM
+*** TeX Live updated to 2026.1

 * Changes in 1.5.0 (since 1.4.0)
 ** Package management
--- a/build-aux/test-env.in
+++ b/build-aux/test-env.in
@@ -73,8 +73,8 @@ then
 	# Copy the keys so that the secret key has the right permissions (the
 	# daemon errors out when this is not the case.)
 	mkdir -p "$GUIX_CONFIGURATION_DIRECTORY"
-	cp "@abs_top_srcdir@/tests/keys/signing-key.sec"	\
-	   "@abs_top_srcdir@/tests/keys/signing-key.pub"	\
+	cp "@abs_top_srcdir@/tests/keys/openpgp/signing-key.sec"	\
+	   "@abs_top_srcdir@/tests/keys/openpgp/signing-key.pub"	\
 	   "$GUIX_CONFIGURATION_DIRECTORY"
 	chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec"
    fi
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19148,6 +19148,10 @@ swap file is encrypted because the entire device is encrypted.
@xref{Swap Space}, or @xref{Preparing for Installation,,Disk
 Partitioning}, for an example.

+When using GRUB as the bootloader, the LUKS password is only requested
+once: GRUB passes the master key to the initial RAM disk automatically.
+@xref{Bootloader Configuration, Automatic LUKS Master Key Passing}, for
+details.

@end defvar

@@ -48868,49 +48872,56 @@ This option in enabled by default.  In some cases involving the
 in RAM, it can be handy to disable the option by setting it to
@code{#f}.

+@subsubheading Automatic LUKS Master Key Passing
+
+When booting from a LUKS-encrypted device using GRUB, the password is
+normally requested twice: once by GRUB to access @file{/boot}, and a
+second time by the initial RAM disk to mount the root file system.
+
+When GRUB's @code{cryptomount} command unlocks a LUKS device, GRUB
+retains the volume's master key in memory.  The @code{cryptodisk}
+module exposes these master keys via a GRUB-internal virtual file
+system called @dfn{procfs}, accessible as @code{(proc)/luks_script}.
+Each line of this virtual file has the form:
+
+@example
+luks_mount @var{uuid} @var{offset} @var{sector-size} @var{cipher-mode-iv} @var{hex-master-key}
+@end example
+
+@noindent
+(or @code{luks2_mount} for LUKS2 volumes).
+
+When the store resides on an encrypted device, the generated GRUB
+configuration automatically injects this virtual file into the initial
+RAM disk using GRUB's @code{newc:} initrd prefix---a documented
+mechanism for synthesizing a CPIO archive on the fly
+(@pxref{GNU/Linux,,, grub, GNU GRUB manual}).  The resulting initrd
+line is equivalent to:
+
+@example
+initrd newc:etc/luks_script:(proc)/luks_script @dots{} /boot/initrd
+@end example
+
+@noindent
+The initial RAM disk then reads @file{/etc/luks_script}, looks up the
+matching UUID, and calls @command{cryptsetup open --volume-key-file} to
+unlock the device without prompting for a password a second time.  If
+the master key is missing or does not match, the system falls back to
+an interactive password prompt, so this mechanism is transparent to the
+user.
+
+No configuration is required: GRUB's @code{procfs} and @code{luks}
+modules are loaded automatically when encrypted devices are declared
+via @code{luks-device-mapping} (@pxref{Mapped Devices}).
+
@item @code{extra-initrd} (default: @code{#f})
 File name of an additional initrd to load during the boot.  It may or
 may not point to a file in the store, but the main use case is for
 out-of-store files containing secrets.

-In order to be able to provide decryption keys for LUKS devices, they
-need to be available in the initial RAM disk.  However they cannot be
-stored inside the usual initrd, since it is stored in the store and
-being world-readable (as files in the store are) is not a desired
-property for an initrd containing decryption keys.  You can therefore
-use this field to instruct GRUB to also load a manually created initrd
-not stored in the store.
-
 For any use case not involving secrets, you should use regular initrd
 (@pxref{operating-system Reference, @code{initrd}}) instead.

-Suitable image can be created for example like this:
-
-@example
-echo /key-file.bin | cpio -oH newc >/key-file.cpio
-chmod 0000 /key-file.cpio
-@end example
-
-After it is created, you can use it in this manner:
-
-@lisp
-;; Operating system with encrypted boot partition
-(operating-system
-  @dots{}
-  (bootloader (bootloader-configuration
-               (bootloader grub-efi-bootloader)
-               (targets '("/boot/efi"))
-               ;; Load the initrd with a key file...
-               (extra-initrd "/key-file.cpio")))
-  (mapped-devices
-   (list (mapped-device
-          (source (uuid "12345678-1234-1234-1234-123456789abc"))
-          (target "my-root")
-          (type luks-device-mapping)
-          ;; ... and use it to unlock the root device.
-          (arguments '(#:key-file "/key-file.bin"))))))
-@end lisp
-
 Be careful when using this option, since pointing to a file that is not
 readable by the grub while booting will cause the boot to fail and
 require a manual edit of the initrd line in the grub menu.
@@ -51652,6 +51663,63 @@ phone-number = 0
 is-married = true
@end example

+@subsubsection Serializing to environment variables
+@cindex environment variables, serialization of configuration records
+
+There are services which expect their configuration as environment variables.
+The @code{(gnu services configuration environment-variables)} module provides
+facilities to serialize configuration records from
+@code{(gnu services configuration)} to list of pairs representing environment
+variables.
+
+For example this configuration record:
+
+@lisp
+(define-configuration/no-serialization server
+  (ssh-port
+   (number 22)
+   "The public SSH port of the server.")
+  (fqdn
+   (maybe-string)
+   "The fully qualified domain name of the server.")
+  (active?
+   (boolean #f)
+   "Whether or not the server should be activated."))
+
+(define my-server
+ (server
+  (ssh-port 20022)
+  (active? #t)))
+@end lisp
+
+with this call:
+
+@lisp
+(serialize-environment-variables my-server server-fields
+                                 #:true-value "1"
+                                 #:false-value "0")
+@end lisp
+
+would yield:
+
+@lisp
+'(("SSH_PORT" . "20022")
+  ("ACTIVE" . "1"))
+@end lisp
+
+@anchor{serialize-environment-variables-procedure}
+@deffn {Procedure} serialize-environment-variables @var{config} @var{fields} @
+         [@var{selection} #f] [@var{negate?} #f] [#:prefix #f] @
+         [#:true-value "true"] [#:false-value "false"]
+Serializes the fields whose name is included in SELECTION from CONFIG, a
+configuration from @code{(gnu services configuration)}, and FIELDS, the
+list of its field records, to a list of pairs.  When NEGATE? is #t all services
+not included in SELECTION will be serialized.  Each  pair represents an
+environment variable.  The first element of each pair is the variable name, the
+second is the value.  When PREFIX is a string it is prepended to the variable
+name.  TRUE-VALUE and FALSE-VALUE will be used as a representation for
+respectfully @code{#t} and @code{#f}.
+@end deffn

@c *********************************************************************
@cindex troubleshooting, Guix System
--- a/etc/teams/hpc/mpi-manifest.scm
+++ b/etc/teams/hpc/mpi-manifest.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2026 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; 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/>.
+
+;; This manifest lists all MPI-related packages: useful for 'guix refresh',
+;; 'guix build', etc.
+
+(use-modules (guix)
+             (gnu packages fabric-management)
+             (gnu packages linux)
+             (gnu packages mpi)
+             (gnu packages parallel))
+
+;; The packages below are what constitutes the MPI stack: helper libraries,
+;; interconnect drivers, and MPI implementations.
+(packages->manifest
+ (list cassini-headers
+       cxi-driver
+       hwloc
+       libcxi
+       libfabric
+       mpich
+       openmpi-5
+       openpmix
+       opensm
+       prrte
+       psm
+       psm2
+       rdma-core
+       ucx))
--- a/etc/teams/tex/tex-manifest.scm
+++ b/etc/teams/tex/tex-manifest.scm
@@ -26,7 +26,6 @@

 (define %sundry-texlive-packages
  (list bibtool
-        dvisvgm
        rubber
        texmaker
        texstudio
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -404,7 +404,10 @@ when booting a root file system on a Btrfs subvolume."
              (initrd (normalize-file (menu-entry-initrd entry)
                                      device-mount-point
                                      store-directory-prefix))
-              (extra-initrd (bootloader-configuration-extra-initrd config)))
+              (extra-initrd (bootloader-configuration-extra-initrd config))
+              (luks-script-initrd
+               (and (pair? store-crypto-devices)
+                    "newc:etc/luks_script:(proc)/luks_script")))
          ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point.
          ;; Use the right file names for LINUX and INITRD in case
          ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a
@@ -412,14 +415,20 @@ when booting a root file system on a Btrfs subvolume."

          ;; When STORE-DIRECTORY-PREFIX is defined, prepend it the linux and
          ;; initrd paths, to allow booting from a Btrfs subvolume.
+
+          ;; When the store is on an encrypted device, inject GRUB's
+          ;; (proc)/luks_script into the initrd as /etc/luks_script so the
+          ;; initrd can use the already-decrypted master key to open LUKS
+          ;; volumes without prompting for the password a second time.
          #~(format port "menuentry ~s {
  ~a
  linux ~a ~a
-  initrd ~a ~a
+  initrd ~a ~a ~a
 }~%"
                    #$label
                    #$(grub-root-search device linux)
                    #$linux (string-join (list #$@arguments))
+                    (or #$luks-script-initrd "")
                    (or #$extra-initrd "")
                    #$initrd)))
       (multiboot-kernel
@@ -464,7 +473,7 @@ menuentry ~s {
          ;; Other type of devices aren't implemented.
          #~()))
    (let ((devices (map crypto-device->cryptomount store-crypto-devices))
-          (modules #~(format port "insmod luks~%insmod luks2~%")))
+          (modules #~(format port "insmod procfs~%insmod luks~%insmod luks2~%")))
      (if (null? devices)
          devices
          (cons modules devices))))
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -56,6 +56,7 @@
 # Copyright © 2022 Alex Griffin <a@ajgrf.com>
 # Copyright © 2022 ( <paren@disroot.org>
 # Copyright © 2022, 2026 jgart <jgart@dismail.de>
+# Copyright © 2022-2023, 2025-2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 # Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
 # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
 # Copyright © 2023 Andy Tai <atai@atai.org>
@@ -216,6 +217,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/convmv.scm			\
  %D%/packages/codex.scm				\
  %D%/packages/coq.scm				\
+  %D%/packages/coreboot.scm			\
  %D%/packages/cpio.scm				\
  %D%/packages/cpp.scm 				\
  %D%/packages/cppi.scm				\
@@ -423,6 +425,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/kde-utils.scm			\
  %D%/packages/kerberos.scm			\
  %D%/packages/kodi.scm				\
+  %D%/packages/kubernetes.scm	        	\
  %D%/packages/language.scm			\
  %D%/packages/lc0.scm			\
  %D%/packages/lean.scm				\
@@ -737,6 +740,8 @@ GNU_SYSTEM_MODULES =				\
  %D%/services/cgit.scm			\
  %D%/services/ci.scm				\
  %D%/services/configuration.scm		\
+  %D%/services/configuration/environment-variables.scm		\
+  %D%/services/configuration/utils.scm		\
  %D%/services/containers.scm   		\
  %D%/services/cuirass.scm			\
  %D%/services/cups.scm				\
@@ -1034,6 +1039,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/azr3.patch				\
  %D%/packages/patches/azr3-remove-lash.patch			\
  %D%/packages/patches/barony-fix-textures.patch		\
+  %D%/packages/patches/bam-python3-compat.patch		\
  %D%/packages/patches/bash-completion-directories.patch	\
  %D%/packages/patches/bash-linux-pgrp-pipe.patch		\
  %D%/packages/patches/basis-universal-unbundle-libs.patch	\
@@ -1169,6 +1175,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/curlftpfs-fix-memory-leak.patch		\
  %D%/packages/patches/curlftpfs-fix-no_verify_hostname.patch	\
  %D%/packages/patches/cursynth-wave-rand.patch			\
+  %D%/packages/patches/cvc5-reproducible-build.patch		\
  %D%/packages/patches/cvs-CVE-2017-12836.patch		\
  %D%/packages/patches/cyrus-sasl-fix-time-h.patch              \
  %D%/packages/patches/d-feet-drop-unused-meson-argument.patch	\
@@ -1446,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		\
@@ -1650,7 +1658,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/inkscape-libxml2.patch		\
  %D%/packages/patches/instead-use-games-path.patch		\
  %D%/packages/patches/intltool-perl-compatibility.patch	\
-  %D%/packages/patches/inetutils-hurd64.patch			\
  %D%/packages/patches/insight-toolkit-fix-build.patch			\
  %D%/packages/patches/irrlicht-use-system-libs.patch		\
  %D%/packages/patches/irrlicht-link-against-needed-libs.patch	\
@@ -1682,7 +1689,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/jfsutils-gcc-compat.patch		\
  %D%/packages/patches/jfsutils-include-systypes.patch		\
  %D%/packages/patches/john-the-ripper-jumbo-with-gcc-11.patch	\
-  %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch		\
  %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch		\
  %D%/packages/patches/jsonnet-include-cstdint-for-gcc-13-builds.patch	\
  %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch	\
@@ -1808,7 +1814,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch	\
  %D%/packages/patches/libquicktime-ffmpeg.patch 		\
  %D%/packages/patches/libsepol-versioned-docbook.patch		\
-  %D%/packages/patches/libskk-fix-invalid-escape.patch		\
  %D%/packages/patches/libsoup-auth-digest-fix-crash.patch      \
  %D%/packages/patches/libsoup-deadlock-in-add_listener_in_thread.patch \
  %D%/packages/patches/libsoup-fix-merge-of-ranges.patch        \
@@ -1979,6 +1984,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch	\
  %D%/packages/patches/nix-dont-build-html-doc.diff		\
  %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch	\
+  %D%/packages/patches/neovim-tree-sitter-grammar-path.patch	\
  %D%/packages/patches/network-manager-plugin-ownership.patch	\
  %D%/packages/patches/network-manager-plugin-path.patch	\
  %D%/packages/patches/newlib-getentropy.patch			\
@@ -2109,6 +2115,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-random2-getrandbits-test.patch		\
  %D%/packages/patches/python-pillow-use-zlib-1.3.patch	\
  %D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch	\
+  %D%/packages/patches/python-pynvim-fix-test-command-error.patch	\
  %D%/packages/patches/python-pypytools-python-3-fixes.patch	\
  %D%/packages/patches/python-pyreadstat-link-libiconv.patch	\
  %D%/packages/patches/python-sip-include-dirs.patch	\
@@ -2335,7 +2342,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/rapidcheck-fix-libs.patch		\
  %D%/packages/patches/ratpoison-shell.patch			\
  %D%/packages/patches/retroarch-unbundle-spirv-cross.patch	\
-  %D%/packages/patches/rct-add-missing-headers.patch		\
  %D%/packages/patches/readline-link-ncurses.patch		\
  %D%/packages/patches/renpy-python-3.11-compat.patch			\
  %D%/packages/patches/renpy-fix-integer-slots.patch			\
@@ -2345,7 +2351,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/r-sapa-lapack.patch			\
  %D%/packages/patches/ripperx-missing-file.patch		\
  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
-  %D%/packages/patches/rtags-separate-rct.patch			\
  %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch	\
  %D%/packages/patches/racket-chez-scheme-bin-sh.patch		\
  %D%/packages/patches/racket-launcher-config-dir.patch		\
@@ -2378,12 +2383,12 @@ dist_patch_DATA =						\
  %D%/packages/patches/ruby-flores-fix-deprecations.patch	\
  %D%/packages/patches/ruby-latex-decode-fix-test.patch		\
  %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
-  %D%/packages/patches/ruby-pg-fix-connect-timeout.patch	\
  %D%/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch \
  %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch	\
  %D%/packages/patches/rust-1.70-fix-rustix-build.patch	\
  %D%/packages/patches/rust-1.78-unwinding-fix.patch		\
  %D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch	\
+  %D%/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch	\
  %D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-timeout.patch	\
@@ -2518,10 +2523,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
  %D%/packages/patches/unity-test-set-subdir-correctly.patch		\
  %D%/packages/patches/unity-test-support-int64.patch		\
+  %D%/packages/patches/ungoogled-chromium-custom-compiler.patch 	\
+  %D%/packages/patches/ungoogled-chromium-empty-parsed-rustc-args.patch	\
  %D%/packages/patches/ungoogled-chromium-extension-search-path.patch	\
  %D%/packages/patches/ungoogled-chromium-RUNPATH.patch		\
  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\
-  %D%/packages/patches/ungoogled-chromium-unbundle-icu-target.patch     \
  %D%/packages/patches/unknown-horizons-python-3.8-distro.patch	\
  %D%/packages/patches/unknown-horizons-python-3.9.patch	\
  %D%/packages/patches/unknown-horizons-python-3.10.patch	\
@@ -2622,6 +2628,17 @@ dist_patch_DATA =						\
  %D%/packages/patches/yggdrasil-extra-config.patch	\
  %D%/packages/patches/ypsilon-Use-GNU-toolchain-as-default.patch	\
  %D%/packages/patches/zabbix-agent2-test-timezone-fix.patch	\
+  %D%/packages/patches/zed-0.225.10-add-message-notification-action.patch \
+  %D%/packages/patches/zed-0.225.10-add-guix-container-support.patch	\
+  %D%/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch	\
+  %D%/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch		\
+  %D%/packages/patches/zed-0.225.10-disable-dlopen.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-test-db-isolation.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-workspace-race.patch	\
+  %D%/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch	\
+  %D%/packages/patches/zed-0.225.10-remove-patch-crates-io.patch	\
+  %D%/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch	\
  %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch	\
  %D%/packages/patches/zig-0.9-fix-runpath.patch		\
  %D%/packages/patches/zig-0.9-riscv-support.patch		\
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1302,14 +1302,14 @@ re-executing them as necessary.")
 (define-public inetutils
  (package
    (name "inetutils")
-    (version "2.5")
+    (version "2.7")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/inetutils/inetutils-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "0q1257ci22g2jbdiqs00mharc1lqkbibdlkhj23f3si6qjxkn17s"))))
+                "11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1340,17 +1340,7 @@ re-executing them as necessary.")
                             "\\\""))
      ;; On some systems, 'libls.sh' may fail with an error such as:
      ;; "Failed to tell switch -a apart from -A".
-      #:parallel-tests? #f
-      #:phases (if (target-hurd64?)
-                   #~(modify-phases %standard-phases
-                       (add-after 'unpack 'apply-hurd64-patch
-                         (lambda _
-                           (let ((patch
-                                  #$(local-file
-                                     (search-patch
-                                      "inetutils-hurd64.patch"))))
-                             (invoke "patch" "--force" "-p1" "-i" patch)))))
-                   #~%standard-phases)))
+      #:parallel-tests? #f))
    (inputs
     (list coreutils
           shadow                     ;for login (used in telnetd and rlogind)
@@ -1373,7 +1363,7 @@ hostname.")
 (define-public shadow
  (package
    (name "shadow")
-    (version "4.13")
+    (version "4.19.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1381,7 +1371,7 @@ hostname.")
                    "download/" version "/shadow-" version ".tar.xz"))
              (sha256
               (base32
-                "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))
+                "0crbcfdp7ayyii33srinwd0yr27dkx9mbzglx1d0mvhr1z28xclw"))))
    (build-system gnu-build-system)
    (arguments
     `(;; Assume System V `setpgrp (void)', which is the default on GNU
@@ -1390,7 +1380,9 @@ hostname.")
       '(,@(if (target-hurd?)
             '()
             '("--with-libpam"))
-          "shadow_cv_logdir=/var/log"
+         "--disable-logind" ;; no systemd
+         "--without-libbsd" ;; no libbsd
+         "shadow_cv_logdir=/var/log"
          "ac_cv_func_setpgrp_void=yes")
       #:phases
       (modify-phases %standard-phases
@@ -1426,15 +1418,8 @@ hostname.")
             ;; The top-level Makefile.am wrongfully has "SUBDIRS += man"
             ;; under "if ENABLE_REGENERATE_MAN", even though prebuilt man
             ;; pages are available.  Thus, install them manually.
-             (invoke "make" "-C" "man" "install")))
-         (add-after 'install-man-pages 'remove-groups
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Remove `groups', which is already provided by Coreutils.
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (man (string-append out "/share/man")))
-               (delete-file (string-append bin "/groups"))
-               (for-each delete-file (find-files man "^groups\\."))))))))
+             (invoke "make" "-C" "man" "install"))))))
+    (native-inputs (list pkg-config))
    (inputs
     (append (if (target-hurd?)
                 '()
@@ -3156,7 +3141,7 @@ track changes in important system configuration files.")
 (define-public libcap-ng
  (package
    (name "libcap-ng")
-    (version "0.9")
+    (version "0.9.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3165,12 +3150,20 @@ track changes in important system configuration files.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0izrrh2kmhi6dcy5iqcccmx90nwlaqcglhc60sl8n5ds8il14pi8"))))
+                "13iy7dddcslpmmdhybgvfcgznsvpaa4r3fp9ldlpkq592lw8yyva"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:configure-flags
-       (list "--disable-static"
-             "--without-python")))
+     (list
+      #:configure-flags
+      #~(list "--disable-static"
+              "--without-python")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-configure-ac
+            (lambda _
+              (substitute* "configure.ac"
+                (("linux/sock_diag.h" all)
+                 (string-append all " \\"))))))))
    (inputs
     (list libbpf))
    (native-inputs
--- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@ -1,9 +1,4 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -22,162 +17,20 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages adns)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages m4)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix utils))
+  #:use-module (gnu packages dns)
+  #:use-module (guix deprecation))

-(define-public adns
-  (package
-    (name "adns")
-    (version "1.6.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
-              (commit (string-append "adns-" version))))
-       (sha256
-        (base32
-         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      ;; INFO: Tests expect real name resolution to work.
-      #:tests? #f
-      #:configure-flags
-      #~(list
-         ;; Make sure the programs under bin/ find libadns.so.
-         (string-append "LDFLAGS=-Wl,-rpath -Wl,"
-                        #$output:out
-                        "/lib"))))
-    (native-inputs
-     (list m4))
-    (home-page "https://www.gnu.org/software/adns/")
-    (synopsis "Asynchronous DNS client library and utilities")
-    (description
-     "GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
-Name System} resolution functionality.  The library is asynchronous, allowing
-several concurrent calls.  The package also includes several command-line
-utilities for use in scripts.")
-    (license license:gpl3+)))
+(define-deprecated/public-alias adns
+  (@ (gnu packages dns) adns))

-(define-public c-ares
-  (package
-    (name "c-ares")
-    (version "1.34.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/c-ares/c-ares/releases/download/v"
-                    version "/" name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'filter-live-tests
-            (lambda _
-              ;; Filter tests that require internet access.
-              (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
-          #$@(if (system-hurd?)
-                 #~((add-after 'unpack 'skip-tests
-                      (lambda _
-                        (substitute* "test/ares-test-main.cc"
-                          (("(^| )main *\\(.*" all)
-                           (string-append all "  exit (77);\n")))))
-                    (add-after 'filter-live-tests 'filter-hurd-tests
-                      (lambda _
-                        (setenv "GTEST_FILTER"
-                                (string-append
-                                 (getenv "GTEST_FILTER")
-                                 ":.*Basic/2"
-                                 ":.*CancelImmediate/2"
-                                 ":.*CancelImmediateGetHostByAddr/2"
-                                 ":.*CancelLater/1"
-                                 ":.*FamilyUnspecified/2"
-                                 ":.*FamilyV6/2"
-                                 ":.*GetAddrInfoParallelLookups/1"
-                                 ":.*GetHostByAddrDestroy/2"
-                                 ":.*GetHostByNameCNAMENoData/2"
-                                 ":.*GetHostByNameDestroyAbsolute/2"
-                                 ":.*GetHostByNameDestroyRelative/2"
-                                 ":.*GetHostByNameParallelLookups/1"
-                                 ":.*HostAlias/2"
-                                 ":.*HostAliasMissing/2"
-                                 ":.*HostAliasMissingFile/2"
-                                 ":.*NotImplResponse/2"
-                                 ":.*RefusedResponse/2"
-                                 ":.*Resend/1"
-                                 ":.*RetryWithoutEDNS/2"
-                                 ":.*SearchDomains/2"
-                                 ":.*SearchDomainsBare/2"
-                                 ":.*SearchDomainsServFailOnAAAA/2"
-                                 ":.*SearchDomainsWithResentReply/1"
-                                 ":.*SearchHighNdots/2"
-                                 ":.*SearchNoDataThenFail/2"
-                                 ":.*SearchNoDataThenNoDataBare/2"
-                                 ":.*SearchNoDataThenSuccess/2"
-                                 ":.*ServFailResponse/2"
-                                 ":.*SimpleQuery/2"
-                                 ":.*SockCallback/2"
-                                 ":.*SockConfigureCallback/2"
-                                 ":.*SortListV4/2"
-                                 ":.*SortListV6/2"
-                                 ":.*ThirdServer/2"
-                                 ":.*TruncationRetry/1"
-                                 ":.*UnspecifiedFamilyCname6A4/2"
-                                 ":.*UnspecifiedFamilyV4/2"
-                                 ":.*UnspecifiedFamilyV6/2")))))
-                 #~()))))
-    (native-inputs
-     (list pkg-config))
-    (home-page "https://c-ares.haxx.se/")
-    (synopsis "C library for asynchronous DNS requests")
-    (description
-     "C-ares is a C library that performs DNS requests and name resolution
-asynchronously.  It is intended for applications which need to perform DNS
-queries without blocking, or need to perform multiple DNS queries in parallel.
-The primary examples of such applications are servers which communicate with
-multiple clients and programs with graphical user interfaces.")
-    (license (license:x11-style "https://c-ares.haxx.se/license.html"))))
+(define-deprecated/public-alias c-ares
+  (@ (gnu packages dns) c-ares))

-(define-public c-ares-for-node-lts
-  (hidden-package c-ares))
+(define-deprecated/public-alias c-ares-for-node-lts
+  (@ (gnu packages dns) c-ares-for-node-lts))

-(define-public c-ares-for-node-bootstrap
-  (hidden-package
-   (package
-     (inherit c-ares)
-     (version "1.18.1")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append
-                     "https://c-ares.haxx.se/download/c-ares-" version
-                     ".tar.gz"))
-               (sha256
-                (base32
-                 "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
+(define-deprecated/public-alias c-ares-for-node-bootstrap
+  (@ (gnu packages dns) c-ares-for-node-bootstrap))

-;; gRPC requires a c-ares built with CMake in order to get the .cmake modules.
-;; We can not build c-ares itself with CMake because that would introduce a
-;; circular dependency through nghttp2.
-;; XXX: It would be nice if we could extract the modules somehow and make them
-;; work with the "normal" c-ares package instead of building a whole new library.
-(define-public c-ares/cmake
-  (hidden-package
-   (package
-     (inherit c-ares)
-     (build-system cmake-build-system)
-     (arguments
-      `(;; XXX: Tests require name resolution (the normal variant runs no tests).
-        #:tests? #f)))))
+(define-deprecated/public-alias c-ares/cmake
+  (@ (gnu packages dns) c-ares/cmake))
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -370,7 +370,7 @@ This package includes the following programs:
           libjpeg-turbo
           perl
           python
-           v4l-utils-minimal))
+           v4l-utils))
    (propagated-inputs
     ;; These are in 'requires' field of .pc files.
     (list glib gtk+))
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -1387,6 +1387,7 @@ mounted via FUSE.")
       (uri (git-reference
             (url "https://github.com/anestisb/android-simg2img")
             (commit version)))
+       (file-name (git-file-name name version))
       (sha256
        (base32
         "0drwvqxbhajka580j93z8ldckhjlpr0i84nh20krdpxcp54xvldh"))))
--- a/gnu/packages/anthy.scm
+++ b/gnu/packages/anthy.scm
@@ -33,9 +33,8 @@
       ;; The URI does not appear to be easily guessable.  For
       ;; example, you cannot download version "9100g" simply
       ;; by replacing "9100h" in the URI.
-       (uri (list (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
-                                 "distfiles/31/anthy-9100h.tar.gz")
-                  "https://osdn.dl.osdn.net/anthy/37536/anthy-9100h.tar.gz"))
+       (uri (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
+                           "distfiles/31/anthy-9100h.tar.gz"))
       (sha256
        (base32 "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
    (build-system gnu-build-system)
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@ -30,20 +30,26 @@
  #:use-module (guix packages)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
  #:use-module (gnu packages java)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages readline)
-  #:use-module (gnu packages sqlite))
+  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages xorg))

 (define-public apl
-  (let ((revision 1550))
+  (let ((revision 1977))
    (package
      (name "apl")
-      (version (string-append "1.8-r" (number->string revision)))
+      (version (string-append "2.0.1-r" (number->string revision)))
      (source
       (origin
         (method svn-fetch)
@@ -52,12 +58,18 @@
               (revision revision)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "1bgc3a09f35zrqq2irhm1hspppnxjqas0fmcw14hkc7910br9ip3"))))
+          (base32 "1llm1hqpfd71jrhd4pizhmvvca5wr18v8zqfajwmvjjxcmzfkvv1"))))
      (build-system gnu-build-system)
      (home-page "https://www.gnu.org/software/apl/")
+      (native-inputs (list gettext-minimal which pkg-config))
      (inputs
       (list gettext-minimal
+             libxcb
+             fftw
             openblas
+             gsl
+             libpng
+             gtk+
             pcre2
             readline
             sqlite))
@@ -69,15 +81,11 @@
             #~(modify-phases %standard-phases
                 (add-before 'configure 'fix-configure
                   (lambda _
-                     (substitute* "buildtag.sh"
-                       ;; Don't exit on failed SVN-related calls.
-                       (("^ +return 0\n") "")
-                       ;; Manually set the SVN revision, since the directory is
-                       ;; unversioned and we know it anyway.
-                       (("^SVNINFO=.*")
-                        (string-append "SVNINFO=" #$(number->string revision) "\n"))
-                       ;; Requires running ‘svn info’ on a versioned directory.
-                       (("\\\\\"\\$ARCHIVE_SVNINFO\\\\\"") "\\\"\\\"")))))))
+                     (substitute* "configure"
+                       ;; Manually set the SVN revision, since the directory
+                       ;; is unversioned and we know it anyway.
+                       (("\\$apl_ARCHIVE_SVNINFO")
+                        #$(number->string revision))))))))
      (synopsis "APL interpreter")
      (description
       "GNU APL is a free interpreter for the programming language APL.  It is
--- a/gnu/packages/appimage.scm
+++ b/gnu/packages/appimage.scm
@@ -19,9 +19,11 @@
 (define-module (gnu packages appimage)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (gnu packages base)
+  #:use-module (gnu packages c)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages file-systems)
  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages)
  #:use-module (guix build-system gnu)
  #:use-module (guix gexp)
@@ -30,9 +32,9 @@
  #:use-module (guix utils))

 (define-public appimage-type2-runtime
-  (let ((revision "0")
+  (let ((revision "1")
        ;; No releases, just the latest commit.
-        (commit "47b665594856b4e8928f8932adcf6d13061d8c30"))
+        (commit "caf24f9f712084686bfc24a70b75e50df0aefb9c"))
    (package
      (name "appimage-type2-runtime")
      (version (git-version "continuous" revision commit))
@@ -44,16 +46,16 @@
                (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0954crhlbapxis96g1s0vfpf78ybr64zvjalak387ksxj560g44x"))))
+          (base32 "17z0byws3dp375wcyq5xwy5npqy7hslqw21n677dp38z4f940nzv"))))
      (build-system gnu-build-system)
      (arguments
       (list
        #:tests? #f                     ; No tests
        #:make-flags
-        #~(list "-Csrc/runtime" "runtime-fuse3"
+        #~(list "-Csrc/runtime" "runtime"
                (string-append "CC=" #$(cc-for-target))
                (string-append
-                 "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse/"
+                 "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse3/"
                 " -DGIT_COMMIT='\"" "guix-" #$version "\"'"
                 " -D_FILE_OFFSET_BITS=64"
                 " -static"
@@ -64,17 +66,22 @@
          (ice-9 binary-ports))
        #:phases
        #~(modify-phases %standard-phases
+            (add-after 'unpack 'use-pkgconfig-flags
+              (lambda _
+                (substitute* "src/runtime/Makefile"
+                  (("-lmimalloc")
+                   "$(pkg-config --cflags mimalloc)"))))
            (delete 'configure)
            (replace 'install
              (lambda _
-                (install-file "src/runtime/runtime-fuse3"
+                (install-file "src/runtime/runtime"
                              (string-append #$output "/bin"))))
            ;; Must be after all elf reliant phases.  Used to identify the
            ;; executable as an AppImage as per the specification.
            (add-after 'make-dynamic-linker-cache 'set-magic-bytes
              (lambda _
                (let ((port (open (string-append #$output
-                                                 "/bin/runtime-fuse3")
+                                                 "/bin/runtime")
                                  (logior O_WRONLY))))
                  (seek port 8 SEEK_SET)
                  (put-bytevector port #vu8(#x41 #x49 #x02))
@@ -84,9 +91,12 @@
              (this-package-input "fuse")
              (gexp-input (this-package-input "zstd") "static")
              (gexp-input (this-package-input "zlib") "static"))))
+      (native-inputs (list pkg-config))
      ;; Only needed at build time.
-      (inputs (list squashfuse-for-appimage
-                    fuse-for-appimage
+      (inputs (list `(,fuse "out")
+                    `(,fuse "static")
+                    mimalloc
+                    squashfuse-for-appimage
                    `(,zstd "static")
                    `(,zlib "static")))
      (synopsis "Runtime for executing AppImages")
--- a/gnu/packages/apr.scm
+++ b/gnu/packages/apr.scm
@@ -34,14 +34,14 @@
 (define-public apr
  (package
    (name "apr")
-    (version "1.7.4")
+    (version "1.7.6")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://apache/apr/apr-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0xsmqgjiyw3s6va5dm86djnjzg9r0qc1zsldwz4sd8pkhglqsr7w"))
+               "0cpbbmng9ir8rjl9nxwljkzmrkpk4b1nsj8vg4ssfpapsa90s0s9"))
             (patches
              (search-patches "apr-skip-getservbyname-test.patch"))
             (patch-flags '("-p0"))))
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -532,7 +532,7 @@ Library with namespaces, exception handling, and member template functions.")
                                   "See License.txt in the distribution."))))

 (define-public celestia
-  ;; 1.6.4 was placed in 2023 while master migrated to Qt6, use the lates
+  ;; 1.6.4 was placed in 2023 while master migrated to Qt6, use the latest
  ;; commit for now.
  (let ((commit "6de0339a85be38e85e2ad34f58850700be4342c5")
        (revision "1"))
@@ -561,7 +561,7 @@ Library with namespaces, exception handling, and member template functions.")
                "-DUSE_QT6=ON")
        #:phases
        #~(modify-phases %standard-phases
-            ;; TODO: Wrap celestia-content instead of copping it, if posible.
+            ;; TODO: Wrap celestia-content instead of copying it, if possible.
            (add-after 'install 'install-content
              (lambda _
                (copy-recursively
@@ -602,7 +602,7 @@ accurately in real time at any rate desired.")
      (license license:gpl2+))))

 (define-public celestia-content
-  ;; No rleases or version tags.
+  ;; No releases or version tags.
  (let ((commit "54e4760132be3617e4782fee8eefcfce6694f4ff")
        (revision "6"))
    (package
@@ -783,7 +783,7 @@ analysis.")
    (arguments
     ;; pycpl expects to find a lib/esopipes-plugins directory.  This is
     ;; overruled by the PYESOREX_PLUGIN_DIR search path, but the default
-     ;; directory is still consulted and therefor needs to exist.
+     ;; directory is still consulted and therefore needs to exist.
     (list
      #:phases
      #~(modify-phases %standard-phases
@@ -1490,7 +1490,7 @@ more.")
     (list
      ;; XXX: All tests fail, figure out how to fix them.
      #:tests? #f
-      ;; It failes with segmentation fault in parallel build
+      ;; It fails with segmentation fault in parallel build
      #:parallel-build? #f
      ;; No such file or directory .../lib/iraf/lib/libmemdbg.a
      #:validate-runpath? #f
@@ -1569,7 +1569,7 @@ release from 2013.")
    (description
     "This package provides a @acronym{Centre de Données astronomiques de
 Strasbourg, CDS} implementation in Java of the @acronym{Hierarchical Equal
-Area isoLatitude Pixelization of a sphere , HEALPix} tesselation.")
+Area isoLatitude Pixelization of a sphere , HEALPix} tessellation.")
    (license license:bsd-3)))

 (define-public libnova
@@ -2847,7 +2847,7 @@ simulated Astronomical data in Python.")
    (build-system pyproject-build-system)
    ;; Tests are not thread save, see
    ;; <https://github.com/kyleaoman/martini/issues/98>.
-    ;; 
+    ;;
    ;; tests: 2529 passed, 11 skipped, 4 xfailed, 8 warnings
    (native-inputs
     (list python-pytest
@@ -2905,7 +2905,7 @@ of functions to execute the desired steps in the mock-observing process.")
        "--ignore=astroML/density_estimation/tests/test_bayesian_blocks.py"
        "--ignore=astroML/density_estimation/tests/test_hist_binwidth.py"
        "--ignore=astroML/density_estimation/tests/test_hist_binwidth.py"
-        ;; Disalbe tests with NumPy, see
+        ;; Disable tests with NumPy, see
        ;; <https://github.com/astroML/astroML/issues/281>.
        "--ignore=astroML/tests/test_resample.py"
        "-k" (string-append "not astroML.density_estimation.empirical.EmpiricalDistribution"
@@ -3304,7 +3304,7 @@ celestial-to-terrestrial coordinate transformations.")
     (list
      ;; Tests are not thread save, see:
      ;; <https://github.com/astropy/astroquery/issues/2968>.
-      ;; 
+      ;;
      ;; tests: 1823 passed, 21 skipped, 2047 deselected, 2 xfailed
      #:test-flags
      #~(list "--pyargs" "astroquery"
@@ -3467,7 +3467,7 @@ aim of simplifying and streamlining data conversion and standardization.")
     "@code{BayesicFitting} is a package for model fitting and Bayesian
 evidence calculation, it is a Python version of the the fitter classes in
@acronym{HCSS, Herschel Common Science System}.  HCSS was the all encompassing
-software system for the operations and analysis of the ESA satelite Herschel.")
+software system for the operations and analysis of the ESA satellite Herschel.")
    (license license:gpl3+)))

 (define-public python-bdsf
@@ -3576,12 +3576,12 @@ Origins Spectrograph}.")
      #:test-flags #~(list "camb.tests.camb_test")
      #:phases
      #~(modify-phases %standard-phases
-          ;; XXX: It may be set via FORUTILSPATH environemnt variable but
+          ;; XXX: It may be set via FORUTILSPATH environment variable but
          ;; build fails with error:
          ;; mkdir: cannot create directory ‘Releaselib’: Read-only file system
          (add-after 'unpack 'copy-forutils
            (lambda _
-              ;; It's a git sumbodule to <https://github.com/cmbant/forutils>.
+              ;; It's a git submodule to <https://github.com/cmbant/forutils>.
              (copy-recursively
               #+(package-source (this-package-native-input "fortran-forutils"))
               "forutils"))))))
@@ -3660,7 +3660,7 @@ in fast modern Fortran.")
     "casa_cube is a python package that provides an interface to data cubes
 generates by CASA or Gildas.  It allows the user to perform simple tasks such
 plotting given channel maps, moment maps, line profile in various units,
-correcting for cloud extinction, reconvolving with a beam taper, triming a
+correcting for cloud extinction, reconvolving with a beam taper, trimming a
 cube.  The syntax is similar to pymcfost to perform quick and easy comparison
 with models.")
    (license license:expat)))
@@ -3941,7 +3941,7 @@ data in the CHIANTI database.")
    (version "2.0.2")
    (source
     (origin
-       (method git-fetch) 
+       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/yt-project/cmyt")
              (commit (string-append "v" version))))
@@ -4226,7 +4226,7 @@ Spectrograph}.")
      ;; updates, see:
      ;; <https://github.com/spacetelescope/crds/blob/13.1.1/TESTING>.
      #~(list #$@(map (lambda (file) (string-append "--ignore=" file))
-                      ;; Network acces to <https://hst-crds.stsci.edu> or
+                      ;; Network access to <https://hst-crds.stsci.edu> or
                      ;; additional test data is required.
                      (list "test/bestrefs/test_bestrefs.py"
                            "test/bestrefs/test_special.py"
@@ -4847,7 +4847,7 @@ Euclid Consortium should be used.")
    (version "2.1.0")
    (source
     (origin
-       (method git-fetch) 
+       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/cta-observatory/pyeventio")
              (commit (string-append "v" version))))
@@ -5549,7 +5549,7 @@ and a 3D volume rendering viewer.")
     (list
      #:test-flags
      ;; See: <https://github.com/Hazboun6/gw_sky/issues/2>.
-      ;; 
+      ;;
      ;; 0.1.0 was released in 2023 and might be not compatible with some
      ;; function in Jupyter: subprocess.CalledProcessError: Command
      ;; '['jupyter', 'nbconvert', <...>
@@ -6205,7 +6205,7 @@ etc.).")
        (base32 "14m1a6z884vg2n5ndwwhpnzpb5h28hh58a53dfjwwbjakwmixb0p"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f)) ; no tests in PyPI tarball, tests requir networking
+     (list #:tests? #f)) ; no tests in PyPI tarball, tests require networking
    (native-inputs
     (list python-setuptools
           python-wheel))
@@ -7370,7 +7370,7 @@ position-frequency slice.")
    (build-system pyproject-build-system)
    (arguments
     ;; See: <https://github.com/sczesla/PyAstronomy/issues/64>.
-     (list #:tests? #f)) 
+     (list #:tests? #f))
    (native-inputs
     (list python-ipython-minimal
           python-nbconvert
@@ -9748,7 +9748,7 @@ over many parameters:
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 19 passed, 1 deselected 
+      ;; tests: 19 passed, 1 deselected
      #:test-flags
      ;; Test fails due to numerical uncertainties.
      ;; See: <https://github.com/vrodgom/statmorph/issues/17>.
@@ -10231,7 +10231,7 @@ Institute, STScI} utility functions.")
      ;; Failed to load Vega spectrum from
      ;; /grp/redcat/trds/calspec/alpha_lyr_stis_010.fits;
      ;;
-      ;; Data is availalbe by the lnks: <https://ssb.stsci.edu/trds/calspec/>,
+      ;; Data is available by the lnks: <https://ssb.stsci.edu/trds/calspec/>,
      ;; <https://archive.stsci.edu/hlsp/reference-atlases>.
      #:tests? #f))
    (native-inputs
@@ -10421,8 +10421,8 @@ and @code{astropy}.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; TODO: tests require some remove data, findout how to run bare minmal
-      ;; unit tests withou it.
+      ;; TODO: tests require some removed data, find out how to run bare minimal
+      ;; unit tests without it.
      #:tests? #f))
    (native-inputs
     (list python-setuptools
@@ -11277,7 +11277,7 @@ crowded star fields.")
    (license license:gpl3+)))

 (define-public sgp4
-  ;; Version tag v1.0 is dated to <2021-01-11>, use the lates commit instead.
+  ;; Version tag v1.0 is dated to <2021-01-11>, use the latest commit instead.
  (let ((commit "6a448b4850e5fbf8c1ca03bb5f6013a9fdc1fd91")
        (revision "2"))
    (package
@@ -11967,7 +11967,7 @@ any knowledge of SQL
 including auto-parallelising custom analysis
@item customization with multiple Python modules such as @code{pynbody} or
@code{yt} to process raw simulation data
-@item suports file-based database SQLite, server-based MySQL and PostgreSQL
+@item supports file-based database SQLite, server-based MySQL and PostgreSQL
@end itemize")
    (license license:bsd-3)))

--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -62,6 +62,7 @@
 ;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;; Copyright © 2026 Noé Lopez <noelopez@free.fr>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
+;;; Copyright © 2026 Daniel Martins <email@danielfm.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3438,7 +3439,7 @@ from being able to mix multiple JACK audio streams.")
            (commit (string-append "v" version))))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "08ji4lg24flzi6g3yaavfq8hz3kr98q2ripk5m4qk9z172qxbbc9"))))
+       (base32 "0fvnvr74q5khxlj5sylfnkblydmwgdbvj04mhdqw0zzmfqwignhd"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -3703,6 +3704,44 @@ compensation, (de)interleaving, and byte-swapping
    ;; original developer.
    (license license:expat)))

+(define-public rtcqs
+  (package
+    (name "rtcqs")
+    (version "0.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://codeberg.org/rtcqs/rtcqs")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1kc3niyaq4m8di68832pgfb1b0m54q5gm68dwlzwwilgxi61ifzc"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no test suite
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-gui
+            (lambda _
+              (substitute* "pyproject.toml"
+                (("\"FreeSimpleGUI\",?")
+                 "")
+                (("rtcqs_gui = \"rtcqs\\.rtcqs_gui:main\"")
+                 ""))
+              (delete-file "src/rtcqs/rtcqs_gui.py")
+              (delete-file "src/rtcqs/rtcqs_qt_gui.py"))))))
+    (native-inputs (list python-setuptools))
+    (home-page "https://codeberg.org/rtcqs/rtcqs")
+    (synopsis "Linux audio real-time performance analyzer")
+    (description
+     "rtcqs analyzes a Linux system to detect possible bottlenecks that could
+have a negative impact on real-time audio performance.  It checks kernel
+configuration, IRQ priorities, CPU governor, swappiness, and other settings
+relevant to low-latency audio work.")
+    (license license:expat)))
+
 (define-public rtosc
  (package
    (name "rtosc")
@@ -8043,6 +8082,7 @@ Home Page}.")
             (commit version)
             ;; For test files.
             (recursive? #true)))
+       (file-name (git-file-name name version))
       (sha256
        (base32 "065x43hx670rjrclxi4hiqxscllb16v9s7myjvg7rd5pd3y0k7sg"))))
    (build-system pyproject-build-system)
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -547,7 +547,7 @@ remain fully idle, saving power and producing less noise.")
         "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"))))
    (build-system gnu-build-system)
    (inputs
-     (list librsync-0.9))
+     (list librsync))
    (arguments
     `(#:make-flags `("CFLAGS=-fcommon"
                      ,(string-append "PREFIX=" (assoc-ref %outputs "out"))
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -944,7 +944,20 @@ configurable through a set of options.")
      #~(list (string-append
               "CC=" #$(this-package-input "openmpi") "/bin/mpicc")
              (string-append
-               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))))
+               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; OSU installs its binaries to /libexec. Have a symlink in /bin to
+          ;; improve user experience.
+          (add-after 'install 'symlink-binaries-in-bin
+            (lambda _
+              (mkdir-p (string-append #$output "/bin"))
+              (for-each (lambda (file)
+                          (symlink file
+                                   (string-append #$output "/bin/"
+                                                  (basename file))))
+                        (find-files (string-append #$output
+                                                   "/libexec"))))))))
    (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
    (synopsis "Benchmarking suite from the MVAPICH project")
    (description
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4897,26 +4897,29 @@ relying on a complex dependency tree.")
 (define-public biosoup
  (package
    (name "biosoup")
-    (version "0.10.0")
+    (version "0.11.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/rvaser/biosoup")
-             ;; Corresponds to version 0.10.0
-             (commit "38181f09854ff42cbd9632200a2ec9fb37a4b7b6")))
+             (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "02hvyka703zagx0nvv2yx3dkc748zc8g6qbrpya7r8kfkcl7y8hw"))))
+         "0vn1hj3h152iwahnrzghqll34qaphchi07klb3j70vgc248micbz"))))
    (build-system cmake-build-system)
    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "./bin/biosoup_test")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'enable-testing
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("target_link_libraries\\(biosoup_test")
+                 "enable_testing()
+  add_test(NAME biosoup-test COMMAND biosoup_test)
+  target_link_libraries(biosoup_test")))))))
    (native-inputs
     (list googletest))
    (home-page "https://github.com/rvaser/biosoup")
@@ -4928,26 +4931,29 @@ used for storage and logging in bioinformatics tools.")
 (define-public bioparser
  (package
    (name "bioparser")
-    (version "3.0.13")
+    (version "3.1.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/rvaser/bioparser")
-             ;; Corresponds to tag 3.0.13
-             (commit "13341e6e0855c6b358ffcea6dad216e1009e1287")))
+             (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0c5p2dl8jb12ci9f427jzrmmm9cgvc1k4fxsn2ggkfsin6r1r82i"))))
+         "057zb3g8qyvbkbfzgkygrf0iphz3v4icm13pchxzrafiy7zkbmrq"))))
    (build-system cmake-build-system)
    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "./bin/bioparser_test")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'enable-testing
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("target_link_libraries\\(bioparser_test")
+                 "enable_testing()
+  add_test(NAME bioparser-test COMMAND bioparser_test)
+  target_link_libraries(bioparser_test")))))))
    (inputs
     (list biosoup))
    (propagated-inputs
@@ -4961,113 +4967,6 @@ bioinformatics formats (FASTA/Q, MHAP/PAF/SAM), with support for zlib
 compressed files.")
    (license license:expat)))

-(define-public circtools
-  (package
-    (name "circtools")
-    (version "1.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Kevinzjy/circtools")
-             ;; Corresponds to tag v1.0.0
-             (commit "79380de59013601021ca3b1352d6f64d2fb89646")
-             (recursive? #t)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0wg1s927g32k25j967kfr8l30nmr4c0p4zvy5igvy7cs6chd60lh"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f
-       #:install-source? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))))
-         (add-after 'unpack 'prepare-spoa-dependencies
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "vendor/spoa/CMakeLists.txt"
-               (("find_package\\(bioparser 3.0.13 QUIET\\)")
-                "find_package(bioparser 3.0.13 CONFIG)")
-               (("find_package\\(biosoup 0.10.0 QUIET\\)")
-                "find_package(biosoup 0.10.0 CONFIG)")
-               (("GTest_FOUND") "TRUE")))))))
-    (inputs
-     (cons* bioparser biosoup (cargo-inputs 'circtools)))
-    (native-inputs
-     (list cmake-minimal pkg-config googletest))
-    (home-page "https://github.com/Kevinzjy/circtools")
-    (synopsis "Accelerating functions in CIRI toolkit")
-    (description "This package provides accelerated functions for the CIRI
-toolkit.  It also provides the @code{ccs} executable to scan for circular
-consensus sequences.")
-    (license license:expat)))
-
-(define-public ciri-long
-  (package
-    (name "ciri-long")
-    (version "1.0.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/bioinfo-biols/CIRI-long")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "10k88i1fcqchrrjv82rmylwvbwqfba0n51palhig9hsg71xs0dbi"))
-       ;; Delete bundled binary
-       (snippet '(delete-file "libs/ccs"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              (substitute* "setup.py"
-                (("'argparse[^']*',")
-                 "") ;only for python2
-                (("==")
-                 ">=")
-                ;; This package changed names.
-                (("python-Levenshtein")
-                 "levenshtein"))))
-          (add-before 'build 'build-libssw
-            (lambda _
-              (with-directory-excursion "libs/striped_smith_waterman"
-                (invoke "make" "libssw.so"))))
-          (add-before 'build 'fix-reference-to-ccs
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "CIRI_long/pipeline.py"
-                (("'ccs -i")
-                 (string-append "'"
-                                (assoc-ref inputs "circtools") "/bin/ccs"
-                                " -i")))
-              ;; yuck!
-              (substitute* "CIRI_long/main.py"
-                (("os.chmod\\(lib_path.*")
-                 "")))))))
-    (inputs (list circtools
-                  python-biopython
-                  python-bwapy
-                  python-levenshtein
-                  python-mappy
-                  python-numpy
-                  python-pandas
-                  python-pysam
-                  python-pyspoa
-                  python-scikit-learn
-                  python-scipy))
-    (native-inputs (list python-cython python-pynose python-setuptools))
-    (home-page "https://ciri-cookbook.readthedocs.io/")
-    (synopsis "Circular RNA identification for Nanopore sequencing")
-    (description "CIRI-long is a package for circular RNA identification using
-long-read sequencing data.")
-    (license license:expat)))
-
 (define-public python-circe
  (package
    (name "python-circe")
@@ -7175,14 +7074,16 @@ CWL descriptions.")
  (package
    (name "ravanan")
    (version "0.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/arunisaac/ravanan/releases/download/v"
-                    version "/ravanan-" version ".tar.lz"))
-              (sha256
-               (base32
-                "00ayvxsgvma3231ja1759f5fr99a4nw3j23i8qz616wfxa54745s"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/arunisaac/ravanan")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1ap9h2d92wjvnn8914baqkx6xn8zdanxmpjfg81v3qx35pn938al"))))
    (arguments
     (list #:make-flags
           #~(list (string-append "prefix=" #$output)
@@ -7216,7 +7117,7 @@ CWL descriptions.")
    (inputs
     (list bash-minimal
           node
-           guile-3.0
+           (lookup-package-input guix "guile")
           guile-filesystem
           guile-gcrypt
           guile-json-4
@@ -13215,28 +13116,22 @@ differently labelled data.")
 (define-public r-pando
  (package
    (name "r-pando")
-    (version "1.0.5")
+    (version "1.1.1")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://github.com/quadbiolab/Pando")
-             (commit (string-append "v" version))))
+              (url "https://github.com/quadbio/Pando")
+              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "04kr1b28p5j7h48g32cldkg87xcmxnmd4kspygkfs7a4amihpi66"))))
+        (base32 "1zcsg3my1ka2wprvlx8p08cdz3dqphga54d5rp418zfhcyjy4fkp"))))
    (properties `((upstream-name . "Pando")))
    (build-system r-build-system)
    (arguments
     (list
      ;; The test file data/test_seurat.rds is not included.
-      #:tests? #false
-      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'loosen-requirements
-           (lambda _
-             (substitute* "DESCRIPTION"
-               ((" \\(==.*,") ",")))))))
+      #:tests? #false))
    (propagated-inputs
     (list r-bayestestr
           r-foreach
@@ -18440,44 +18335,6 @@ following the assay and produces a file detailing peaks of significant
 enrichment.")
    (license license:expat)))

-(define-public mantis
-  ;; This is an arbitrary commit as a year has passed since 0.1 was tagged.
-  (let ((commit "b6979a269172a45201c8366680d8b889f889432b")
-        (revision "2"))
-    (package
-      (name "mantis")
-      (version (git-version "0.1" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/splatlab/mantis")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0dq8a785hnaxx5kq757m5czs8xpcjpcph1inq2nm8h6zfvqyj8xs"))))
-      (build-system cmake-build-system)
-      (arguments
-       '(#:tests? #f ; there are none
-         #:configure-flags (list "-DNH=ON"))) ; do not use SSE4.2 instructions
-      (inputs
-       (list sdsl-lite openssl zlib))
-      (native-inputs
-       (list gcc-7))
-      (home-page "https://github.com/splatlab/mantis")
-      (synopsis "Large-scale sequence-search index data structure")
-      (description "Mantis is a space-efficient data structure that can be
-used to index thousands of raw-read genomics experiments and facilitate
-large-scale sequence searches on those experiments.  Mantis uses counting
-quotient filters instead of Bloom filters, enabling rapid index builds and
-queries, small indexes, and exact results, i.e., no false positives or
-negatives.  Furthermore, Mantis is also a colored de Bruijn graph
-representation, so it supports fast graph traversal and other topological
-analyses in addition to large-scale sequence-level searches.")
-      ;; uses __uint128_t and inline assembly
-      (supported-systems '("x86_64-linux"))
-      (license license:bsd-3))))
-
 (define-public sjcount
  ;; There is no tag for version 3.2, nor is there a release archive.
  (let ((commit "292d3917cadb3f6834c81e509c30e61cd7ead6e5")
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -41,32 +41,16 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages bittorrent)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system cmake)
-  #: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 build-system qt)
-  #:use-module (guix build-system glib-or-gtk)
-  #:use-module ((guix licenses) #:prefix l:)
-  #:use-module (guix gexp)
-  #:use-module (guix utils)
-  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
-  #:use-module (gnu packages)
-  #:use-module (gnu packages adns)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages boost)
-  #:use-module (gnu packages nss)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages cyrus-sasl)
+  #:use-module (gnu packages dns)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages glib)
@@ -76,8 +60,9 @@
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages libevent)
  #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages nettle)
  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages nettle)
+  #:use-module (gnu packages nss)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
@@ -86,15 +71,30 @@
  #:use-module (gnu packages python-crypto)
  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages serialization)
  #:use-module (gnu packages qt)
+  #:use-module (gnu packages serialization)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages ssh)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages version-control)
  #:use-module (gnu packages web)
  #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages)
+  #:use-module (guix build-system cmake)
+  #: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 build-system qt)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
+  #:use-module (guix utils))

 (define-public transmission
  (package
@@ -194,7 +194,7 @@ DHT, µTP, PEX and Magnet Links.")
    ;; or any future license endorsed by Mnemosyne LLC.
    ;;
    ;; A few files files carry an MIT/X11 license header.
-    (license (list l:gpl2 l:gpl3))))
+    (license (list license:gpl2 license:gpl3))))

 (define-public transmission-remote-gtk
  (package
@@ -224,7 +224,7 @@ DHT, µTP, PEX and Magnet Links.")
    (description "transmission-remote-gtk is a GTK client for remote management
 of the Transmission BitTorrent client, using its HTTP RPC protocol.")
    (home-page "https://github.com/transmission-remote-gtk/transmission-remote-gtk")
-    (license l:gpl2+)))
+    (license license:gpl2+)))

 (define-public stig
  (package
@@ -267,7 +267,7 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
     "Stig is a @acronym{TUI, Text User Interface} and @acronym{CLI, Command
 Line Interface} client for the BitTorrent client Transmission.")
    (home-page "https://github.com/rndusr/stig")
-    (license l:gpl3)))
+    (license license:gpl3)))

 (define-public libtorrent
  (package
@@ -291,7 +291,7 @@ Line Interface} client for the BitTorrent client Transmission.")
 with the BitTorrent client rtorrent.  It is written in C++ with emphasis on
 speed and efficiency.")
    (home-page "https://github.com/rakshasa/libtorrent")
-    (license l:gpl2+)))
+    (license license:gpl2+)))

 (define-public rtorrent
  (package
@@ -320,7 +320,7 @@ speed and efficiency.")
 full encryption, DHT, PEX, and Magnet Links.  It can also be controlled via
 XML-RPC over SCGI.")
    (home-page "https://github.com/rakshasa/rtorrent")
-    (license l:gpl2+)))
+    (license license:gpl2+)))

 (define-public tremc
  (let ((commit "d8deaa5ac25bb45a2ca3a930309d6ecc74836a54")
@@ -354,7 +354,7 @@ XML-RPC over SCGI.")
    (description "Tremc is a console client, with a curses interface, for the
 Transmission BitTorrent daemon.")
    (home-page "https://github.com/tremc/tremc")
-    (license l:gpl3+))))
+    (license license:gpl3+))))

 (define-public aria2
  (package
@@ -419,7 +419,7 @@ download utility.  It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.
 Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
    (properties
     '((release-monitoring-url . "https://github.com/aria2/aria2/releases")))
-    (license l:gpl2+)))
+    (license license:gpl2+)))

 (define-public uget
  (package
@@ -453,7 +453,7 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
     "uGet is portable download manager with GTK+ interface supporting
 HTTP, HTTPS, BitTorrent and Metalink, supporting multi-connection
 downloads, download scheduling, download rate limiting.")
-    (license l:lgpl2.1+)))
+    (license license:lgpl2.1+)))

 (define-public mktorrent
  (package
@@ -488,8 +488,8 @@ files and whole directories.  It can add multiple trackers and web seed URLs,
 and set the @code{private} flag to disallow advertisement through the
 distributed hash table (@dfn{DHT}) and Peer Exchange.  Hashing is multi-threaded
 and will take advantage of multiple processor cores where possible.")
-    (license (list l:public-domain      ; sha1.*, used to build without OpenSSL
-                   l:gpl2+))))          ; with permission to link with OpenSSL
+    (license (list license:public-domain ; sha1.*, used to build without OpenSSL
+                   license:gpl2+))))     ; with permission to link with OpenSSL

 (define-public libtorrent-rasterbar
  (package
@@ -541,7 +541,7 @@ and will take advantage of multiple processor cores where possible.")
     "libtorrent-rasterbar is a feature-complete C++ BitTorrent implementation
 focusing on efficiency and scalability.  It runs on embedded devices as well as
 desktops.")
-    (license l:bsd-2)))
+    (license license:bsd-2)))

 (define-public qbittorrent
  (package
@@ -585,7 +585,7 @@ libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 It aims to be a good alternative to all other BitTorrent clients out there.
 qBittorrent is fast, stable and provides unicode support as well as many
 features.")
-    (license l:gpl2+)))
+    (license license:gpl2+)))

 (define-public qbittorrent-no-x
  (let ((base qbittorrent))
@@ -727,4 +727,4 @@ Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange
 speed limits.  Deluge heavily utilises the libtorrent library.  It is
 designed to run as both a normal standalone desktop application and as a
 client-server.")
-    (license l:gpl3+)))
+    (license license:gpl3+)))
--- a/gnu/packages/browser-extensions.scm
+++ b/gnu/packages/browser-extensions.scm
@@ -95,8 +95,8 @@ supported content to the Kodi media center.")
  ;; Arbitrary commit of branch master,
  ;; Update when updating uBlockOrigin.
  (let* ((name "ublock-main-assets")
-         (commit "011eef4a5b36a7ebf4adedc486d96b77cfa25c54")
-         (revision "5")
+         (commit "004af606e6a0efc22bc65ab1016b553441cacb71")
+         (revision "6")
         (version (git-version "0" revision commit)))
    (origin
      (method git-fetch)
@@ -105,14 +105,14 @@ supported content to the Kodi media center.")
            (commit commit)))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "0ng8a88zdvrxg30fz83gswjy27b3hfx9q11n2i715id7az7kqf9x")))))
+       (base32 "1bfd2d53flrkgvjcr1kj9nbxj4y9a4pcr7m3dycccdhd21x6k0ln")))))

 (define ublock-prod-assets
  ;; Arbitrary commit of branch gh-pages,
  ;; Update when updating uBlockOrigin.
  (let* ((name "ublock-prod-assets")
-         (commit "6844322800de647da0c4fe06dd6a0b212a3942e4")
-         (revision "5")
+         (commit "6c15e4ef91888c610caf73829dc78ae9549ed24a")
+         (revision "6")
         (version (git-version "0" revision commit)))
    (origin
      (method git-fetch)
@@ -121,12 +121,12 @@ supported content to the Kodi media center.")
            (commit commit)))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "13vxq4z1wxivz5xklncxd2sj5aqkyhq919vzbbfp0fgh0imhikib")))))
+       (base32 "0n2h6drqh44b1zgl729bfr70n08mkm536a2vqgivw7dm5dmi8zd3")))))

 (define ublock-origin
  (package
    (name "ublock-origin")
-    (version "1.66.2")
+    (version "1.70.0")
    (home-page "https://github.com/gorhill/uBlock")
    (source (origin
              (method git-fetch)
@@ -136,7 +136,7 @@ supported content to the Kodi media center.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "16ph031hb8bf4rxyxvm6jr0bxmy0snza11jfrbjgfb390gax9r63"))))
+                "0j1m80nz86yc69c42hv5di5zza0vkycqmjaydb9jgx0abcvi19x5"))))
    (build-system gnu-build-system)
    (outputs '("xpi" "firefox" "chromium"))
    (properties '((addon-id . "uBlock0@raymondhill.net")))
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -44,37 +44,17 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages build-tools)
-  #:use-module (ice-9 optargs)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages c)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system guile)
-  #:use-module (guix build-system hare)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix deprecation)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix modules)
-  #:use-module (guix packages)
-  #:use-module (guix search-paths)
-  #:use-module (guix utils)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages adns)
  #:use-module (gnu packages algebra)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
+  #:use-module (gnu packages c)
  #:use-module (gnu packages check)
  #:use-module (gnu packages code)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
  #:use-module (gnu packages cppi)
+  #:use-module (gnu packages dns)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages guile)
@@ -105,7 +85,27 @@
  #:use-module (gnu packages tls)
  #:use-module (gnu packages unicode)
  #:use-module (gnu packages version-control)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system guile)
+  #:use-module (guix build-system hare)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix deprecation)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix modules)
+  #:use-module (guix packages)
+  #:use-module (guix search-paths)
+  #:use-module (guix utils)
+  #:use-module (ice-9 optargs))

 (define-public acr
  (package
@@ -196,7 +196,8 @@ according to the system capabilities and the user-selected options.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))))
+                "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))
+              (patches (search-patches "bam-python3-compat.patch"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags `(,(string-append "CC=" ,(cc-for-target))
@@ -207,7 +208,7 @@ according to the system capabilities and the user-selected options.")
       (modify-phases %standard-phases
         (delete 'configure))))
    (native-inputs
-     `(("python" ,python-2)))
+     (list python-minimal-wrapper))
    (inputs
     (list lua))
    (home-page "https://matricks.github.io/bam/")
@@ -344,8 +345,8 @@ programs and other files depend.")
    (license license:bsd-3)))

 (define-public gn
-  (let ((commit "ee5b7e32b961a9da1933e9f46a018ba6cac8ef60")
-        (revision "2277"))            ;as returned by `git describe`, used below
+  (let ((commit "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a")
+        (revision "2354"))            ;as returned by `git describe`, used below
    (package
      (name "gn")
      (version (git-version "0.0" revision commit))
@@ -355,7 +356,7 @@ programs and other files depend.")
                (uri (git-reference (url home-page) (commit commit)))
                (sha256
                 (base32
-                  "19kkvwxl66vlzlfppbq03fmi59i5g8a1yc71fsfgwqqmx4wywd6w"))
+                  "0yz38czmbc72q1hkiv3cwxqh2i8ji2vkkvvk5ws2cjplmn2vj0x9"))
                (file-name (git-file-name name version))))
      (build-system gnu-build-system)
      (arguments
@@ -365,7 +366,8 @@ programs and other files depend.")
                   (lambda _
                     (setenv "CC" "gcc")
                     (setenv "CXX" "g++")
-                     (setenv "CXXFLAGS" "-g -O2 -Wno-error=redundant-move")
+                     (setenv "CXXFLAGS"
+                             "-g -O2 -Wno-error=redundant-move -Wno-error=comment")
                     (setenv "AR" "ar")))
                 (replace 'configure
                   (lambda _
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -595,7 +595,11 @@ capacity is user-selectable.")
                            version "/DVDStyler-" version ".tar.bz2"))
       (sha256
        (base32
-         "0n3mfjsazvlzk9hl23q3iz7bmxjq7b5lx0ab8nbk1jgl763k9cqb"))))
+         "0n3mfjsazvlzk9hl23q3iz7bmxjq7b5lx0ab8nbk1jgl763k9cqb"))
+       (snippet
+        #~(begin (delete-file "src/dvdvml.c")
+                 (delete-file "src/dvdvmy.c")
+                 (delete-file "src/dvdvmy.h")))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
@@ -625,27 +629,28 @@ capacity is user-selectable.")
             #t)))
       #:tests? #f)) ; No tests.
    (inputs ; TODO package bundled wxvillalib
-     `(("wxwidgets" ,wxwidgets)
-       ("wssvg" ,wxsvg)
-       ("bash" ,bash-minimal) ; for wrap-program
-       ("dbus" ,dbus)
-       ("cdrtools" ,cdrtools)
-       ("dvd+rw-tools" ,dvd+rw-tools)
-       ("dvdauthor" ,dvdauthor)
-       ("eudev" ,eudev)
-       ("fontconfig" ,fontconfig)
-       ("libexif" ,libexif)
-       ("libjpeg" ,libjpeg-turbo)
-       ("ffmpeg" ,ffmpeg-4)))
+     (list bash-minimal ; for wrap-program
+           cdrtools
+           dbus
+           dvd+rw-tools
+           dvdauthor
+           eudev
+           ffmpeg-4
+           fontconfig
+           libexif
+           libjpeg-turbo
+           wxsvg
+           wxwidgets))
    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("flex" ,flex)
-       ("python" ,python-2)
-       ("xmlto" ,xmlto)
-       ("gettext" ,gettext-minimal)
-       ("docbook-xml" ,docbook-xml)
-       ("docbook-xsl" ,docbook-xsl)
-       ("zip" ,zip)))
+     (list bison
+           docbook-xml
+           docbook-xsl
+           flex
+           gettext-minimal
+           pkg-config
+           python-minimal-wrapper
+           xmlto
+           zip))
    (synopsis "DVD authoring application")
    (description "DVDStyler is a DVD authoring application which allows users
 to burn video files in many formats to DVD discs, complete with individually
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -79,11 +79,13 @@
  '("base/third_party/cityhash" ;Expat
    "base/third_party/double_conversion" ;BSD-3
    "base/third_party/icu" ;Unicode, X11-style
+    "base/third_party/nspr" ;MPL-2.0
    "base/third_party/superfasthash" ;BSD-3
    "base/third_party/symbolize" ;BSD-3
    "base/third_party/xdg_user_dirs" ;Expat
+    "buildtools/third_party/libc++" ;BSD
+    "buildtools/third_party/libc++abi" ;BSD
    "net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
-    "net/third_party/nss" ;MPL-2.0
    "net/third_party/quiche" ;BSD-3
    "net/third_party/uri_template" ;ASL2.0
    "third_party/abseil-cpp" ;ASL2.0
@@ -104,8 +106,11 @@
    "third_party/catapult" ;BSD-3
    "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
    "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
+    "third_party/catapult/third_party/beautifulsoup4-4.9.3" ;Expat
+    "third_party/catapult/third_party/html5lib-1.1" ;Expat
    "third_party/catapult/third_party/polymer" ;BSD-3
    "third_party/catapult/third_party/six" ;Expat
+    "third_party/catapult/third_party/typ" ;ASL2.0
    ;; XXX: This is a minified version of <https://d3js.org/>.
    "third_party/catapult/tracing/third_party/d3" ;BSD-3
    "third_party/catapult/tracing/third_party/gl-matrix" ;Expat
@@ -120,19 +125,12 @@
    "third_party/cld_3" ;ASL2.0
    "third_party/closure_compiler" ;ASL2.0
    "third_party/compiler-rt" ;ASL2.0
-    "third_party/compiler-rt/src/lib" ;ASL2.0
-    "third_party/compiler-rt/src/lib/builtins" ;ASL2.0
    "third_party/content_analysis_sdk" ;BSD-3
    "third_party/cpuinfo" ;BSD-2
    "third_party/crabbyavif" ;ASL2.0
-    "third_party/crabbyavif/src/sys/dav1d-sys" ;ASL2.0
-    "third_party/crabbyavif/src/sys/aom-sys" ;ASL2.0
-    "third_party/crabbyavif/src/sys/libgav1-sys" ;ASL2.0
-    "third_party/crabbyavif/src/sys/libyuv-sys" ;ASL2.0
-    "third_party/crabbyavif/src/sys/ndk-sys" ;ASL2.0
    "third_party/crashpad" ;ASL2.0
    "third_party/crashpad/crashpad/third_party/lss" ;ASL2.0
-    "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
+    "third_party/crashpad/crashpad/third_party/zlib" ;Zlib
    "third_party/crc32c" ;BSD-3
    "third_party/cros_system_api" ;BSD-3
    "third_party/dav1d" ;BSD-2
@@ -140,19 +138,25 @@
    ;; TODO: can likely be unbundled when Vulkan is updated.
    "third_party/dawn/third_party/khronos" ;ASL2.0
    "third_party/dawn/third_party/gn/webgpu-cts" ;BSD-3
+    "third_party/dawn/third_party/renderdoc" ;Expat
+    "third_party/dawn/third_party/webgpu-headers" ;BSD-3
+    "third_party/depot_tools" ;BSD-3
+    "third_party/devscripts" ;GPL2.0
    "third_party/devtools-frontend" ;BSD-3
    "third_party/devtools-frontend/src/front_end"
    "third_party/devtools-frontend/src/front_end/third_party"
    "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party\
 /additional_readme_paths.json" ;no explicit license; trivial
-    "third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0
    "third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
+    "third_party/devtools-frontend/src/front_end/third_party/csp_evaluator" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/diff" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3
+    "third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
+    "third_party/devtools-frontend/src/front_end/third_party/legacy-javascript" ;ASL-2.0
    "third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/lit" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3
@@ -164,10 +168,12 @@
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/parsel" ; Expat
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs" ; ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay" ;ASL2.0
+    "third_party/devtools-frontend/src/front_end/third_party/source-map-scopes-codec" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party\
 /vscode.web-custom-data" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/third-party-web" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
+    "third_party/devtools-frontend/src/front_end/third_party/web-vitals" ;Expat
    "third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0
    "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0

@@ -179,6 +185,7 @@
    "third_party/farmhash" ;Expat
    "third_party/fast_float" ;ASL2.0, Boost1.0, Expat
    "third_party/fdlibm" ;non-copyleft
+    "third_party/federated_compute/chromium/fcp/confidentialcompute" ;ASL2.0
    "third_party/federated_compute/src/fcp/base" ;ASL2.0
    "third_party/federated_compute/src/fcp/confidentialcompute" ;ASL2.0
    "third_party/federated_compute/src/fcp/protos/confidentialcompute" ;ASL2.0
@@ -187,7 +194,9 @@
    "third_party/fft2d" ;non-copyleft
    "third_party/flatbuffers" ;ASL2.0
    "third_party/fp16" ;Expat
+    "third_party/freetype" ;GPL2.0
    "third_party/fusejs" ;ASL2.0
+    "third_party/fxdiv" ;Expat
    "third_party/gemmlowp" ;ASL2.0
    "third_party/google_input_tools" ;ASL2.0
    "third_party/google_input_tools/third_party/closure_library" ;ASL2.0
@@ -196,6 +205,9 @@
    "third_party/harfbuzz-ng" ;Expat
    "third_party/highway" ;ASL2.0
    "third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
+    "third_party/hyphenation-patterns" ;Expat
+    ;; FIXME: Our icu does not have some headers such as udatamem.h.
+    "third_party/icu" ;Unicode3.0
    "third_party/ink" ;ASL2.0
    "third_party/ink_stroke_modeler" ;ASL2.0
    "third_party/inspector_protocol" ;BSD-3
@@ -208,12 +220,14 @@
    "third_party/libaddressinput" ;ASL2.0
    "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
    "third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3
-    "third_party/libaom/source/libaom/third_party/SVT-AV1" ;BSD-3
    "third_party/libaom/source/libaom/third_party/vector" ;Expat
    "third_party/libaom/source/libaom/third_party/x86inc" ;ISC
+    "third_party/libc++" ;Expat
    "third_party/libdrm" ; Expat
    "third_party/libgav1" ;ASL2.0
    "third_party/libjingle_xmpp" ;BSD-3
+    "third_party/libpfm4" ;BSD
+    "third_party/libpng" ;PNG2.0
    "third_party/libphonenumber" ;ASL2.0
    "third_party/libsecret" ;LGPL2.1+
    "third_party/libsrtp" ;BSD-3
@@ -227,11 +241,15 @@
    "third_party/libvpx/source/libvpx/third_party/x86inc" ;Expat

    "third_party/libwebm" ;BSD-3
+    "third_party/libx11" ;BSD
+    "third_party/libxcb-keysyms" ;BSD
    "third_party/libxml/chromium" ;BSD-3
    "third_party/libyuv" ;BSD-3
    "third_party/libzip" ;BSD-3
    "third_party/lit" ;BSD-3
    "third_party/lit/v3_0" ;BSD-3
+    "third_party/llvm-libc" ;ASL2.0
+    "third_party/llvm-libc/src/shared" ;ASL2.0
    "third_party/lottie" ;Expat
    "third_party/lss" ;BSD-3
    "third_party/lzma_sdk" ;public domain
@@ -244,6 +262,7 @@
    "third_party/modp_b64" ;BSD-3
    "third_party/nasm" ;BSD-2
    "third_party/nearby" ;ASL2.0
+    "third_party/neon_2_sse" ;BSD-2
    "third_party/node" ;Expat
    "third_party/oak/chromium/proto" ;ASL2.0
    "third_party/oak/chromium/proto/attestation" ;ASL2.0
@@ -251,14 +270,20 @@
    "third_party/one_euro_filter" ;BSD-3
    "third_party/openscreen" ;BSD-3
    "third_party/openscreen/src/third_party/tinycbor" ;Expat
+    "third_party/opus" ;BSD-3
    "third_party/ots" ;BSD-3
    "third_party/pdfium" ;BSD-3
    "third_party/pdfium/third_party/agg23" ;Expat
    "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
+    "third_party/pdfium/third_party/lcms" ;Expat
+    "third_party/pdfium/third_party/libopenjpeg" ;BDS-2
    "third_party/pdfium/third_party/libtiff" ;non-copyleft
    "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
    "third_party/perfetto" ;ASL2.0
    "third_party/perfetto/protos/third_party/chromium" ;BSD-3
+    "third_party/perfetto/protos/third_party/pprof" ;ASL2.0
+    "third_party/perfetto/protos/third_party/primes" ;ASL2.0
+    "third_party/perfetto/protos/third_party/simpleperf" ;ASL2.0
    "third_party/pffft" ;the "FFTPACK" license
    "third_party/ply" ;BSD-3
    "third_party/polymer" ;BSD-3
@@ -268,6 +293,7 @@
    "third_party/protobuf/third_party/utf8_range" ; Expat
    "third_party/pthreadpool" ;BSD-2
    "third_party/puffin" ;Non-copyleft
+    "third_party/pyyaml" ;Expat
    "third_party/pyjson5" ;ASL2.0
    "third_party/rapidhash" ;BSD-2
    "third_party/readability" ;ASL2.0
@@ -279,11 +305,14 @@
    "third_party/search_engines_data" ;BSD-3
    "third_party/securemessage" ;ASL2.0
    "third_party/selenium-atoms" ;ASL2.0
+    "third_party/sentencepiece" ;ASL2.0
+    "third_party/sentencepiece/src/third_party/darts_clone" ;BSD-3
    "third_party/shell-encryption" ;ASL2.0
    "third_party/simdutf" ;Non-copyleft
    "third_party/simplejson" ; Non-copyleft
+    "third_party/six" ;Expat
    "third_party/skia" ;BSD-3
-    "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
+    "third_party/skia/include/third_party/vulkan" ;BSD-3
    "third_party/smhasher" ;Expat, public domain

    ;; FIXME: the snappy "replacement" shim (see replace_gn_files.py below) does
@@ -338,7 +367,6 @@
    "third_party/webrtc/modules/third_party/fft" ;Non-copyleft
    "third_party/webrtc/modules/third_party/g711" ;Public domain
    "third_party/webrtc/modules/third_party/g722" ;Public domain
-    "third_party/webrtc/rtc_base/third_party/sigslot" ;Public domain
    "third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
    "third_party/woff2" ;ASL2.0
    "third_party/wuffs" ;ASL2.0
@@ -372,7 +400,7 @@
  ;; run the Blink performance tests, just remove everything to save ~70MiB.
  '("third_party/blink/perf_tests"))

-(define %chromium-version "141.0.7390.65")
+(define %chromium-version "147.0.7727.55")
 (define %ungoogled-revision (string-append %chromium-version "-1"))
 (define %debian-revision (string-append "debian/" %ungoogled-revision))

@@ -384,7 +412,7 @@
    (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
    (sha256
     (base32
-      "1hk4rww2gccly1qv0xnswd77haj02rlza82403dxdjm8fkdfndy6"))))
+      "0l6v4wf16067igawjlh90f3d287mkw0cq4j5lvrxxy17y1skynzc"))))

 (define %debian-origin
  (origin
@@ -397,7 +425,7 @@
                                ((_ version) version))))
    (sha256
     (base32
-      "06s3kvwb3490xb28n6r3q5n1c0ylsvchiw6s4h1rrp8jqzwjbmc6"))))
+      "0gqarll08i7rcs1amapciv263xvzglc8p44ikavq3xd12yyvcd98"))))

 (define (origin-file origin file)
  (computed-file
@@ -410,26 +438,38 @@

 (define %debian-patches
  (map debian-patch
-       '("bookworm/clang19.patch"
-         "bookworm/foreach.patch"
+       '("bookworm/foreach.patch"
+         "debianization/safe-libcxx.patch"
+         "disable/enterprise-tests.patch"
         "disable/node-version-ck.patch"
+         "disable/rustc-allow-features.patch"
+         "fixes/bytemuck.patch"
         "fixes/gentoo-stylesheet.patch"
         "fixes/libcpp-headers.patch"
+         "fixes/libpng-testonly.patch"
         "fixes/rust-clanglib.patch"
+         "llvm-19/clang19.patch"
+         "llvm-19/clone-traits.patch"
+         "llvm-19/keyfactory.patch"
+         "llvm-19/value-or.patch"
+         "llvm-22/ignore-for-ubsan.patch"
         "system/openjpeg.patch"
-         ;; Remove after rust is past
-         ;; <https://github.com/rust-lang/rust/pull/141061>.
-         "trixie/rust-no-alloc-shim.patch")))
+         "trixie/cookie-string-view.patch"
+         "trixie/nodejs-main.patch")))

 (define %guix-patches
  (list (local-file
         (assume-valid-file-name
          (search-patch
-           "ungoogled-chromium-extension-search-path.patch")))
+           "ungoogled-chromium-custom-compiler.patch")))
        (local-file
         (assume-valid-file-name
          (search-patch
-           "ungoogled-chromium-unbundle-icu-target.patch")))
+           "ungoogled-chromium-empty-parsed-rustc-args.patch")))
+        (local-file
+         (assume-valid-file-name
+          (search-patch
+           "ungoogled-chromium-extension-search-path.patch")))
        (local-file
         (assume-valid-file-name
          (search-patch
@@ -500,9 +540,8 @@
             "#if 0"))
          (invoke "python" "build/linux/unbundle/replace_gn_files.py"
                  "--system-libraries" "flac" "fontconfig" "freetype"
-                  "harfbuzz-ng" "icu" "libjpeg"
-                  "libpng" "libwebp" "libxml" "libxslt" "openh264" "opus"
-                  "zlib")))))
+                  "harfbuzz-ng" "libjpeg" "libpng" "libwebp" "libxml"
+                  "libxslt" "openh264" "opus" "zlib")))))

 (define opus+custom
  (package/inherit opus
@@ -531,7 +570,7 @@
                                  %chromium-version "-lite.tar.xz"))
              (sha256
               (base32
-                "09iwglswnr6d45zz3zsjw7jpm1xlwwkxlz9h5nlhqxyd933a04fq"))
+                "1salvlw5sykx3zmsbp7cgmf7y8yy6jlgb4b4zswzsbjrprk4jnap"))
              (modules '((guix build utils)))
              (snippet (force ungoogled-chromium-snippet))))
    (build-system gnu-build-system)
@@ -548,6 +587,7 @@
      ;; directory for an exhaustive list of supported flags.
      ;; (Note: The 'configure' phase will do that for you.)
      #~(list "is_debug=false"
+              "is_component_build=false"
              ;; Use the "official" release optimizations, as opposed to
              ;; a developer build.
              "is_official_build=true"
@@ -555,6 +595,7 @@
              "use_clang_modules=false"
              "use_custom_libcxx=false" ; support for this is deprecated and to be removed.
              "optimize_webui=false"
+              "webnn_use_tflite=false"
              "safe_browsing_use_unrar=false"
              "chrome_pgo_phase=0"
              "use_sysroot=false"
@@ -572,12 +613,10 @@
              "enable_service_discovery=false"
              "enable_vr=false"
              "enable_enterprise_companion=false"
-              "enable_glic=false"
              "enable_iterator_debugging=false"
              "enable_hangout_services_extension=false"
              "enable_widevine=false"
-              ;; Disable type-checking for the Web UI to avoid a Java dependency.
-              "enable_js_type_check=false"
+              "fatal_linker_warnings=false"
              ;; Disable code using TensorFlow until it has been scrutinized
              ;; by the ungoogled project.
              "build_with_tflite_lib=false"
@@ -589,6 +628,11 @@
              "angle_has_histograms=false"
              "angle_build_tests=false"
              "build_angle_perftests=false"
+              "enable_perfetto_unittests=false"
+              "skia_enable_skshapper_tests=false"
+              "tint_build_unittests=false"
+              "enable_nocompile_tests=false"
+              "enable_screen_ai_browsertests=false"

              "clang_warning_suppression_file=\"\""

@@ -597,6 +641,8 @@
              "is_cfi=false"

              "symbol_level=0"
+              "blink_symbol_level=0"
+              "v8_symbol_level=0"
              "v8_enable_backtrace=false"

              ;; Define a custom toolchain that simply looks up CC, AR and
@@ -628,26 +674,10 @@
                             ;; invokation and fails if it's just the version number.
                             " (f6e511eec 2024-10-15) (built from a source tarball)\"")

-              ;; Chromium's build/rust/std/BUILD.gn has a hardcoded
-              ;; list of stdlib rlibs (stdlib_files) that GN uses to
-              ;; declare build outputs.  GN requires static output
-              ;; declarations, so the list must exactly match what
-              ;; rlibs exist in the Rust sysroot.  Chromium's list
-              ;; includes unicode_width because their bundled
-              ;; toolchain (Rust 1.89) ships it as a dependency of
-              ;; getopts 0.2.23.  Our Rust 1.93 has getopts 0.2.24
-              ;; which dropped that dependency, so unicode_width is
-              ;; not in our sysroot.  This GN arg removes it from
-              ;; the list.  (Chromium's own use of unicode_width via
-              ;; codespan-reporting is a separate vendored copy under
-              ;; third_party/rust/chromium_crates_io/ and is
-              ;; unaffected.)
-              "removed_rust_stdlib_libs=[\"unicode_width\"]"
-
              ;; Prefer system libraries.
              "use_system_freetype=true"
              "use_system_harfbuzz=true"
-              "use_system_icu=true"
+              "use_system_icu=false"
              "use_system_lcms2=true"
              "use_system_libffi=true"
              "use_system_libjpeg=true"
@@ -713,9 +743,9 @@

                ;; Many files try to include ICU headers from "third_party/icu/...".
                ;; Remove the "third_party/" prefix to use system headers instead.
-                (substitute* (find-files "chrome" "\\.cc$")
-                  (("third_party/icu/source/(common|i18n)/")
-                   ""))
+                ;(substitute* (find-files "chrome" "\\.cc$")
+                ;  (("third_party/icu/source/(common|i18n)/")
+                ;   ""))

                ;; XXX: Should be unnecessary when use_system_lcms2=true.
                (substitute* "third_party/pdfium/core/fxcodec/icc/icc_transform.h"
@@ -732,16 +762,19 @@
                  (("include \"third_party/curl")
                   "include \"curl"))

-                ;; Unknown flags as of clang-19, can be removed when building with
-                ;; newer clang.
-                (substitute* "build/config/compiler/BUILD.gn"
-                  (("-gsimple-template-names") ""))
-
-                ;; Clang libs are not under bindgen root directory.
-                (substitute* "build/rust/rust_bindgen_generator.gni"
+                ;; Our clang libs and rustfmt are not under bindgen root directory.
+                (substitute* '("build/rust/rust_bindgen_generator.gni"
+                               "build/rust/rust_bindgen.gni")
                  (("(_libclang_path = )rust_bindgen_root" _ libclang)
-                   (string-append libclang "clang_base_path"))))))
-          (add-after 'patch-stuff 'add-absolute-references
+                   (string-append libclang "clang_base_path"))
+                  (("(_rustfmt_path = \")\\$\\{rust_bindgen_root\\}" _ rustfmt)
+                   (string-append rustfmt "${rust_sysroot_absolute}"))))))
+          (add-after 'patch-stuff 'include-pthreadpool
+            ;; FIXME: Somehow the build system cannot locate this header.
+            (lambda _
+              (copy-file "third_party/pthreadpool/src/include/pthreadpool.h"
+                         "pthreadpool.h")))
+          (add-after 'include-pthreadpool 'add-absolute-references
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((cups-config (search-input-file inputs "/bin/cups-config"))
                    (libnssckbi.so (search-input-file inputs
@@ -763,13 +796,22 @@
          (add-after 'add-absolute-references 'adjust-CPLUS_INCLUDE_PATH
            ;; The libcxx include/c++/v1 directory is not exposed via
            ;; CPLUS_INCLUDE_PATH by default, causing errors like
-            ;; "fatal error: 'format' file not found".
+            ;; "fatal error: 'format' file not found".  Also clang is
+            ;; unable to find gcc's bits/c++config.h which is machine
+            ;; dependent.
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
-              (setenv "CPLUS_INCLUDE_PATH"
-                      (string-append
-                       (search-input-directory inputs
-                                               "/include/c++/v1")
-                       ":" (getenv "CPLUS_INCLUDE_PATH")))))
+              (let* ((libcxx-v1 (search-input-directory inputs
+                                                        "include/c++/v1"))
+                     (target-system  #$(nix-system->gnu-triplet
+                                         (or (%current-target-system)
+                                             (%current-system))))
+                     (target-include (string-append "include/c++/"
+                                                    target-system))
+                     (gcc-bits  (search-input-directory inputs
+                                                        target-include)))
+                (setenv "CPLUS_INCLUDE_PATH"
+                        (string-append libcxx-v1 ":" gcc-bits ":"
+                         (getenv "CPLUS_INCLUDE_PATH"))))))
          (add-before 'configure 'prepare-build-environment
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (let ((node (search-input-file (or native-inputs inputs)
@@ -955,7 +997,7 @@
           glib
           gtk+
           harfbuzz
-           icu4c
+           icu4c-77
           lcms
           libcxx
           libffi
--- a/gnu/packages/cinnamon.scm
+++ b/gnu/packages/cinnamon.scm
@@ -253,7 +253,7 @@ as well as some desktop-wide documents.")
           pkg-config
           xorg-server-for-tests))
    (inputs
-     (list atk
+     (list at-spi2-core
           cinnamon-desktop
           exempi
           gsettings-desktop-schemas
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -695,57 +695,6 @@ Kcov uses DWARF debugging information for compiled programs to make it
 possible to collect coverage information without special compiler switches.")
    (license license:gpl2+)))

-(define-public rtags
-  (package
-    (name "rtags")
-    (version "2.18")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Andersbakken/rtags")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (patches (search-patches "rtags-separate-rct.patch"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Part of spliting rct with rtags.
-        ;; Substitute #include "rct/header.h" with #include <rct/header.h>.
-        '(with-directory-excursion "src"
-           (delete-file-recursively "rct")        ;remove bundled copy
-           (let ((files (find-files "." ".*\\.cpp|.*\\.h")))
-             (substitute* files
-               (("#include ?\"rct/(.*.h)\"" all header)
-                (string-append "#include <rct/" header ">")))
-             #t)))
-       (sha256
-        (base32
-         "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"))))
-    (build-system cmake-build-system)
-    (arguments
-     '(#:build-type "RelWithDebInfo"
-       #:configure-flags
-       '("-DRTAGS_NO_ELISP_FILES=1")
-       #:tests? #f))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list bash-completion
-           clang
-           llvm
-           lua
-           rct
-           selene))
-    (home-page "https://github.com/Andersbakken/rtags")
-    (synopsis "Indexer for the C language family with Emacs integration")
-    (description
-     "RTags is a client/server application that indexes C/C++ code and keeps a
-persistent file-based database of references, declarations, definitions,
-symbolnames etc.  There’s also limited support for ObjC/ObjC++.  It allows you
-to find symbols by name (including nested class and namespace scope).  Most
-importantly we give you proper follow-symbol and find-references support.")
-    (license license:gpl3+)))
-
 (define-public colormake
  (package
    (name "colormake")
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -714,7 +714,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
 (define-public podman
  (package
    (name "podman")
-    (version "5.8.1")
+    (version "5.8.2")
    (outputs '("out" "docker"))
    (properties
     `((output-synopsis "docker" "docker alias for podman")
@@ -727,7 +727,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
             (url "https://github.com/containers/podman")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "1wdsdc0nj4m1v8mn95dhavi87ad0adqmld70da59gvp2abff5f0f"))
+        (base32 "12bmzbfyjsf0mwnam38cw9ib54wj1znh5b7lxzdyll9cvvkhqisr"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
--- a/gnu/packages/coreboot.scm
+++ b/gnu/packages/coreboot.scm
@@ -0,0 +1,226 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
+;;; Copyright © 2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+;;;
+;;; 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/>.
+
+(define-module (gnu packages coreboot)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages pciutils)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (srfi srfi-26))
+
+(define %coreboot-version "26.03")
+
+(define %coreboot-origin
+  (origin
+    (method git-fetch)
+    (uri (git-reference
+           (url "https://review.coreboot.org/coreboot")
+           (commit %coreboot-version)))
+    (file-name (git-file-name "coreboot" %coreboot-version))
+    (sha256
+     (base32
+      "0436rr0vibh35phvkxrc939njvrmnfq9xw87y1b0nlllglvq07kk"))))
+
+(define-public bincfg
+  (package
+    (name "bincfg")
+    (version %coreboot-version)
+    (source %coreboot-origin)
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ; no test suite
+      #:make-flags
+      #~(list
+         (string-append "CC=" #$(cc-for-target)))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure) ; no configure script
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/bincfg")))
+          (add-after 'build 'build-binaries
+            (lambda* (#:key make-flags #:allow-other-keys)
+              (for-each
+               (lambda (target result)
+                 (apply invoke "make" (string-append "gen-" target) make-flags)
+                 (rename-file result
+                              (string-append target ".bin")))
+               (list
+                ;; generate GbE for X200
+                "gbe-ich9m"
+                ;; generate GbE for X220/x230
+                "gbe-82579LM"
+                ;; generate IFD for X200
+                "ifd-x200")
+               (list
+                "flashregion_3_gbe.bin"
+                "flashregion_3_gbe.bin"
+                "flashregion_0_fd.bin"))))
+          ;; The Makefile has no install target.
+          (replace 'install
+            (lambda _
+              (let ((bin (string-append #$output "/bin"))
+                    (lib (string-append #$output "/lib/bincfg"))
+                    (data (string-append #$output "/share/bincfg")))
+                ;; Install the program
+                (install-file "bincfg" bin)
+                ;; And its data
+                (for-each
+                 (lambda (path)
+                   (install-file path data))
+                 (append (find-files "." ".*\\.set")
+                         (find-files "." ".*\\.spec")))
+                ;; And the files generated with the data
+                (for-each
+                 (lambda (path)
+                   (install-file path lib))
+                 (find-files "." ".*\\.bin"))))))))
+    (native-inputs (list bison flex))
+    (home-page "https://coreboot.org")
+    (synopsis "Encoder/decoder for binary formats described in text files")
+    (description "
+The bincfg program comes with specifications files for the following binary
+formats:
+@itemize
+@item Various DDR3 and DDR4 SPD
+@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
+@item Configuration data for the Intel Gigabit Ethernet controller present in
+      the Intel ICH9-M chipset.
+@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
+@item Configuration data for the ITE IT8718F SuperIO
+@end itemize
+It also comes with example files generated by bincfg.")
+    (license license:gpl3+)))
+
+(define-public ifdtool
+  (package
+    (name "ifdtool")
+    (version %coreboot-version)
+    (source %coreboot-origin)
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              "INSTALL=install"
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/ifdtool")))
+          (delete 'configure))           ; no configure script
+      #:tests? #f))                    ; no test suite
+    (home-page "https://doc.coreboot.org/util/ifdtool/")
+    (synopsis "Intel Firmware Descriptor dumper")
+    (description "This package provides @command{ifdtool}, a program to
+dump Intel Firmware Descriptor data of an image file.")
+    (license license:gpl2)))
+
+(define-public intelmetool
+  (package
+    (name "intelmetool")
+    (version %coreboot-version)
+    (source %coreboot-origin)
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f                       ;no test suite
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              "INSTALL=install"
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/intelmetool")))
+          (delete 'configure) ;no configure script
+          (delete 'check))))
+    (inputs (list pciutils zlib))
+    (home-page
+     "https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
+    (synopsis "Intel Management Engine tools")
+    (description "This package provides tools for working with Intel
+Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
+@code{sudo rmmod mei} before using this tool.  Also pass
+@code{iomem=relaxed} to the Linux kernel command line.")
+    (license license:gpl2)
+
+    ;; This is obviously an Intel thing, plus it requires <cpuid.h>.
+    (supported-systems '("x86_64-linux" "i686-linux"))))
+
+(define-public nvramtool
+  (package
+    (name "nvramtool")
+    (version %coreboot-version)
+    (source %coreboot-origin)
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ; no test suite
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              "INSTALL=install"
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/nvramtool")))
+          (delete 'configure)))) ; no configure script
+    (home-page "https://coreboot.org")
+    (synopsis "Command line tool that can edit Coreboot settings")
+    (description "@command{nvramtool} can see and/or modify Coreboot settings
+like the serial port speed, log level, etc.  It requires Coreboot to be compiled
+with CONFIG_USE_OPTION_TABLE and some options require the iomem=relaxed kernel
+command line to work.  Features:
+@itemize
+@item If Coreboot was compiled without CONFIG_STATIC_OPTION_TABLE, it can change
+      its settings, which are applied after a reboot.
+@item It can modify Coreboot images  default settings with
+      @command{nvramtool -C coreboot.rom [...]}.
+@item It has various options related to the file format used to store these
+      settings.
+@item It can also read/write the CMOS memory where the Coreboot settings can be
+      located.
+@end itemize")
+    ;; Some files are "GPL-2.0-only or BSD-3-Clause", other are GPL-2.0-only
+    ;; and anyway there is. There is also a license declaration in
+    ;; cli/nvramtool.8 that applies to "This program" which uses the GPLv2.
+    (license license:gpl2)))
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -683,38 +683,6 @@ computer program to introspect and modify an object at runtime.  It is also
 the name of the library itself, which is written in C++.")
    (license license:expat)))

-(define-public rct
-  (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a")
-         (revision "2"))
-    (package
-      (name "rct")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/Andersbakken/rct")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "1m2931jacka27ghnpgf1z1plkkr64z0pga4r4zdrfpp2d7xnrdvb"))
-                (patches (search-patches "rct-add-missing-headers.patch"))
-                (file-name (git-file-name name version))))
-      (build-system cmake-build-system)
-      (arguments
-       '(#:configure-flags
-         '("-DWITH_TESTS=ON"            ; To run the test suite
-           "-DRCT_RTTI_ENABLED=ON")))
-      (native-inputs
-       (list cppunit pkg-config))
-      (inputs
-       (list openssl zlib))
-      (home-page "https://github.com/Andersbakken/rct")
-      (synopsis "C++ library providing Qt-like APIs on top of the STL")
-      (description "Rct is a set of C++ tools that provide nicer (more Qt-like)
- APIs on top of Standard Template Library (@dfn{STL}) classes.")
-      (license (list license:expat        ; cJSON
-                     license:bsd-4)))))   ; everything else (LICENSE.txt)
-
 (define-public plutovg
  (package
    (name "plutovg")
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -135,20 +135,10 @@
                                        (search-patches
                                         "ath9k-htc-firmware-binutils.patch")))
                 ((target-mingw? target)
-                  (package-with-extra-patches
-                   (package-with-extra-configure-variable
-                    ;; mingw binutils does not work correctly when configured
-                    ;; with `--enable-compressed-debug-sections`. An error
-                    ;; like the following will occur whenever you try to link:
-                    ;;
-                    ;;   x86_64-w64-mingw32-ld: final link failed: bad value
-                    ;;
-                    ;; TODO: This seems like a deeper problem that warrants
-                    ;; deeper investigation.
-                    binutils "--enable-compressed-debug-sections" "no")
-                   (search-patches
-                    "binutils-cross-windres.patch"
-                    "binutils-mingw-w64-deterministic.patch")))
+                  (package-with-extra-patches binutils
+                                              (search-patches
+                                               "binutils-cross-windres.patch"
+                                               "binutils-mingw-w64-deterministic.patch")))
                 (else binutils))
           target)))

--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1545,17 +1545,17 @@ and high-availability (HA).")
    (license license:gpl2)))                  ;'COPYING' says "version 2" only

 ;; Don't forget to update the other postgresql packages when upgrading this one.
-(define-public postgresql-16
+(define-public postgresql-17
  (package
    (name "postgresql")
-    (version "16.4")
+    (version "17.7")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                  version "/postgresql-" version ".tar.bz2"))
              (sha256
               (base32
-                "0vvd73rzj0sl294v15bh8yslakqv412bxqzlkqxyjwxa8pb6c5wp"))
+                "1dg9labqgph2idaypb8khdvbag29pr3h4bqv5w8k7kgc08rk97pg"))
              (patches (search-patches
                        "postgresql-disable-normalize_exec_path.patch"))))
    (build-system gnu-build-system)
@@ -1585,18 +1585,22 @@ and high-availability (HA).")
          (add-after 'build 'build-contrib
            (lambda _
              (invoke "make" "-C" "contrib")))
+          ;; FIXME: Install manpages too.
+          ;; The 'install-mangpages phase in postgresql-16 fails silently here.
          (add-after 'install 'install-contrib
            (lambda _
-              (invoke "make" "-C" "contrib" "install")))
-          (add-after 'install 'install-manuals
-            (lambda _
-              (with-directory-excursion "doc/src/sgml"
-                (invoke "make" "install-man")
-                (invoke "make" "postgres.info")
-                (install-file "postgres.info"
-                              (string-append #$output "/share/info"))))))))
+              (invoke "make" "-C" "contrib" "install"))))))
    (native-inputs
-     (list docbook-xml-4.5 docbook2x libxml2 perl pkg-config texinfo))
+     (list bison
+           docbook-xml-4.5
+           docbook-xsl
+           docbook2x
+           flex
+           libxml2
+           libxslt
+           perl
+           pkg-config
+           texinfo))
    (inputs
     (list icu4c readline `(,util-linux "lib") openssl zlib))
    (home-page "https://www.postgresql.org/")
@@ -1610,18 +1614,49 @@ TIMESTAMP.  It also supports storage of binary large objects, including
 pictures, sounds, or video.")
    (license (license:x11-style "file://COPYRIGHT"))))

-(define-public postgresql-15
+(define-public postgresql-16
  (package
-    (inherit postgresql-16)
+    (inherit postgresql-17)
    (name "postgresql")
-    (version "15.8")
+    (version "16.10")
    (source (origin
-              (inherit (package-source postgresql-16))
+              (method url-fetch)
              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                  version "/postgresql-" version ".tar.bz2"))
              (sha256
               (base32
-                "0snbxmlygf7m4cxjpscmz3yjn4lnqsw313y9xgpv7vk9k9gm20s4"))
+                "0hib575m9x3z8c71gkcv9jsyq77d3qk7q2zgzvfy6clwrvs8b16y"))
+              (patches (search-patches
+                        "postgresql-disable-normalize_exec_path.patch"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments postgresql-17)
+       ((#:phases phases #~%standard-phases)
+        #~(modify-phases #$phases
+            (add-after 'install 'install-manuals
+              (lambda _
+                (with-directory-excursion "doc/src/sgml"
+                  (invoke "make" "install-man")
+                  (invoke "make" "postgres.info")
+                  (install-file "postgres.info"
+                                (string-append #$output "/share/info")))))))))
+    (native-inputs (modify-inputs (package-native-inputs postgresql-17)
+                     (delete "bison")
+                     (delete "docbook-xsl")
+                     (delete "flex")
+                     (delete "libxslt")))))
+
+(define-public postgresql-15
+  (package
+    (inherit postgresql-16)
+    (name "postgresql")
+    (version "15.15")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
+                                  version "/postgresql-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1ais46b2ij38y75i1w336as03pybyndsd2pp2q8gdjq9igmsllsp"))
              (patches (search-patches
                        "postgresql-disable-resolve_symlinks.patch"))))
    (native-inputs (modify-inputs native-inputs
@@ -1633,26 +1668,26 @@ pictures, sounds, or video.")
  (package
    (inherit postgresql-15)
    (name "postgresql")
-    (version "14.13")
+    (version "14.20")
    (source (origin
              (inherit (package-source postgresql-15))
              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                  version "/postgresql-" version ".tar.bz2"))
              (sha256
               (base32
-                "0misc5yiklflz96n7wxcdzzg0lcc4ahd0flzqsg6mcjs955krajr"))))))
+                "0sv45dsmyplfys6dfdjdwmrczl46s82x35xdh311nxj02q7z29vm"))))))

-(define-public postgresql-13
+(define-deprecated/public postgresql-13 #f
  (package
    (inherit postgresql-14)
-    (version "13.16")
+    (version "13.23")
    (source (origin
              (inherit (package-source postgresql-14))
              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                  version "/postgresql-" version ".tar.bz2"))
              (sha256
               (base32
-                "0rc8rpsw2lwa5af35zd8iifah02wg2rnn1i890h2h8zh55hvpjy9"))))))
+                "1mhz0h7b3dmc0nnxz1wp46j95jhyi3girykkr3gbg4mg4qkwihvf"))))))

 (define-public postgresql postgresql-14)

@@ -1691,7 +1726,7 @@ pictures, sounds, or video.")
 (define-public timescaledb
  (package
    (name "timescaledb")
-    (version "2.16.1")
+    (version "2.26.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1700,7 +1735,7 @@ pictures, sounds, or video.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
+                "0zfm224jyz874pk4r9qlz5c2mn1xjvairhxh6widlbh3mn62m3j8"))
              (modules '((guix build utils)))
              (snippet
               ;; Remove files carrying the proprietary TIMESCALE license.
@@ -1710,8 +1745,7 @@ pictures, sounds, or video.")
                            '("scripts/c_license_header-timescale.h"
                              "scripts/license_tsl.spec"
                              "scripts/sql_license_tsl.sql"
-                              "test/perl/AccessNode.pm"
-                              "test/perl/DataNode.pm"
+                              "test/t/001_replication_telemetry.pl"
                              "test/perl/TimescaleNode.pm"))))))
    (build-system cmake-build-system)
    (arguments
@@ -1795,7 +1829,7 @@ pictures, sounds, or video.")
                 (lambda* (#:rest args)
                   (apply (assoc-ref gnu:%standard-phases 'check)
                          #:test-target "regresschecklocal" args))))))
-    (inputs (list openssl postgresql))
+    (inputs (list openssl postgresql-17))
    (home-page "https://www.timescale.com/")
    (synopsis "Time-series extension for PostgreSQL")
    (description
@@ -3044,7 +3078,7 @@ temporary directory, and destroys it when the perl script exits.")
 (define-public unixodbc
  (package
   (name "unixodbc")
-   (version "2.3.9")
+   (version "2.3.14")
   (source (origin
            (method url-fetch)
            (uri
@@ -3052,7 +3086,7 @@ temporary directory, and destroys it when the perl script exits.")
              "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-"
              version ".tar.gz"))
            (sha256
-             (base32 "01xj65d02i3yjy7p9z08y9jakcs5szmz4rask868n7387nn3x0sj"))))
+             (base32 "0wa7a82h5dsba23155gfhh1sp4dsbaxq6pppp6q31z017vg18a2f"))))
   (build-system gnu-build-system)
   (synopsis "Data source abstraction library")
   (description "Unixodbc is a library providing an API with which to access
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -20,18 +20,6 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages debian)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system perl)
-  #:use-module (guix build-system trivial)
-  #:use-module (gnu packages adns)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages backup)
  #:use-module (gnu packages base)
@@ -40,6 +28,7 @@
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages databases)
  #:use-module (gnu packages dbm)
+  #:use-module (gnu packages dns)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages guile)
@@ -53,6 +42,17 @@
  #:use-module (gnu packages tls)
  #:use-module (gnu packages web)
  #:use-module (gnu packages wget)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
  #:use-module (srfi srfi-1)
  #:use-module (srfi srfi-26))

--- a/gnu/packages/dhall.scm
+++ b/gnu/packages/dhall.scm
@@ -31,13 +31,13 @@
 (define-public dhall
  (package
    (name "dhall")
-    (version "1.41.2")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "dhall" version))
-              (sha256
-               (base32
-                "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"))))
+    (version "1.42.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "dhall" version))
+       (sha256
+        (base32 "0fvvqvh6diqi55dmncfs06rvcw8k0a1hs2gq228yxvsfbzcpv44s"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "dhall")))
    (inputs (list ghc-aeson
@@ -73,8 +73,8 @@
                  ghc-text-manipulate
                  ghc-text-short
                  ghc-th-lift-instances
+                  ghc-unix-compat
                  ghc-unordered-containers
-                  ghc-uri-encode
                  ghc-vector
                  ghc-cryptohash-sha256
                  ghc-http-types
@@ -86,7 +86,6 @@
                         ghc-quickcheck-instances
                         ghc-special-values
                         ghc-spoon
-                         ghc-system-filepath
                         ghc-tasty
                         ghc-tasty-expected-failure
                         ghc-tasty-hunit
@@ -97,9 +96,8 @@
                         ghc-mockery
                         ghc-doctest))
    (arguments
-     `(#:tests? #f ; Tries to access httpbin.org
-       #:cabal-revision ("4"
-                         "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx")))
+     `(#:cabal-revision ("2"
+                         "1h9kxpn3kzwmxj07mqc0cxjj2ak3dyxnifb78z5vn34xn747j5bk")))
    (home-page "http://hackage.haskell.org/package/dhall")
    (synopsis "Configuration language guaranteed to terminate")
    (description
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -79,7 +79,7 @@
 (define-public diffoscope
  (package
    (name "diffoscope")
-    (version "315")
+    (version "317")
    (source
     (origin
       (method git-fetch)
@@ -88,7 +88,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1q2q60hw36d1capqdrg6gp2220dg87bmxgmk52m7yml4xw13zi2p"))))
+        (base32 "13r96c49wrpx0xa8bbkki832w58gjdgqb4khjsaawk5mb5yv4c39"))))
    (build-system pyproject-build-system)
    (arguments
     (list
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1231,7 +1231,7 @@ passphrases.")
 (define-public ndctl
  (package
    (name "ndctl")
-    (version "78")
+    (version "84")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1240,7 +1240,7 @@ passphrases.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0rhmxjajxxslsikixlf9cdg5vcn42h7zzqkqj5p5pshxch368kn0"))))
+                "0jal7w4mk5l5j0qfays27kya8n1h2qwkncl0s317rfxp56bkjp6y"))))
    (build-system meson-build-system)
    (arguments
     ;; The test suite runs but SKIPs all tests: do not consider this tested!
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -549,6 +549,7 @@ when coding custom template tags.")
       (uri (git-reference
             (url "https://github.com/jazzband/django-taggit")
             (commit version)))
+       (file-name (git-file-name name version))
       (sha256
        (base32
         "1i8an3wcl7nygl5f565jcpyhyws9gabawazggxpf6m3vklxn3cj0"))))
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -108,9 +108,7 @@
           (lambda _
             (invoke "cmake" "--install" "."))))))
    (inputs
-     `(("libconfig" ,libconfig)
-       ("libedit" ,libedit)
-       ("zlib" ,zlib)))
+     `(("zlib" ,zlib)))
    (native-inputs
     `(("lld-wrapper" ,(make-lld-wrapper lld-17 #:lld-as-ld? #t))
       ("llvm" ,llvm-17)
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -1,12 +1,13 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015-2018, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2016 Nikita <nikita@n0.is>
 ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2019-2021 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
 ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
@@ -21,9 +22,11 @@
 ;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,12 +49,12 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages check)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages databases)
-  #:use-module (gnu packages documentation)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages databases)
  #:use-module (gnu packages datastructures)
+  #:use-module (gnu packages documentation)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages freedesktop)
@@ -65,6 +68,7 @@
  #:use-module (gnu packages libidn)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages lua)
+  #:use-module (gnu packages m4)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages nettle)
  #:use-module (gnu packages networking)
@@ -84,17 +88,173 @@
  #:use-module (gnu packages web)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages)
-  #:use-module (guix gexp)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix utils)
+  #:use-module (guix build-system cmake)
  #:use-module (guix build-system copy)
  #: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 meson)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
+  #:use-module (guix utils))
+
+(define-public adns
+  (package
+    (name "adns")
+    (version "1.6.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
+              (commit (string-append "adns-" version))))
+       (sha256
+        (base32
+         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      ;; INFO: Tests expect real name resolution to work.
+      #:tests? #f
+      #:configure-flags
+      #~(list
+         ;; Make sure the programs under bin/ find libadns.so.
+         (string-append "LDFLAGS=-Wl,-rpath -Wl,"
+                        #$output:out
+                        "/lib"))))
+    (native-inputs
+     (list m4))
+    (home-page "https://www.gnu.org/software/adns/")
+    (synopsis "Asynchronous DNS client library and utilities")
+    (description
+     "GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
+Name System} resolution functionality.  The library is asynchronous, allowing
+several concurrent calls.  The package also includes several command-line
+utilities for use in scripts.")
+    (license license:gpl3+)))
+
+(define-public c-ares
+  (package
+    (name "c-ares")
+    (version "1.34.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/c-ares/c-ares/releases/download/v"
+             version "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'filter-live-tests
+            (lambda _
+              ;; Filter tests that require internet access.
+              (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
+          #$@(if (system-hurd?)
+                 #~((add-after 'unpack 'skip-tests
+                      (lambda _
+                        (substitute* "test/ares-test-main.cc"
+                          (("(^| )main *\\(.*" all)
+                           (string-append all "  exit (77);\n")))))
+                    (add-after 'filter-live-tests 'filter-hurd-tests
+                      (lambda _
+                        (setenv "GTEST_FILTER"
+                                (string-append
+                                 (getenv "GTEST_FILTER")
+                                 ":.*Basic/2"
+                                 ":.*CancelImmediate/2"
+                                 ":.*CancelImmediateGetHostByAddr/2"
+                                 ":.*CancelLater/1"
+                                 ":.*FamilyUnspecified/2"
+                                 ":.*FamilyV6/2"
+                                 ":.*GetAddrInfoParallelLookups/1"
+                                 ":.*GetHostByAddrDestroy/2"
+                                 ":.*GetHostByNameCNAMENoData/2"
+                                 ":.*GetHostByNameDestroyAbsolute/2"
+                                 ":.*GetHostByNameDestroyRelative/2"
+                                 ":.*GetHostByNameParallelLookups/1"
+                                 ":.*HostAlias/2"
+                                 ":.*HostAliasMissing/2"
+                                 ":.*HostAliasMissingFile/2"
+                                 ":.*NotImplResponse/2"
+                                 ":.*RefusedResponse/2"
+                                 ":.*Resend/1"
+                                 ":.*RetryWithoutEDNS/2"
+                                 ":.*SearchDomains/2"
+                                 ":.*SearchDomainsBare/2"
+                                 ":.*SearchDomainsServFailOnAAAA/2"
+                                 ":.*SearchDomainsWithResentReply/1"
+                                 ":.*SearchHighNdots/2"
+                                 ":.*SearchNoDataThenFail/2"
+                                 ":.*SearchNoDataThenNoDataBare/2"
+                                 ":.*SearchNoDataThenSuccess/2"
+                                 ":.*ServFailResponse/2"
+                                 ":.*SimpleQuery/2"
+                                 ":.*SockCallback/2"
+                                 ":.*SockConfigureCallback/2"
+                                 ":.*SortListV4/2"
+                                 ":.*SortListV6/2"
+                                 ":.*ThirdServer/2"
+                                 ":.*TruncationRetry/1"
+                                 ":.*UnspecifiedFamilyCname6A4/2"
+                                 ":.*UnspecifiedFamilyV4/2"
+                                 ":.*UnspecifiedFamilyV6/2")))))
+                 #~()))))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://c-ares.haxx.se/")
+    (synopsis "C library for asynchronous DNS requests")
+    (description
+     "C-ares is a C library that performs DNS requests and name resolution
+asynchronously.  It is intended for applications which need to perform DNS
+queries without blocking, or need to perform multiple DNS queries in parallel.
+The primary examples of such applications are servers which communicate with
+multiple clients and programs with graphical user interfaces.")
+    (license (license:x11-style "https://c-ares.haxx.se/license.html"))))
+
+(define-public c-ares-for-node-lts
+  (hidden-package c-ares))
+
+(define-public c-ares-for-node-bootstrap
+  (hidden-package
+   (package
+     (inherit c-ares)
+     (version "1.18.1")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+              "https://c-ares.haxx.se/download/c-ares-" version
+              ".tar.gz"))
+        (sha256
+         (base32
+          "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
+
+;; INFO: gRPC requires a c-ares built with CMake in order to get the .cmake
+;; modules.  We can not build c-ares itself with CMake because that would
+;; introduce a circular dependency through nghttp2.
+;;
+;; TODO: It would be nice if we could extract the modules somehow and make
+;; them work with the "normal" c-ares package instead of building a whole new
+;; library.
+(define-public c-ares/cmake
+  (hidden-package
+   (package
+     (inherit c-ares)
+     (build-system cmake-build-system)
+     (arguments
+      (list
+       ;; INFO: Tests require name resolution (the normal variant runs no
+       ;; tests).
+       #:tests? #f)))))

 (define-public cloudflare-cli
  (let ((commit "2d986d3ec1b0e3158c4bd40e8918947cb74aa392")
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -70,6 +70,7 @@
  #:use-module (gnu packages qt)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages sphinx)
+  #:use-module (gnu packages tex)
  #:use-module (gnu packages uglifyjs)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg))
@@ -108,10 +109,13 @@
                          #$output)
                         (("\\$cfg\\{'TMPSPACE'\\} = q'[^']*'")
                          "$cfg{'TMPSPACE'} = q'/tmp'")))))))
+    (propagated-inputs (list texlive-preview texlive-xcolor texlive-dvips))
    (inputs (list perl netpbm ghostscript))
    (synopsis "LaTeX documents to HTML")
    (description "LaTeX2HTML is a utility that converts LaTeX documents to web
-pages in HTML.")
+pages in HTML.  Since there are many different latex packages, it is expected
+that the user has their latex installation set up correctly when invoking
+@code{latex2html}.")
    (home-page "https://www.latex2html.org/")
    (license license:gpl2+)))

--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -240,8 +240,8 @@ are also taken from the original.")
      (license license:gpl3+))))

 (define-public abc
-  (let ((commit "c18b9a24de46d3b0209afa416511b7a1127344f9")
-        (revision "9"))
+  (let ((commit "80c8a9a1928ef8148a6b504e9590ec07c55c8bcf")
+        (revision "10"))
    (package
      (name "abc")
      (version (git-version "0.0" revision commit))
@@ -253,7 +253,7 @@ are also taken from the original.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "12fjhlr9r34l6kw2jyaalh53fs783r1h2zx0ldzaxxrbcslb0bxh"))))
+                  "1fbnwsd841z86vfv45443qfpx0l199vf08sgms8wyz19jw7m5ds6"))))
      (build-system gnu-build-system)
      (inputs
       (list readline))
@@ -278,7 +278,7 @@ formal verification.")
  (package
    (inherit abc)
    (name "abc-yosyshq")
-    (version "0.63")
+    (version "0.64")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -287,7 +287,7 @@ formal verification.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1nwj4zhjqjgvb7fh877j51kfccwzrc591ag25qm9jirycgq1cqx6"))))
+                "1jk74yq7dnrnai8r9hqc10jcjmgj50jxj6hsflmvc61acm1r3f8r"))))
    (home-page "https://github.com/YosysHQ/abc/")
    (description "ABC is a program for sequential logic synthesis and
 formal verification.  This is the Yosyshq fork of ABC.")
@@ -296,7 +296,7 @@ formal verification.  This is the Yosyshq fork of ABC.")
 (define-public apycula
  (package
    (name "apycula")
-    (version "0.31")
+    (version "0.32")
    ;; The pypi tar.gz file includes the necessary .pickle files, not available
    ;; in the home-page repository.
    (source
@@ -304,7 +304,7 @@ formal verification.  This is the Yosyshq fork of ABC.")
       (method url-fetch)
       (uri (pypi-uri "apycula" version))
       (sha256
-        (base32 "0pf43cd071kv5ann78hl5qrcj9vhndr46ds2g12sgnfjfvh6pfpg"))))
+        (base32 "0zz6mz1s7razbqsysaji7qwfsjj19av4mg7zclxaigz4hmq9ar0d"))))
    (build-system pyproject-build-system)
    (arguments
     (list #:tests? #f ;requires Gowin EDA tools
@@ -467,7 +467,7 @@ individual low-level driver modules.")
 (define-public eqy
  (package
    (name "eqy")
-    (version "0.63")
+    (version "0.64")
    (source
     (origin
       (method git-fetch)
@@ -476,7 +476,7 @@ individual low-level driver modules.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05rk6gy0xnaksxqdkpm08i3ngh0adavfyfjyscw5l1b7d7yhfavh"))))
+        (base32 "1lsf8wm10wq67lmwz1ck30inl3byfy27ya39fj93gym5ys815ma6"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1502,7 +1502,7 @@ an embedded event driven algorithm.")
 (define-public librelane
  (package
    (name "librelane")
-    (version "3.0.0")
+    (version "3.0.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1511,7 +1511,7 @@ an embedded event driven algorithm.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "01zi2v5qi26h09hwjafsq9k0anrc5g5fc6q5vg87k9lcwyfsi685"))))
+                "1v43adkw5c624nd06g11cb609v8pj3prfyyawbq3i4k1w1law597"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -2018,7 +2018,7 @@ which allows one to install the M8 firmware on any Teensy.")
 (define-public magic
  (package
    (name "magic")
-    (version "8.3.625")
+    (version "8.3.633")
    (source
     (origin
       (method git-fetch)
@@ -2027,7 +2027,7 @@ which allows one to install the M8 firmware on any Teensy.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0ld238cdq8mzzcx7vgk67aqim0ypbfyks486z59q19yzxpr6c42s"))))
+        (base32 "1rwrhb0q99rpv4lbiw1sqykwzf9gj1my2wkh6mp8g36rab2vhii3"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2057,7 +2057,7 @@ versus schematic} tests and can assist with automatic routing.")
 (define-public mcy
  (package
    (name "mcy")
-    (version "0.63")
+    (version "0.64")
    (source
     (origin
       (method git-fetch)
@@ -2120,7 +2120,7 @@ coverage.")
 (define-public netgen
  (package
    (name "netgen")
-    (version "1.5.316")
+    (version "1.5.318")
    (source
     (origin
       (method git-fetch)
@@ -2129,7 +2129,7 @@ coverage.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1923mynqw1wjhlcij639gdqrkifyb5lcks1x11gwpgp4gijwj3qb"))))
+        (base32 "19rd8y2pspycr2296nhm60fhsgnzlyzb09wx2kgqzg6s7h6cmrr5"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2690,20 +2690,20 @@ formats.")
 (define-public openroad
  (package
    (name "openroad")
-    (version "26Q1")
+    (version "26Q2")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/The-OpenROAD-Project/OpenROAD")
-              (commit "e06ca0f5f2e641cd7b138a4d9b4fdd290359eca8")
+              (commit version)
              ;; 26Q1 Uses:
-              ;; - forked, custom opensta: v2.2.0-1579-g9c9b5659
-              ;; - forked, custom (berkeley) abc: 20260104.1628-g4c756ffb8
+              ;; - forked, custom opensta: v2.2.0-1952-g43177bba
+              ;; - forked, custom (berkeley) abc: 20260301.0445-g17cadca08
              (recursive? #t)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "13x4kqi4j489k4sz56ws4aqhp60nff1i18z6hjd6xx8y7flaik0c"))))
+        (base32 "152j78c47wyq4sw42bwlxdhvs5g47a8jqz1qz5yzdsk9z5y4y7vl"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -2737,7 +2737,7 @@ formats.")
           flex
           googletest
           pkg-config
-           swig-4.0))
+           swig-4.4))
    (inputs
     (list abseil-cpp
           boost
@@ -2776,7 +2776,6 @@ clock tree synthesis, routing, parasitic extraction, and timing analysis.")
  (package
    (inherit openroad)
    (name "openroad-cli")
-    (build-system cmake-build-system)
    (arguments
     (delkw
      #:qtbase
@@ -3460,7 +3459,7 @@ form of AXI, AXI lite, and AXI stream modules.")
 (define-public python-edalize
  (package
    (name "python-edalize")
-    (version "0.6.5")
+    (version "0.6.6")
    (source
     (origin
       (method git-fetch)
@@ -3469,7 +3468,7 @@ form of AXI, AXI lite, and AXI stream modules.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1drmc126a12zlynx8ps9iwghaqs058pqj2xpdysxnrj26hg3sp15"))))
+        (base32 "115nc15n2cx4x9irjim07zkg0287418djqd6ja7rm8jrnyldvln9"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -3496,17 +3495,17 @@ form of AXI, AXI lite, and AXI stream modules.")
    (native-inputs
     (list python-pytest python-setuptools python-setuptools-scm))
    (propagated-inputs
-     (list python-importlib-metadata python-jinja2))
+     (list python-importlib-metadata python-jinja2 python-pandas))
    (home-page "https://github.com/olofk/edalize/")
    (synopsis "Python Library for interacting with EDA tools")
    (description
-     "This package implements a functionality to create project files for
-supported tools and run them in batch or GUI mode.  All EDA tools such as
-Icarus, Yosys, ModelSim, Vivado, Verilator, GHDL, Quartus etc get input HDL
-files (Verilog and VHDL) and some tool-specific files (constraint files,memory
-initialization files, IP description files etc).  Together with the files,
-perhaps a couple of Verilog `defines, some top-level parameters/generics or
-some tool-specific options are set.")
+     "This package can create project files for supported tools and run them in
+batch or GUI mode.  All EDA tools such as Icarus, Yosys, ModelSim, Vivado,
+Verilator, GHDL, Quartus etc get input HDL files (Verilog and VHDL) and some
+tool-specific files (constraint files,memory initialization files, IP
+description files etc).  Together with the files, perhaps a couple of Verilog
+`defines, some top-level parameters/generics or some tool-specific options are
+set.")
    (license license:bsd-2)))

 (define-public fusesoc
@@ -3793,7 +3792,7 @@ to enforce it.")
 (define-public python-vunit
  (package
    (name "python-vunit")
-    (version "5.0.0-dev.9") ;v4.7.0 dates back from 2 years ago.
+    (version "5.0.0-dev.10") ;v4.7.0 dates back from 2 years ago.
    (source
     (origin
       (method git-fetch)
@@ -3802,7 +3801,7 @@ to enforce it.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1j9rvlshzi4mdy7wah1j8ri63drkjb47xly22q40wvl2xp2ghqgs"))))
+        (base32 "1gr9ghwgqly9zf0sf15ai20sac520rs84b9i5qjxdqpj26ayyl1q"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -4000,7 +3999,7 @@ input and outputs an XML dataset.")
 (define-public qucs-s
  (package
    (name "qucs-s")
-    (version "25.2.0")                  ;update qucsator-rf accordingly
+    (version "26.1.0")                  ;update qucsator-rf accordingly
    (source
     (origin
       (method git-fetch)
@@ -4010,7 +4009,7 @@ input and outputs an XML dataset.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0328irynm8vy4xjdip5286fd8nag1zdp0p6rcbhdhp4fca6wp5ak"))))
+         "0aiyrcrxln4v6qm2dmigb54wl0mj499q3g18pz87m1s2lfgicpb1"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -4232,7 +4231,7 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
 (define-public sby
  (package
    (name "sby")
-    (version "0.63")
+    (version "0.64")
    (source
     (origin
       (method git-fetch)
@@ -4241,7 +4240,7 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1p23w9jd95b86n7f94zpqdaz19fn2b2lyww1p8dcy9p3zrcn7750"))))
+        (base32 "0jksspdgq2grk4a80i5yfc9bazfij37wpmrlkvygpz9ys5ny1432"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -4290,8 +4289,8 @@ front-end program for Yosys-based formal hardware verification flows.")
    (license license:isc)))

 (define-public sby-gui
-  (let ((commit "6c977084c17c4842c504829c6d455a07d67e119c")
-        (revision "0"))
+  (let ((commit "0a89301bf347c9f42932186e49ba2c0014ff3661")
+        (revision "1"))
    (package
      (name "sby-gui")
      (version (git-version "0" revision commit))
@@ -4303,10 +4302,13 @@ front-end program for Yosys-based formal hardware verification flows.")
                (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "137x3s5mwbzlcv2p6671ijvbafzwhxpvszzfi9wifq0wcli6cxxg"))))
+          (base32 "1zp2c7zqclsfvl5xhb8zlc1dclp2s36w2nd0x80fazsxp7ksw5gr"))))
      (build-system qt-build-system)
      (arguments
-       (list #:tests? #f))               ;no tests
+       (list
+        #:qtbase qtbase                 ;for Qt 6
+        #:tests? #f))                   ;no tests
+      (native-inputs (list python-minimal-wrapper))
      (propagated-inputs (list sby))
      (home-page "https://github.com/YosysHQ/sby-gui/")
      (synopsis "Graphical user interface for code{sby}")
@@ -4661,7 +4663,7 @@ parallel computing platforms.  It also supports serial execution.")
 (define-public yosys
  (package
    (name "yosys")
-    (version "0.63")
+    (version "0.64")
    (source
     (origin
       (method git-fetch)
@@ -4669,7 +4671,7 @@ parallel computing platforms.  It also supports serial execution.")
              (url "https://github.com/YosysHQ/yosys")
              (commit (string-append "v" version))))
       (sha256
-        (base32 "1iaafzsc0pbd61m5hh12nzr2z4rn4n7i68l6ij9vli4m5zsxw39k"))
+        (base32 "13gw5msk1kv05jkb330nybvx2s0ixm6l6mdpyapnqmv3lkhby1mj"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
@@ -4782,12 +4784,12 @@ parallel computing platforms.  It also supports serial execution.")
              (git-reference
                (url "https://github.com/povik/yosys-slang")
                ;; No tags, nor releases.
-                (commit "d82b0b163a725fc1a401fbb6b465cd862517ec1f")
+                (commit "4e53d772996184b07e9bfe784060f96e6cb0a267")
                (recursive? #t)))  ;requires slang and fmt
             (file-name "yosys-slang")
             (sha256
              (base32
-               "07h4qssphggd4mbn376vldqwzj1i16y1ix455xzr4lgx6s2q9ryg")))))
+               "1jjr1b6xd1sr9fkyfyl4y2wkzl51m7g10bw97mnw81v2mzssrs2q")))))
    ;; Optional dependencies increase considerably package closure.
    ;; - gtkwave: required only for vcd2fst binary, used by ‘sim’ command.
    ;; - graphviz, xdot: used by ‘show’ command to display schematics.
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2809,6 +2809,56 @@ versions of a topic branch.")
 diffs.")
      (license license:expat))))

+(define-public emacs-majutsu
+  (package
+    (name "emacs-majutsu")
+    (version "0.6.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/0WD0/majutsu")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1b840z3p10jyh8d6kmj7syad7308qr9p09gsci4gmha0iw3adnx5"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      ;; XXX: Test fails with `void-function transient--set-layout' when using
+      ;; wrapped ert-runner.
+      #:test-command
+      #~'(".ert-runner-real")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-references
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-variables "majutsu-jj.el"
+                ("majutsu-jj-executable"
+                 (search-input-file inputs "bin/jj")))))
+          (add-after 'install 'install-docs
+            (lambda _
+              (with-directory-excursion "docs"
+                (invoke "make" "majutsu.info")
+                (install-file "majutsu.info"
+                              (in-vicinity #$output "share/info"))))))))
+    (native-inputs
+     ;; Use unwrapped ert-runner in test, adding its inputs here.
+     (modify-inputs (package-inputs emacs-ert-runner)
+       (delete "bash-minimal")
+       (prepend emacs-ert-runner texinfo)))
+    (inputs (list jujutsu))
+    (propagated-inputs (list emacs-magit))
+    (home-page "https://github.com/0WD0/majutsu")
+    (synopsis "Emacs interface for Jujutsu version control system")
+    (description
+     "Majutsu provides a @code{emacs-magit}-style interface for
+@code{jujutsu}, offering an efficient way to interact with Jujutsu repositories
+from within Emacs.")
+    (license
+     (list license:gpl3+
+           license:expat))))
+
 (define-public emacs-conflict-buttons
  ;; No releases
  (let ((commit "22af851d6a0cdd226ef7ba0db54fa096c8ddf235")
@@ -9435,35 +9485,40 @@ column by drawing a thin line down the length of the editing window.")
    (license license:gpl3+)))

 (define-public emacs-greader
-  (let ((commit "b25974aeae49f11b91bb78d94ab51913fdfcdc05")) ;version bump
-    (package
-      (name "emacs-greader")
-      (version "0.13.1")
-      (source
-       (origin
-         (uri (git-reference
-                (url "https://gitlab.com/michelangelo-rodriguez/greader")
-                (commit commit)))
-         (method git-fetch)
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1qkszb4yrfnzb2rqkf6vmzca53w68p78zb58frcxslxn7s5l7ih1"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list #:tests? #f))              ;no tests
-      (inputs (list emacs-compat espeak-ng))
-      (home-page "https://gitlab.com/michelangelo-rodriguez/greader")
-      (synopsis
-       "Gnamù Reader, or Greader, sends buffer contents to a speech engine")
-      (description
-       "Greader is a module that sends any Emacs buffer to a @acronym{TTS,
+  (package
+    (name "emacs-greader")
+    (version "0.19.0")
+    (source
+     (origin
+       (uri (git-reference
+              (url "https://gitlab.com/michelangelo-rodriguez/greader")
+              (commit (string-append "v" version))))
+       (method git-fetch)
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "08c4i5qbr0ndbbps6y5kpp0lzfmxnwifrxssqkd9qdzj068k69k3"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list #:tests? #f ;no tests
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'make-info
+                 (lambda _
+                   (invoke "makeinfo" "--no-split" "greader.texi"))))))
+    (inputs (list emacs-compat espeak-ng))
+    (native-inputs (list texinfo))
+    (home-page "https://gitlab.com/michelangelo-rodriguez/greader")
+    (synopsis
+     "Gnamù Reader, or Greader, sends buffer contents to a speech engine")
+    (description
+     "Greader is a module that sends any Emacs buffer to a @acronym{TTS,
 Text To Speech} engine, such as Espeak-NG or Speech Dispatcher.

 The mode supports timer reading, automatic scrolling of buffers in modes like
 Info mode, and repeating reading of regions or the whole buffer.  It also
 includes a feature to facilitate the compilation of Espeak-NG
 pronunciations.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))

 (define-public emacs-grep-a-lot
  (package
@@ -15317,35 +15372,33 @@ them easier to distinguish from other, less important buffers.")
    (license license:expat)))

 (define-public emacs-embark
-  (let ((commit "0bdfd38d281d6375e6e675ce6f1bd597a9e3b136")
-        (revision "1"))
-    (package
-      (name "emacs-embark")
-      (version (git-version "1.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/oantolin/embark")
-                (commit commit)))
-         (sha256
-          (base32 "0m9y2wraapi744fg7y6cgz6y2gx0xzaglnxqalynz44ca9z6m6y4"))
-         (file-name (git-file-name name version))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #false                 ;no tests
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-before 'install 'makeinfo
-              (lambda _ (emacs-makeinfo))))))
-      (native-inputs (list texinfo))
-      (propagated-inputs
-       (list emacs-avy emacs-consult))
-      (home-page "https://github.com/oantolin/embark")
-      (synopsis "Emacs mini-buffer actions rooted in keymaps")
-      (description
-       "This package provides a sort of right-click contextual menu for Emacs
+  (package
+    (name "emacs-embark")
+    (version "1.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/oantolin/embark")
+              (commit version)))
+       (sha256
+        (base32 "1y97kibzz36wrzcjv997qp5pliikda0dhsm9461pin3q5gv8y6kq"))
+       (file-name (git-file-name name version))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:tests? #false                 ;no tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'makeinfo
+            (lambda _ (emacs-makeinfo))))))
+    (native-inputs (list texinfo))
+    (propagated-inputs
+     (list emacs-avy emacs-consult))
+    (home-page "https://github.com/oantolin/embark")
+    (synopsis "Emacs mini-buffer actions rooted in keymaps")
+    (description
+     "This package provides a sort of right-click contextual menu for Emacs
 offering you relevant @emph{actions} to use on a @emph{target} determined by
 the context.

@@ -15359,7 +15412,7 @@ get offered actions like deleting, copying, renaming, visiting in another
 window, running a shell command on the file, etc.  For buffers the actions
 include switching to or killing the buffer.  For package names the actions
 include installing, removing or visiting the homepage.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))

 (define-public emacs-prescient
  (package
@@ -17369,11 +17422,11 @@ accessing slash commands.")

 (define-public emacs-claude-code-ide
  ;; Upstream does not make versioned releases.
-  (let ((commit "5f12e60c6d2d1802c8c1b7944bbdf935d5db1364")
-        (revision "1"))
+  (let ((commit "56db02ee386d009ddb8b1482310f1f9beeefb810")
+        (revision "2"))
    (package
      (name "emacs-claude-code-ide")
-      (version (git-version "0.2.6" revision commit))
+      (version (git-version "0.2.7" revision commit))
      (source
       (origin
         (method git-fetch)
@@ -17382,7 +17435,7 @@ accessing slash commands.")
                (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "148xcrqff6khpwf8nnadcyvz8h6mk45xz1498k0wbzy80yzd2axn"))))
+          (base32 "060n6alwgnxqpqcl74c1ixjm0am1pfj2kx7v3wi4bys6dsf50zd8"))))
      (build-system emacs-build-system)
      (arguments
       (list
@@ -22376,7 +22429,7 @@ are common in Chromium-derived projects.")
 (define-public emacs-gnosis
  (package
    (name "emacs-gnosis")
-    (version "0.8.0")
+    (version "0.10.3")
    (source
     (origin
       (method git-fetch)
@@ -22385,7 +22438,7 @@ are common in Chromium-derived projects.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "003pmd0ahpcss5ydk3wbx5j45225ypa85zrgljz5qajijiybvxpi"))))
+        (base32 "0kpzc2jw51sklz15v0d0vzm5ck05n3d90l02la4nxn8r85jb1f53"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -22398,20 +22451,21 @@ are common in Chromium-derived projects.")
            (lambda _
              (setenv "HOME"
                      (getenv "TMPDIR"))
-              (mkdir-p (string-append (getenv "HOME") "/.emacs.d"))))
+              (mkdir-p (string-append
+                        (getenv "HOME")
+                        "/.emacs.d"))))
          (add-before 'install 'make-info
            (lambda _
              (invoke "make" "doc" "GUIX_SHELL="))))))
    (native-inputs (list texinfo))
-    (propagated-inputs (list emacs-compat emacs-emacsql emacs-org-gnosis
-                             emacs-transient))
+    (propagated-inputs (list emacs-transient))
    (home-page "https://thanosapollo.org/projects/gnosis/")
-    (synopsis "Spaced repetition system for GNU Emacs")
+    (synopsis "Personal knowledge system for GNU Emacs")
    (description
-     "Gnosis is a spaced repetition system for note-taking and self-testing
-where notes are formatted as Question/Answer/Explanation.  Notes are reviewed
-at spaced intervals based on the success or failure in recalling the answer to
-each question.")
+     "Gnosis is a personal knowledge system for GNU Emacs that
+integrates note-taking with spaced repetition.  It combines
+Zettelkasten-style linked notes with self-testing review,
+all stored in a single SQLite database.")
    (license license:gpl3+)))

 (define-public emacs-drag-stuff
@@ -24479,6 +24533,27 @@ key-bindings, avoiding most if not all the hassle introduced by key-binding
 conflicts.")
    (license license:gpl3+)))

+(define-public emacs-meow-tree-sitter
+  (package
+    (name "emacs-meow-tree-sitter")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://stable.melpa.org/packages/meow-tree-sitter-" version
+             ".tar"))
+       (sha256
+        (base32 "1sxa1flngzsj3hh3sp3kccwgsxq6d40wsn8vzgv0ahrxkz2s6fxg"))))
+    (build-system emacs-build-system)
+    (propagated-inputs (list emacs-meow))
+    (home-page "https://github.com/skissue/meow-tree-sitter")
+    (synopsis "Tree-sitter powered motions for Meow")
+    (description
+     "This package integrates the treesitter library in modern Emacs with
+Meow’s motions.")
+    (license (list license:gpl3+ license:mpl2.0))))
+
 (define-public emacs-xelb
  (package
    (name "emacs-xelb")
@@ -24975,36 +25050,91 @@ with Eglot.")
 (define-public emacs-jabber
  (package
    (name "emacs-jabber")
-    (version "0.9.0")
+    (version "0.10.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                    (url "https://codeberg.org/emacs-jabber/emacs-jabber")
-                    (commit (string-append "v" version))))
+                    (url "https://git.thanosapollo.org/emacs-jabber")
+                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0ain52p79sxll0bnsb4llfp1h4pqcqx3l6im4ibia06lg2aiqhpv"))))
+                "1v1a09h6ndqhkwyn44cnx1b0l4p155a09mfjrfmg62li50hvw1zm"))))
    (build-system emacs-build-system)
    (arguments
     (list
      #:lisp-directory "lisp"
+      #:include #~(cons "^[^/]*\\.so$"
+                        %default-include)
      #:emacs emacs                   ;requires gnutls
-      #:test-command #~(list "ert-runner" "../tests")
+      #:test-command #~(list "make" "-C" ".." "test")
      #:phases
      #~(modify-phases %standard-phases
-          (add-after 'unpack 'make-info
+          (add-after 'unpack 'build-native-module
            (lambda _
-              (invoke "makeinfo" "../jabber.texi"))))))
-    (native-inputs (list emacs-ert-runner texinfo))
-    (propagated-inputs (list emacs-fsm emacs-srv gnutls))
-    (home-page "https://codeberg.org/emacs-jabber/emacs-jabber")
+              (invoke "make" "-C" "../src")))
+          (add-before 'build-native-module 'unpack-picomemo
+            (lambda _
+              (copy-recursively
+               #$(this-package-native-input
+                  "emacs-jabber-picomemo")
+               "../src/picomemo")
+              (invoke "chmod" "--recursive" "u+w"
+                      "../src/picomemo")))
+          (add-after 'unpack 'fix-test-runner
+            (lambda _
+              ;; Replace grep -oP (Perl regex) with a
+              ;; POSIX-compatible alternative so the test
+              ;; runner counts results correctly.
+              (substitute* "../Makefile"
+                (("grep -oP '\\^Ran \\\\K\\[0-9\\]\\+'")
+                 (string-append
+                  "grep -o 'Ran [0-9]*'"
+                  " | grep -o '[0-9]*'")))))
+          (add-after 'unpack 'disable-failing-tests
+            (lambda _
+              ;; These 4 tests pass outside the build
+              ;; environment but fail inside it.
+              (define skip "\n  (skip-unless nil)")
+              (substitute*
+                  "../tests/jabber-disco-tests.el"
+                ((".*query-if-needed-cache-miss \\(\\)"
+                  all)
+                 (string-append all skip))
+                ((".*process-caps-modern.*queries \\(\\)"
+                  all)
+                 (string-append all skip)))
+              (substitute*
+                  (string-append
+                   "../tests/"
+                   "jabber-message-correct-tests.el")
+                ((".*correct-last-uses-original-id \\(\\)"
+                  all)
+                 (string-append all skip))
+                ((".*mam-syncing-skipped.*dispatch \\(\\)"
+                  all)
+                 (string-append all skip))))))))
+    (native-inputs
+     (list pkg-config
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                    (url "https://github.com/mierenhoop/picomemo")
+                    (commit "1.1.0")))
+             (file-name "emacs-jabber-picomemo")
+             (sha256
+              (base32
+               "044xd1gn9lpd5yrb3c1lmvqsc1chbkhd3vnh7800hxn23a0hxbzj")))))
+    (inputs (list mbedtls))
+    (propagated-inputs (list emacs-fsm))
+    (home-page "https://thanosapollo.org/projects/jabber/")
    (synopsis "XMPP (Jabber) client for Emacs")
    (description
     "@code{jabber.el} is an XMPP client for Emacs.  XMPP (also known as
 \"Jabber\") is an instant messaging system; see @url{https://xmpp.org} for
-more information.")
-    (license license:gpl2+)))
+more information.  It supports OMEMO end-to-end encryption via picomemo.")
+    (license (list license:gpl3+    ;gpl2+ elisp, gpl3+ C
+                   license:isc))))  ;picomemo

 (define-public emacs-jarchive
  (package
@@ -28143,7 +28273,7 @@ match and total match information in the mode-line in various search modes.")
 (define-public emacs-pg
  (package
    (name "emacs-pg")
-    (version "0.63")
+    (version "0.6.4")
    (source (origin
              (method git-fetch)
              (uri (git-reference (url "https://github.com/emarsden/pg-el")
@@ -28151,7 +28281,7 @@ match and total match information in the mode-line in various search modes.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "19hh45mlb4j6a3ys3wvivj0bm5xy5vjwscnvn68b656b5jk5himh"))))
+                "0w9a8y3s2dbmpqbbnxycxd38niqq2slzr26bfl4v1pfcm0w7skfz"))))
    (build-system emacs-build-system)
    (propagated-inputs (list emacs-peg))
    (home-page "https://github.com/emarsden/pg-el")
@@ -39361,10 +39491,16 @@ user interfaces for various built-in modes.")
              (make-file-writable "calibredb-core.el")
              (let ((calibredb (search-input-file inputs "/bin/calibredb"))
                    (fetch-ebook-metadata
-                     (search-input-file inputs "/bin/fetch-ebook-metadata")))
+                     (search-input-file inputs "/bin/fetch-ebook-metadata"))
+                    (ebook-convert
+                     (search-input-file inputs "/bin/ebook-convert"))
+                    (calibre-debug
+                     (search-input-file inputs "/bin/calibre-debug")))
                (emacs-substitute-variables "calibredb-core.el"
                  ("calibredb-fetch-metadata-program" fetch-ebook-metadata)
-                  ("calibredb-program" calibredb))))))))
+                  ("calibredb-program" calibredb)
+                  ("calibredb-convert-program" ebook-convert)
+                  ("calibredb-debug-program" calibre-debug))))))))
    (inputs
     (list calibre))
    (propagated-inputs
@@ -41064,7 +41200,7 @@ Lisp's (relatively new) EIEIO object oriented libraries.")
 (define-public emacs-fj
  (package
    (name "emacs-fj")
-    (version "0.33")
+    (version "0.34")
    (source
     (origin
       (method git-fetch)
@@ -41073,10 +41209,10 @@ Lisp's (relatively new) EIEIO object oriented libraries.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0cfzw9shd6jjir9zqcqbsz8vidsvs609a58aakh54dylngp52qmh"))))
+        (base32 "1y3k82q5iii7ddm6yj7397x2jscbcnvapd04zc5wjkqdr50cay3l"))))
    (build-system emacs-build-system)
    (arguments (list #:tests? #f))      ;depends on exemplify-ert
-    (propagated-inputs (list emacs-fedi emacs-magit emacs-tp))
+    (propagated-inputs (list emacs-fedi emacs-magit emacs-tp emacs-transient))
    (home-page "https://codeberg.org/martianh/fj.el")
    (synopsis "Client for Forgejo instances")
    (description
@@ -42137,10 +42273,10 @@ service, and connect it with Emacs via inter-process communication.")
      (license license:gpl3+))))

 (define-public emacs-telega
-  (let ((commit "805819bf81dffe2922e9e06ae02d58429d03aa1a"))
+  (let ((commit "8078beccf88c132d504ba9031062a6a2c65a1c8b"))
    (package
      (name "emacs-telega")
-      (version "0.8.601")               ; see telega-version in telega.el
+      (version "0.8.620")               ; see telega-version in telega.el
      (source
       (origin
         (method git-fetch)
@@ -42148,7 +42284,7 @@ service, and connect it with Emacs via inter-process communication.")
               (url "https://github.com/zevlg/telega.el")
               (commit commit)))
         (sha256
-          (base32 "0d02ymr5fw6fknzf9ikaky48swd9yfp5zn846zlwb5083p6bpmis"))
+          (base32 "1m7gs90hrmmwm7pvf5iz3y4v39psp6kbnw1d97q6v55hhgq3isxz"))
         (file-name (git-file-name "emacs-telega" version))
         (patches
          (search-patches "emacs-telega-test-env.patch"))))
@@ -46603,7 +46739,7 @@ Fennel code within Emacs.")
 (define-public emacs-org-modern
  (package
    (name "emacs-org-modern")
-    (version "1.12")
+    (version "1.13")
    (source
     (origin
       (method git-fetch)
@@ -46611,10 +46747,18 @@ Fennel code within Emacs.")
             (url "https://github.com/minad/org-modern")
             (commit version)))
       (sha256
-        (base32 "01p5k85hj677x2vk7j7a88gchp51ybiaj6iqmdhxivmcw3lb6ibi"))
+        (base32 "16i1nwdilhpjlphpbwi8vjfwfb721gm0mm37hjx570wx4sskvg30"))
       (file-name (git-file-name name version))))
    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:tests? #f                       ;no tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'makeinfo
+            (lambda _ (emacs-makeinfo))))))
    (propagated-inputs (list emacs-compat))
+    (native-inputs (list texinfo))
    (home-page "https://github.com/minad/org-modern")
    (synopsis "Modern Org style")
    (description
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -644,32 +644,6 @@ editor (console only)")
    (description "This Emacs build implements graphical UI purely in terms
 of GTK.")))

-(define-public emacs-xwidgets
-  (package/inherit emacs
-    (name "emacs-xwidgets")
-    (synopsis "The extensible, customizable, self-documenting text
-editor (with xwidgets support)")
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags flags #~'())
-        #~(cons "--with-xwidgets" #$flags))))
-    (inputs
-     (modify-inputs inputs
-       (prepend webkitgtk-with-libsoup2 libxcomposite)))))
-
-(define-public emacs-pgtk-xwidgets
-  (package
-    (inherit emacs-pgtk)
-    (name "emacs-pgtk-xwidgets")
-    (synopsis "Emacs text editor with @code{xwidgets} and @code{pgtk} support")
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags flags #~'())
-        #~(cons "--with-xwidgets" #$flags))))
-    (inputs
-     (modify-inputs inputs
-       (prepend gsettings-desktop-schemas webkitgtk-with-libsoup2)))))
-
 (define-public emacs-lucid
  (package/inherit emacs-no-x
    (name "emacs-lucid")
@@ -774,7 +748,6 @@ editor (with wide ints)" )

 (define-public emacs-next (emacs->emacs-next emacs))
 (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
-(define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
 (define-deprecated-package emacs-next-tree-sitter
  emacs-next)

--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -65,6 +65,7 @@
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages libftdi)
  #:use-module (gnu packages libusb)
+  #:use-module (gnu packages linux)
  #:use-module (gnu packages messaging)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages perl)
@@ -1901,7 +1902,7 @@ PicoBlaze; and Zilog Z80 families, plus many of their variants.")
    (inputs
     (list readline ucsim))
    (native-inputs
-     (list bison boost flex python-2 texinfo zlib))
+     (list bison boost flex python-minimal-wrapper texinfo zlib))
    (home-page "https://sdcc.sourceforge.net/")
    (synopsis "C compiler suite for 8-bit microcontrollers")
    (description "SDCC is a retargetable, optimizing Standard C compiler suite
@@ -2067,26 +2068,27 @@ operations.")
    (license license:asl2.0)))

 (define-public ts4900-utils
-  ;; There are no proper release nor tag; use the latest commit.
-  (let ((revision "0")
-        (commit "e10a12f8050d1d1229e711c7cfab8a0d5d93ee58"))
-    (package
-      (name "ts4900-utils")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/embeddedTS/ts4900-utils")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1vr8i425qijbwgbc10av3wr35p3x11wy6y442w0ja0yny7si8wp8"))))
-      (build-system gnu-build-system)
-      (native-inputs (list autoconf automake))
-      (home-page "https://github.com/embeddedTS/ts4900-utils")
-      (synopsis "Utilities for the TS-4900 board family")
-      (description "This package contains utilities useful for boards of the
+  (package
+    (name "ts4900-utils")
+    (version "3.0.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/embeddedTS/ts4900-utils")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "08x40ii56v4cmnz9hk6rvjrc500k1bij5ns52360vczznc8lx8bx"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     (list autoconf
+           automake
+           libgpiod
+           pkg-config))
+    (home-page "https://github.com/embeddedTS/ts4900-utils")
+    (synopsis "Utilities for the TS-4900 board family")
+    (description "This package contains utilities useful for boards of the
 TS-4900 family.  The included commands are:
@itemize @code
@item adc8390
@@ -2099,7 +2101,7 @@ TS-4900 family.  The included commands are:
@item tsmicroupdate
@item tssilomon
@end itemize")
-      (license license:bsd-2))))
+    (license license:bsd-2)))

 (define-public cc-tool
  (package
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -50,6 +50,7 @@
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Daniel Khodabakhsh <d@niel.khodabakh.sh>
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
+;;; Copyright © 2026 Brent Wedderburn <mb@bean.za.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -253,13 +254,21 @@ their devices.")
          (replace 'build (assoc-ref gnu:%standard-phases 'build))
          (replace 'check (assoc-ref gnu:%standard-phases 'check))
          (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((bin   (string-append #$output "/bin"))
-                    (share (string-append #$output "/share/librecad")))
+            (lambda _
+              (let* ((bin (string-append #$output "/bin"))
+                     (share (string-append #$output "/share"))
+                     (apps (string-append share "/applications"))
+                     (icons (string-append share "/icons/hicolor/128x128/apps")))
                (mkdir-p bin)
                (install-file "unix/librecad" bin)
                (mkdir-p share)
-                (copy-recursively "unix/resources" share)))))))
+                (copy-recursively "unix/resources"
+                                  (string-append share "/librecad"))
+                (mkdir-p apps)
+                (install-file "desktop/librecad.desktop" apps)
+                (mkdir-p icons)
+                (copy-file "librecad/res/main/librecad.png"
+                           (string-append icons "/librecad.png"))))))))
    (inputs
     (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
    (native-inputs
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -186,7 +186,7 @@ testing InfiniBand networks.")
 (define-public ucx
  (package
    (name "ucx")
-    (version "1.19.0")
+    (version "1.20.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -196,7 +196,7 @@ testing InfiniBand networks.")
              (patches (search-patches "ucx-tcp-iface-ioctl.patch"))
              (sha256
               (base32
-                "12j9200iyg6d0yr84r25hcpq8qqzfaa08klbhvgrqpflpfcljz4z"))
+                "12w1mxacml1w8zvl1hpn786cs77y056b9hxv7q1kq482bgc2si0v"))
              (snippet
               ;; As seen in commit b0a275a5492125a13020cd095fe9934e0b5e7c6a.
               #~(begin (use-modules (guix build utils))
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -34,6 +34,7 @@
  #:use-module (gnu packages anthy)
  #:use-module (gnu packages boost)
  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpp)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages dictionaries)
@@ -95,7 +96,7 @@ client.")
 (define-public fcitx5
  (package
    (name "fcitx5")
-    (version "5.1.16")
+    (version "5.1.19")
    (source
     (origin
       (method url-fetch)
@@ -103,9 +104,14 @@ client.")
             "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
             version "_dict.tar.zst"))
       (sha256
-        (base32 "0lwp90wjrkiws121rqn9kzdz6p1ncsk18dkmbv0zi37yqx2mv180"))))
+        (base32 "1ngsadqdrwy99w63dmk493gg56j7r991v6pq1nwkx6apib9ykpc0"))
+       (snippet
+        #~(begin
+            (use-modules (guix build utils))
+            (delete-file-recursively "third_party")))))
    (arguments
-     (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF")))
+     (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF"
+                                     "-DUSE_SYSTEM_YOGA=ON")))
    (build-system cmake-build-system)
    (inputs
     (list cairo
@@ -118,12 +124,12 @@ client.")
           gettext-minimal
           glib
           iso-codes/pinned
-           json-c
           libevent
           libuv
           libxcb
           libxkbcommon
           libxkbfile
+           nlohmann-json
           pango
           `(,util-linux "lib")         ;For libuuid.
           wayland
@@ -132,7 +138,8 @@ client.")
           xcb-util
           xcb-util-keysyms
           xcb-util-wm
-           xkeyboard-config))
+           xkeyboard-config
+           yoga))
    (native-inputs
     (list extra-cmake-modules
           zstd
@@ -154,7 +161,7 @@ client.")
 (define-public fcitx5-lua
  (package
    (name "fcitx5-lua")
-    (version "5.0.15")
+    (version "5.0.16")
    (source
     (origin
       (method url-fetch)
@@ -162,7 +169,7 @@ client.")
             "https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
             version ".tar.zst"))
       (sha256
-        (base32 "1yp5z97m8n7fwvxps1gn8pflg69j3yawgabz36bpd4wl43zkgchg"))))
+        (base32 "1zjiyadhqq8hijjv09khyj2shaw3ri4jgmb1ql67w9366wd0ykj2"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -171,7 +178,7 @@ client.")
    (inputs
     (list fcitx5 lua gettext-minimal))
    (native-inputs
-     (list extra-cmake-modules))
+     (list extra-cmake-modules pkg-config))
    (home-page "https://github.com/fcitx/fcitx5-lua")
    (synopsis "Lua support for Fcitx 5")
    (description "Fcitx5-lua allows writing Fcitx5 extension in Lua.")
@@ -180,14 +187,14 @@ client.")
 (define-public libime
  (package
    (name "libime")
-    (version "1.1.12")
+    (version "1.1.14")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
                           version "_dict.tar.zst"))
       (sha256
-        (base32 "02n6xbbxfckzx5sqrclnh4cvqlnj9c5rpys07kd8r8m51paqzigq"))))
+        (base32 "17r54fd6whvcxn389k4ah9mj1fc61zgama5nhiv1ilx40n1hnnpv"))))
    (build-system cmake-build-system)
    (inputs
     (list fcitx5 boost (list zstd "lib")))
@@ -202,7 +209,7 @@ editors.")
 (define-public fcitx5-gtk
  (package
    (name "fcitx5-gtk")
-    (version "5.1.4")
+    (version "5.1.6")
    (source
     (origin
       (method url-fetch)
@@ -210,7 +217,7 @@ editors.")
                           "/fcitx5-gtk/fcitx5-gtk-"
                           version ".tar.zst"))
       (sha256
-        (base32 "0lwl17mbfm3pxpd3y7h4sxf77npr16hyzygrc7a6v26bx6ycbkqx"))))
+        (base32 "0qj5gjdnrxcyz6a455b4379iwnzazw5a6c6dyk6wz0d2bgainc75"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -324,7 +331,7 @@ IM module for GTK+3 applications.
 (define-public fcitx5-qt
  (package
    (name "fcitx5-qt")
-    (version "5.1.11")
+    (version "5.1.13")
    (source
     (origin
       (method url-fetch)
@@ -332,7 +339,7 @@ IM module for GTK+3 applications.
                           "/fcitx5-qt/fcitx5-qt-"
                           version ".tar.zst"))
       (sha256
-        (base32 "0mc396zfafs34jraj9fdk0wyzvdzg4xi605rhrd492xcpf25b59v"))))
+        (base32 "1yawhwnycrqp1flik3hc2vskvsyjfm6rkcdhsqnawix22r2n1wl0"))))
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags
@@ -363,7 +370,7 @@ for Qt based application.")
 (define-public fcitx5-anthy
  (package
    (name "fcitx5-anthy")
-    (version "5.1.8")
+    (version "5.1.10")
    (source
     (origin
       (method url-fetch)
@@ -371,7 +378,7 @@ for Qt based application.")
                           "/fcitx5-anthy/fcitx5-anthy-"
                           version ".tar.zst"))
       (sha256
-        (base32 "1kv930nxz6q8ijb319fnnkzdyigbi36f2cwijnv4sy3rd0nykxrv"))))
+        (base32 "11h7b687xj2k1hp7dqj6wh5y6i55cm8m5pqbi5vbflgg0cy5v1mp"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f)) ;; no tests
@@ -387,7 +394,7 @@ the Anthy input method.")
 (define-public fcitx5-skk
  (package
    (name "fcitx5-skk")
-    (version "5.1.8")
+    (version "5.1.10")
    (source
     (origin
       (method git-fetch)
@@ -396,14 +403,14 @@ the Anthy input method.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "11h6y7rv6yppp7iy8csy7r2pi2mlnjgl8h4h8ghfwab1gm7v32fn"))))
+        (base32 "1fjiyx6dyiqxlypr1k4024lnc077xsnx4qwrwx9hj3yjdni5f2p0"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f      ; no tests
           #:configure-flags
-           #~(list (string-append "-DSKK_DEFAULT_PATH="
+           #~(list (string-append "-DSKK_PATH="
                                  #$(this-package-input "skk-jisyo")
-                                  "/share/skk/SKK-JISYO.L"))))
+                                  "/share/skk"))))
    (native-inputs
     (list extra-cmake-modules gobject-introspection
           pkg-config gettext-minimal))
@@ -423,14 +430,14 @@ backend.")
 (define-public fcitx5-unikey
  (package
    (name "fcitx5-unikey")
-    (version "5.1.8")
+    (version "5.1.10")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/fcitx/fcitx5-unikey")
                    (commit version)))
              (sha256
-               (base32 "1nai5v6r367iwj8yxg4flv41my57l88l9vy0id9wr3hvrvls9v31"))
+               (base32 "1ddg5648r8jbdr8khawfhl26020snvrlgjwppw5rlh4iw3a4m143"))
              (file-name (git-file-name name version))))
    (build-system qt-build-system)
    (arguments
@@ -450,14 +457,14 @@ backend.")
 (define-public fcitx5-chewing
  (package
    (name "fcitx5-chewing")
-    (version "5.1.9")
+    (version "5.1.11")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/fcitx/fcitx5-chewing")
                    (commit version)))
              (sha256
-               (base32 "1mgpxvmxfbqy8gymdsdmspgknh0pc751dm5rsrvdvfbd5lsa6pn6"))
+               (base32 "1x4a4vcb7vg9dx0f2bjrb2v6dcr8cwxnm8gdd47fkxqn890rgrnc"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -479,7 +486,7 @@ backend.")
 (define-public fcitx5-chinese-addons
  (package
    (name "fcitx5-chinese-addons")
-    (version "5.1.10")
+    (version "5.1.12")
    (source
     (origin
       (method url-fetch)
@@ -487,7 +494,7 @@ backend.")
                           "/fcitx5-chinese-addons/fcitx5-chinese-addons-"
                           version "_dict.tar.zst"))
       (sha256
-        (base32 "11gnywigqys3gndb175nxk10k1ld3xvwd6kggqnxs95imc2004dd"))))
+        (base32 "09kk8r6pcxjhivwv4z5cdv2pqy0ry8ngnfbrcmwagzyq2jq9p2cr"))))
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags
@@ -540,7 +547,7 @@ including input methods previous bundled inside Fcitx 4:
 (define-public fcitx5-configtool
  (package
    (name "fcitx5-configtool")
-    (version "5.1.11")
+    (version "5.1.13")
    (source
     (origin
       (method url-fetch)
@@ -548,7 +555,7 @@ including input methods previous bundled inside Fcitx 4:
             "https://download.fcitx-im.org/fcitx5"
             "/fcitx5-configtool/fcitx5-configtool-" version ".tar.zst"))
       (sha256
-        (base32 "1c5pw6p33z7lyk16jr1w72snazdc4q83ywn0gsk68qgmmfql5qr1"))))
+        (base32 "1sr8ri68qbkgvnj9pr5yw680zq506h26ymfmyz7ihw5ri14a6klr"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -661,7 +668,7 @@ for Fcitx 5 with following color variants:
 (define-public fcitx5-rime
  (package
    (name "fcitx5-rime")
-    (version "5.1.12")
+    (version "5.1.13")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://download.fcitx-im.org/fcitx5"
@@ -669,7 +676,7 @@ for Fcitx 5 with following color variants:
                                  ".tar.zst"))
              (sha256
               (base32
-                "1blqfk8zpzd5v2r7gwjy12jbnsh26pcvad8q4mmhlg5j10yppg03"))))
+                "03wcdgdhkvw5341vjv3idyksykm65y0873vkcrsi16dsp8w0h7i8"))))
    (build-system cmake-build-system)
    (arguments
     '(#:tests? #f ;no tests
@@ -700,7 +707,7 @@ output.")
 (define-public fcitx5-hangul
  (package
    (name "fcitx5-hangul")
-    (version "5.1.7")
+    (version "5.1.9")
    (source
     (origin
       (method git-fetch)
@@ -709,7 +716,7 @@ output.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "02lkbwg25jr4hazjyxcy69midfsmxc0ksbdrfwbmqcfa3kz5d9gb"))))
+        (base32 "0ja5faara4xz8waccpa5gbi3prh02hh3gpf915czhbkihffby6ng"))))
    (build-system cmake-build-system)
    (native-inputs (list extra-cmake-modules pkg-config gettext-minimal))
    (inputs (list fcitx5 libhangul))
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -2202,7 +2202,7 @@ while working with large number of files.")
 (define-public squashfuse
  (package
    (name "squashfuse")
-    (version "0.1.105")
+    (version "0.6.1")
    (source
     (origin
       (method git-fetch)
@@ -2211,7 +2211,7 @@ while working with large number of files.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224"))))
+        (base32 "16ds2xlk6hb5cggi6di8s0aalir3mrx7rk24rw5daad1xw4dbq0y"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2249,7 +2249,8 @@ memory-efficient.")
                 (install-file "fuseprivate.h"
                               (string-append #$output
                                              "/include/squashfuse/")))))))))
-    (inputs (list fuse-for-appimage
+    (inputs (list `(,fuse "out")
+                  `(,fuse "static")
                  `(,zstd "lib")
                  `(,zstd "static")
                  `(,zlib "out")
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -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
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2016, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
@@ -84,7 +84,6 @@
  #:use-module (gnu packages linux)
  #:use-module (gnu packages mtools)
  #:use-module (gnu packages pciutils)
-  #:use-module (gnu packages pciutils)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
@@ -524,162 +523,6 @@ Loke and Heimdall communicate via the custom Samsung-developed protocol typicall
 referred to as the \"Odin 3 protocol\".")
    (license license:expat)))

-(define-public ifdtool
-  (package
-    (name "ifdtool")
-    (version "25.09")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://review.coreboot.org/coreboot")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/ifdtool")))
-          (delete 'configure))           ; no configure script
-      #:tests? #f))                    ; no test suite
-    (home-page "https://doc.coreboot.org/util/ifdtool/")
-    (synopsis "Intel Firmware Descriptor dumper")
-    (description "This package provides @command{ifdtool}, a program to
-dump Intel Firmware Descriptor data of an image file.")
-    (license license:gpl2)))
-
-(define-public bincfg
-  (package
-    (name "bincfg")
-    (version "25.09")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://review.coreboot.org/coreboot")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; no test suite
-      #:make-flags
-      #~(list
-         (string-append "CC=" #$(cc-for-target)))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure) ; no configure script
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/bincfg")))
-          (add-after 'build 'build-binaries
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (for-each
-               (lambda (target result)
-                 (apply invoke "make" (string-append "gen-" target) make-flags)
-                 (rename-file result
-                              (string-append target ".bin")))
-               (list
-                ;; generate GbE for X200
-                "gbe-ich9m"
-                ;; generate GbE for X220/x230
-                "gbe-82579LM"
-                ;; generate IFD for X200
-                "ifd-x200")
-               (list
-                "flashregion_3_gbe.bin"
-                "flashregion_3_gbe.bin"
-                "flashregion_0_fd.bin"))))
-          ;; The Makefile has no install target.
-          (replace 'install
-            (lambda _
-              (let ((bin (string-append #$output "/bin"))
-                    (lib (string-append #$output "/lib/bincfg"))
-                    (data (string-append #$output "/share/bincfg")))
-                ;; Install the program
-                (install-file "bincfg" bin)
-                ;; And its data
-                (for-each
-                 (lambda (path)
-                   (install-file path data))
-                 (append (find-files "." ".*\\.set")
-                         (find-files "." ".*\\.spec")))
-                ;; And the files generated with the data
-                (for-each
-                 (lambda (path)
-                   (install-file path lib))
-                 (find-files "." ".*\\.bin"))))))))
-    (native-inputs (list bison flex))
-    (home-page "https://coreboot.org")
-    (synopsis "Encoder/decoder for binary formats described in text files")
-    (description "
-The bincfg program comes with specifications files for the following binary
-formats:
-@itemize
-@item Various DDR3 and DDR4 SPD
-@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
-@item Configuration data for the Intel Gigabit Ethernet controller present in
-      the Intel ICH9-M chipset.
-@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
-@item Configuration data for the ITE IT8718F SuperIO
-@end itemize
-It also comes with example files generated by bincfg.")
-    (license license:gpl3+)))
-
-(define-public intelmetool
-  (package
-    (name "intelmetool")
-    (version "25.09")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://review.coreboot.org/coreboot")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f                       ;no test suite
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/intelmetool")))
-          (delete 'configure) ;no configure script
-          (delete 'check))))
-    (inputs (list pciutils zlib))
-    (home-page
-     "https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
-    (synopsis "Intel Management Engine tools")
-    (description "This package provides tools for working with Intel
-Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
-@code{sudo rmmod mei} before using this tool.  Also pass
-@code{iomem=relaxed} to the Linux kernel command line.")
-    (license license:gpl2)
-
-    ;; This is obviously an Intel thing, plus it requires <cpuid.h>.
-    (supported-systems '("x86_64-linux" "i686-linux"))))
-
 (define-public me-cleaner
  (package
    (name "me-cleaner")
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -52,6 +52,7 @@
      (uri (git-reference
              (url "https://github.com/fltk/fltk")
              (commit (string-append "release-" version))))
+      (file-name (git-file-name name version))
      (sha256
       (base32 "0pnifyhhvcqfjd6iaa4m14kvfyqhjjdw0aqbcizcdhhqrl6q4pjg"))))
   (build-system gnu-build-system)
--- a/gnu/packages/fortran-xyz.scm
+++ b/gnu/packages/fortran-xyz.scm
@@ -28,7 +28,8 @@
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python))
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build))

 ;;; Please: Try to add new module packages in alphabetic order.
 ;;;
@@ -144,7 +145,7 @@ a.s.o.
 (define-public fortran-mctc-lib
  (package
    (name "fortran-mctc-lib")
-    (version "0.3.2")
+    (version "0.5.1")
    (source
     (origin
       (method git-fetch)
@@ -154,7 +155,7 @@ a.s.o.
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1gabdxllx2pcw1mbv4gw9zpn6817ikz9ql8xs9w86wswd6f0m5kl"))))
+         "1wp8apv0psl2hkhlrd5pgnhbxk8zpxa0ijkhcnb09klbxcsi8p5f"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -243,7 +244,7 @@ calculate partial charges used in the DFT-D4 model.")
 (define-public fortran-simple-dftd3
  (package
    (name "fortran-simple-dftd3")
-    (version "1.2.1")
+    (version "1.3.0")
    (source
     (origin
       (method git-fetch)
@@ -252,7 +253,7 @@ calculate partial charges used in the DFT-D4 model.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0aygmnax3vwz2x3ad7syksfjca4zc85nyslsibs0wg8wqfsmr33k"))))
+        (base32 "1602pwmxa8qjllgj7k9hq2bm4s838f6qzr7mpc0rbh28gm00c1fw"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -265,7 +266,8 @@ calculate partial charges used in the DFT-D4 model.")
     (list gfortran
           pkg-config
           python-minimal
-           python-cffi))
+           python-cffi
+           python-setuptools))
    (inputs
     (list fortran-mctc-lib
           fortran-mstore
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -97,6 +97,7 @@
 ;;; Copyright © 2025 Aiden Isik <aidenisik+git@member.fsf.org>
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
+;;; Copyright © 2026 Nikita Alkhovik <forgoty13@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -114,40 +115,32 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages games)
-  #:use-module (ice-9 match)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix utils)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix svn-download)
-  #:use-module (guix gexp)
-  #:use-module (gnu packages)
+  #:autoload (gnu packages pascal) (fpc)
  #:use-module (gnu packages acl)
-  #:use-module (gnu packages adns)
+  #:use-module (gnu packages admin)
  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages assembly)
+  #:use-module (gnu packages audio)
  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages avahi)
  #:use-module (gnu packages backup)
  #:use-module (gnu packages base)
-  #:use-module (gnu packages build-tools)
-  #:use-module (gnu packages admin)
-  #:use-module (gnu packages audio)
-  #:use-module (gnu packages avahi)
-  #:use-module (gnu packages assembly)
  #: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 c)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
-  #:use-module (gnu packages compression)
  #:use-module (gnu packages code)
+  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages curl)
  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages curl)
  #:use-module (gnu packages cyrus-sasl)
-  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages dns)
  #:use-module (gnu packages docbook)
+  #:use-module (gnu packages documentation)
  #:use-module (gnu packages emacs)
  #:use-module (gnu packages emulators)
  #:use-module (gnu packages flex)
@@ -202,8 +195,8 @@
  #:use-module (gnu packages maths)
  #:use-module (gnu packages messaging)
  #:use-module (gnu packages mp3)
-  #:use-module (gnu packages music)
  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages music)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages netpbm)
  #:use-module (gnu packages networking)
@@ -212,7 +205,6 @@
  #:use-module (gnu packages oneapi)
  #:use-module (gnu packages opencl)
  #:use-module (gnu packages pcre)
-  #:autoload (gnu packages pascal) (fpc)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages perl-check)
  #:use-module (gnu packages perl-compression)
@@ -230,9 +222,9 @@
  #:use-module (gnu packages readline)
  #:use-module (gnu packages regex)
  #:use-module (gnu packages ruby-xyz)
-  #:use-module (gnu packages shells)
  #:use-module (gnu packages sdl)
  #:use-module (gnu packages serialization)
+  #:use-module (gnu packages shells)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages squirrel)
  #:use-module (gnu packages swig)
@@ -249,22 +241,31 @@
  #:use-module (gnu packages wget)
  #:use-module (gnu packages wxwidgets)
  #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xorg)
  #:use-module (gnu packages xiph)
  #:use-module (gnu packages xml)
-  #:use-module (guix build-system copy)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages)
  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system haskell)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
-  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system scons)
  #:use-module (guix build-system trivial)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix svn-download)
+  #:use-module (guix utils)
+  #:use-module (ice-9 match)
  #:use-module ((srfi srfi-1) #:hide (zip))
  #:use-module (srfi srfi-26))

@@ -483,7 +484,7 @@ mouse and joystick control, and original music.")
      (source (origin
                (method git-fetch)
                (uri (git-reference
-                      (url "https://git.sr.ht/~drummyfish/Anarch")
+                      (url "https://gitlab.com/drummyfish/anarch")
                      (commit commit)))
                (file-name (git-file-name name version))
                (sha256
@@ -4276,11 +4277,11 @@ interface or via an external visual interface such as GNU XBoard.")
               (("TestIOTouchDragAnywhere (test_integration)" all _) _))))
         (add-before 'bootstrap 'autoreconf
           (lambda _
-	     ;; automake is out of date in the source
-	     ;; autoreconf updates the automake scripts
-	     (invoke "autoreconf")
-	     ;; Build fails when autom4te.cache exists.
-	     (delete-file-recursively "autom4te.cache")
+             ;; automake is out of date in the source
+             ;; autoreconf updates the automake scripts
+             (invoke "autoreconf")
+             ;; Build fails when autom4te.cache exists.
+             (delete-file-recursively "autom4te.cache")
             #t))
         (add-after 'install 'delete-freedinkedit-desktop
           (lambda* (#:key outputs #:allow-other-keys)
@@ -4610,6 +4611,105 @@ for common mesh file formats, and collision detection.")
    (home-page "https://irrlicht.sourceforge.io/")
    (license license:zlib)))

+(define-public pegasus-frontend
+  (let ((commit "c3462e68bf3a178420b44f356998255f8d82a113")
+        (revision "weekly_2024w38"))
+    (package
+      (name "pegasus-frontend")
+      (version (git-version "0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mmatyas/pegasus-frontend")
+               (commit commit)))
+         (sha256
+          (base32 "1p350nlbif33mw5cbqxwli5yf47dxpransxlj2wp8xvh4w1rb3jx"))
+         (file-name (git-file-name name version))))
+      (build-system qt-build-system)
+      (arguments
+       (list
+        #:qtbase qtbase-5
+        #:make-flags
+        #~(list (string-append "INSTALL_DESKTOPDIR="
+                               #$output "/share/applications")
+                (string-append "INSTALL_ICONDIR="
+                               #$output "/share/icons/hicolor"))
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'copy-modules
+              (lambda* (#:key inputs #:allow-other-keys)
+                (copy-recursively #$(this-package-native-input
+                                     "SortFilterProxyModel")
+                                  "./thirdparty/SortFilterProxyModel")
+                (copy-recursively #$(this-package-native-input
+                                     "pegasus-theme-grid")
+                                  "./src/themes/pegasus-theme-grid")
+                (copy-recursively #$(this-package-native-input
+                                     "pegasus-frontend-translations") "./lang")))
+            (add-before 'check 'prepare-test-env
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (setenv "QT_QPA_PLATFORM" "offscreen")
+                  (setenv "QT_QUICK_BACKEND" "software"))))
+            (add-after 'qt-wrap 'gst-wrap
+              (lambda* (#:key inputs #:allow-other-keys)
+                (wrap-program (string-append #$output "/bin/pegasus-fe")
+                  `("GST_PLUGIN_PATH" suffix
+                    ,(search-path-as-list '("lib/gstreamer-1.0")
+                                          (map cdr inputs)))))))))
+      (inputs (list sdl2
+                    bash-minimal
+                    qtbase-5
+                    qtsvg-5
+                    qtdeclarative-5
+                    qtgraphicaleffects
+                    qtmultimedia-5
+                    qtgamepad-5
+                    gst-plugins-base
+                    gst-plugins-bad
+                    gst-plugins-good))
+      (native-inputs (list qttools-5
+                           (origin
+                             (method git-fetch)
+                             (uri (git-reference
+                                   (url
+                                    "https://github.com/mmatyas/pegasus-frontend-translations")
+                                   (commit
+                                    "46c7cecec745bdd4c61bfc7ecb967156ad208642")))
+                             (file-name "pegasus-frontend-translations")
+                             (sha256 (base32
+                                      "0rvlx199wdrjxr8pgibga556zf4njq4w2n31fdirqgb631rgyqxd")))
+                           (origin
+                             (method git-fetch)
+                             (uri (git-reference
+                                   (url
+                                    "https://github.com/mmatyas/pegasus-theme-grid")
+                                   (commit
+                                    "5951db6f2a4fe0db6a4fd6f00da1f280cadfa536")))
+                             (file-name "pegasus-theme-grid")
+                             (sha256 (base32
+                                      "1nfnq6lppdm9ni6jk48l1i7hk90m8w2p13swl5nr4zwczln8dbz1")))
+                           (origin
+                             (method git-fetch)
+                             (uri (git-reference
+                                   (url
+                                    "https://github.com/mmatyas/SortFilterProxyModel")
+                                   (commit
+                                    "2061f8136ba372fd06c1928a610258b7d88cb144")))
+                             (file-name "SortFilterProxyModel")
+                             (sha256 (base32
+                                      "16va8fcf7v6kfm8r9zym0516qrk4vlsy5wmpd3r3002wpz8q39h2")))))
+      (synopsis
+       "Graphical frontend for launching and managing game collection")
+      (description
+       "Pegasus is a graphical frontend for browsing your game library and
+  launching all kinds of games from the same place. It's focusing on
+  customizability, cross platform support (including embedded)
+  and high performance.")
+      (home-page "https://pegasus-frontend.org")
+      (license license:gpl3+))))
+
 (define-public mars
  ;; No official release since 2013: use the latest commit.
  (let ((commit   "84664cda094efe6e49d9b1550e4f4f98c33eefa2")
@@ -5421,7 +5521,7 @@ falling, themeable graphics and sounds, and replays.")
    (name "wesnoth")
    ;; Even-numbered minor versions indicate stable versions:
    ;; https://wiki.wesnoth.org/ReleasingWesnoth#Version_numbering
-    (version "1.18.6")
+    (version "1.18.7")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -5430,7 +5530,7 @@ falling, themeable graphics and sounds, and replays.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0cdlczxczqgzdaqwydb9gfgi7d9jc39li72p2rb5nk1rlgfff79s"))))
+                "0hdrp4xm9d8kj8id2g5q0wwdwykx4a0f1cs8a7fghmv0czryfv7f"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                  ;no test target
@@ -6649,7 +6749,7 @@ in-window at 640x480 resolution or fullscreen.")
 (define-public warzone2100
  (package
    (name "warzone2100")
-    (version "4.6.1")
+    (version "4.6.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/warzone2100/releases/"
@@ -6665,7 +6765,7 @@ in-window at 640x480 resolution or fullscreen.")
                                 "inih" "re2" "utf8proc" "utfcpp")))))
              (sha256
                (base32
-                  "02x5ihkpfkpjxwvh00d8yqzd796af7d684nk96hzhhq28qw5bb16"))))
+                  "0fmiy0pm56yy69c0nhynjdiaslwlfg8cdvfl5s78g5pzdi1y47s3"))))
    (build-system cmake-build-system)
    (arguments (list #:configure-flags #~'("-GNinja"
                                           "-DWZ_DISTRIBUTOR=Guix"
@@ -6702,7 +6802,7 @@ in-window at 640x480 resolution or fullscreen.")
                  opusfile
                  physfs
                  re2
-                  sdl2
+                  sdl3
                  sqlite
                  utf8proc
                  utfcpp
@@ -9143,7 +9243,7 @@ elements to achieve a simple goal in the most complex way possible.")
 (define-public the-powder-toy
  (package
    (name "the-powder-toy")
-    (version "99.3.384")
+    (version "99.5.394")
    (source
     (origin
       (method git-fetch)
@@ -9152,7 +9252,7 @@ elements to achieve a simple goal in the most complex way possible.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0l067j0bbzvr0i2prxrgb0af4xdpl648x741jgnyp4bjzdbm61x7"))
+        (base32 "0wd0sg3lpl9xafyj76syvpdjh574cxjmxaf9kssfjjxs20y3hjn8"))
       (snippet
        #~(begin (use-modules (guix build utils))
                 (substitute* "meson.build"
@@ -10143,7 +10243,7 @@ your score gets higher, you level up and the blocks fall faster.")
                                     "-DES_USE_SYSTEM_LIBRARIES=1")
           #:make-flags #~(list (string-append "PREFIX=" #$output))
           #:build-type "Release"
-	   #:tests? (not (target-x86-32?))
+           #:tests? (not (target-x86-32?))
           #:phases
           #~(modify-phases %standard-phases
               (add-after 'unpack 'fix-paths
@@ -11127,7 +11227,7 @@ levels to unlock.")
 (define-public simgear
  (package
    (name "simgear")
-    (version "2024.1.4")
+    (version "2024.1.5")
    (source
     (origin
       (method git-fetch)
@@ -11139,7 +11239,7 @@ levels to unlock.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1k855yxq06gv42f83c3k9hrsz05xxj6vi1c60227zm0dx3jkb4jq"))
+        (base32 "1ygdc8xkrj7qzm9zklibb1v5w3jp718707zmiwl8fn63sxanbqsq"))
       (modules '((guix build utils)))
       (snippet
        '(begin
@@ -11191,7 +11291,7 @@ and also provides the base for the FlightGear Flight Simulator.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0xlpry1g5xci4qmj37rjk4sdhg9zada0vw6a047gsm7cq5p7pkxk"))
+        (base32 "0hpfvacnba2kcyjwm01lkrqkz0gccvljjil8b0ai42l38hxn5r5h"))
       (modules '((guix build utils)))
       (snippet
        '(begin
@@ -11275,12 +11375,12 @@ and also provides the base for the FlightGear Flight Simulator.")
       ("flightgear-data"
        ,(origin
           (method url-fetch)
-           (uri (string-append "mirror://sourceforge/flightgear/release-"
+           (uri (string-append "https://mirrors.ibiblio.org/flightgear/ftp/release-"
                               (version-major+minor version) "/"
                               "FlightGear-" version "-data.txz"))
           (sha256
            (base32
-             "0pgwxpm5cdm0y6klrmpqspmhmqsfxshz4jljw2kd4wy18fqzd1s6"))))))
+             "0d81yz9jqmg2jzw5rm769pl1j18pvh2mjkx61l13kw76ja8p6159"))))))
    (home-page "https://www.flightgear.org/")
    (synopsis "Flight simulator")
    (description "The goal of the FlightGear project is to create a
@@ -12184,7 +12284,7 @@ for using any UCI engine and also to connect UCI engines to Lichess and IRC.")
        (base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv"))))
    (build-system glib-or-gtk-build-system)
    (inputs (list automake autoconf pkg-config intltool
-		  gettext-minimal libtool glib gtk+-2 boost))
+                  gettext-minimal libtool glib gtk+-2 boost))
    (arguments (list #:tests? #f))  ; No tests in source.
    (home-page "http://nine-mens-morris.net/downloads.html")
    (synopsis "Implementation of the board game Nine Men's Morris")
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2936,7 +2936,7 @@ to the OSM opening hours specification.")
 (define-public josm
  (package
    (name "josm")
-    (version "19539")
+    (version "19555")
    (source (origin
              (method svn-fetch)
              (uri (svn-reference
@@ -2945,7 +2945,7 @@ to the OSM opening hours specification.")
                     (recursive? #f)))
              (sha256
               (base32
-                "05kslpvdwl4fldjzl6m2kmqvbmjv5yvipfavg01l30ywhw2c7v7v"))
+                "0kpshdj8kf9ag7h1qqrh9jqc6c9iv8v369mk60a8g7cbzf0xpblw"))
              (file-name (string-append name "-" version "-checkout"))
              (modules '((guix build utils)))
            (snippet
--- a/gnu/packages/gkrellm.scm
+++ b/gnu/packages/gkrellm.scm
@@ -19,10 +19,12 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gkrellm)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
+  #:use-module (guix utils)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages pkg-config)
@@ -31,32 +33,27 @@
 (define-public gkrellm
  (package
    (name "gkrellm")
-    (version "2.3.11")
+    (version "2.5.1")
    (source
     (origin
-      (method url-fetch)
-      (uri (string-append "http://gkrellm.srcbox.net/releases/gkrellm-"
-                          version ".tar.bz2"))
-      (sha256
-       (base32 "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"))))
+       (method url-fetch)
+       (uri (string-append "https://gkrellm.srcbox.net/releases/gkrellm-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32 "0qvy2xmwmfy5f0g09yn9lr262shnx82ba04r5il2wj4qscg3r7h8"))))
    (build-system gnu-build-system)
-    (inputs
-     `(("gettext" ,gettext-minimal)
-       ("gtk+" ,gtk+-2)
-       ("libice" ,libice)
-       ("libsm" ,libsm)))
-    (native-inputs
-     (list pkg-config))
+    (inputs (list gtk+-2 libsm))
+    (native-inputs (list gettext-minimal pkg-config))
    (arguments
-     `(#:tests? #f                      ; there is no check target
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))           ; no configure script
-       #:make-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (list (string-append "INSTALLROOT=" out)
-               "CC=gcc"))))
-    (home-page "http://gkrellm.srcbox.net/")
+     (list
+      #:tests? #f ;there is no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)) ;no configure script
+      #:make-flags
+      #~(list (string-append "INSTALLROOT=" #$output)
+              (string-append "CC=" #$(cc-for-target)))))
+    (home-page "https://gkrellm.srcbox.net/")
    (synopsis "System monitors")
    (description
     "GKrellM is a single process stack of system monitors which supports
--- a/gnu/packages/gnome-circle.scm
+++ b/gnu/packages/gnome-circle.scm
@@ -39,6 +39,7 @@
  #:use-module (gnu packages bash)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages ebook)
  #:use-module (gnu packages enchant)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
@@ -681,7 +682,7 @@ and a high score table.")
 (define-public komikku
  (package
    (name "komikku")
-    (version "1.99.0")
+    (version "50.1.0")
    (source
     (origin
       (method git-fetch)
@@ -691,7 +692,7 @@ and a high score table.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
+         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -740,8 +741,10 @@ and a high score table.")
           python-cloudscraper
           python-colorthief
           python-dateparser
+           python-ebooklib
           python-emoji
           python-keyring
+           python-jxlpy
           python-lxml
           python-magic
           python-natsort
@@ -777,7 +780,7 @@ developed with the aim of being used with the Librem 5 phone.")
 (define-public komikku-servers
  (package
    (name "komikku-servers")
-    (version "1.99.0")
+    (version "50.1.0")
    (source
     (origin
       (method git-fetch)
@@ -787,7 +790,7 @@ developed with the aim of being used with the Librem 5 phone.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
+         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
    (build-system copy-build-system)
    (arguments
     (list
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11258,20 +11258,20 @@ basically a text box in which notes can be written.")
 (define-public gucharmap
  (let ((unicode-files
         '(("Blocks.txt"
-            "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1")
+            "05fbpc7miqpv7yic5xkm74ybzxkaf5r58ww21a1iwxqr3apyzvf0")
           ("DerivedAge.txt"
-            "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6")
+            "160r7wwidj3c2jl4cw3am0c5d0l7qndis9xx38h0y8fwidvdzv7q")
           ("NamesList.txt"
-            "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61")
+            "1x1smmn2kmy8clf6ny2njln75i888lidckc6ssyp2gdhgasdrkhd")
           ("Scripts.txt"
-            "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx")
+            "1grmn3bd4m0rcmz544h94kimlj3gf1f343s8177ddrxfmg9m0plz")
           ("UnicodeData.txt"
-            "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap")
+            "0327jqfw2hyq8x986cfhwrp717r2jl7ydjjwvzp7biarrcfzq7if")
           ("Unihan.zip"
-            "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"))))
+            "0pjbyf77lbaxdhwidvpgp81cw13lfhlaw1ynn9vsmkssahmqp97p"))))
    (package
      (name "gucharmap")
-      (version "12.0.1")
+      (version "17.0.1")
      (source
       (origin
         (method url-fetch)
@@ -11280,16 +11280,19 @@ basically a text box in which notes can be written.")
                             name "-" version ".tar.xz"))
         (sha256
          (base32
-           "0m915hm2b2d6r3vs1l80rqpssvg78pv8j6nv54yg62kzknnqmpir"))))
-      (build-system glib-or-gtk-build-system)
+           "0sfixlmk7qajcvls6kv2hfczmjafjcr54aczwcdfmp5jjll4m17r"))))
+      (build-system meson-build-system)
      (arguments
       `(#:modules ((ice-9 match)
-                    (guix build glib-or-gtk-build-system)
+                    (guix build meson-build-system)
                    (guix build utils))
+         #:glib-or-gtk? #t
         #:configure-flags
         (list
-          "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
-          "--with-unicode-data=../unicode-data")
+          "-Ducd_path=../unicode-data"
+          "-Dvapi=false"
+          ;; gtk-doc fails because it didn't generate a devhelp2 file
+          "-Ddocs=false")
         #:phases
         (modify-phases %standard-phases
           (add-after 'unpack 'prepare-unicode-data
@@ -11302,26 +11305,26 @@ basically a text box in which notes can be written.")
                           ',unicode-files))
               #t)))))
      (native-inputs
-       `(("desktop-file-utils" ,desktop-file-utils)
-         ("glib:bin" ,glib "bin")       ; for glib-compile-resources.
-         ("gobject-introspection" ,gobject-introspection)
-         ("intltool" ,intltool)
-         ("itstool" ,itstool)
-         ("pkg-config" ,pkg-config)
-         ,@(map (match-lambda
-                  ((file hash)
-                   `(,file
-                     ,(origin
-                        (method url-fetch)
-                        (uri (string-append
-                              "http://www.unicode.org/Public/12.0.0/ucd/"
-                              file))
-                        (sha256 (base32 hash))))))
-                unicode-files)
-         ("unzip" ,unzip)))
+        (cons* desktop-file-utils
+               (list glib "bin")
+               gobject-introspection
+               intltool
+               itstool
+               pkg-config
+               python
+               unzip
+               (map (match-lambda
+                      ((file hash)
+                       (origin
+                         (method url-fetch)
+                         (uri (string-append
+                                "https://www.unicode.org/Public/17.0.0/ucd/"
+                                file))
+                         (sha256 (base32 hash)))))
+                    unicode-files)))
      (inputs
-       `(("gtk+" ,gtk+)
-         ("xmllint" ,libxml2)))
+       (list gtk+
+             libxml2))
      (home-page "https://wiki.gnome.org/Apps/Gucharmap")
      (synopsis "Unicode character picker and font browser")
      (description
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -165,14 +165,14 @@ tool to extract metadata from a file and print the results.")
 (define-public libmicrohttpd
  (package
   (name "libmicrohttpd")
-   (version "1.0.2")
+   (version "1.0.3")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
                                version ".tar.gz"))
            (sha256
             (base32
-              "1ix843yqhcl8d5gh5652pw2scx4p5n836ca80ymms5rl136lycnz"))))
+              "0shj6kk4xp3k45vv696bzgx4s2jzpvhp11syck1zb70rmrxba5kq"))))
   (build-system gnu-build-system)
   (arguments
    (list #:configure-flags
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -43,34 +43,33 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gnupg)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages adns)
  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages bash)
  #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
  #:use-module (gnu packages check)
-  #:use-module (gnu packages curl)
+  #:use-module (gnu packages compression)
  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages dns)
  #:use-module (gnu packages emacs)
  #:use-module (gnu packages enlightenment)
  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
  #:use-module (gnu packages guile)
+  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages openldap)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages perl-check)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages popt)
  #:use-module (gnu packages pth)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages qt)
  #:use-module (gnu packages readline)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages security-token)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages swig)
@@ -78,22 +77,24 @@
  #:use-module (gnu packages tls)
  #:use-module (gnu packages tor)
  #:use-module (gnu packages web)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages popt)
  #:use-module (gnu packages xdisorg)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix utils)
-  #:use-module (guix git-download)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system perl)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system pyproject)
-  #:use-module (ice-9 match)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system perl)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (ice-9 match)
  #:use-module (srfi srfi-1))

 (define-public libgpg-error
@@ -934,7 +935,22 @@ software.")))
    (inherit pinentry-tty)
    (name "pinentry-qt")
    (arguments
-     `(#:configure-flags '("--enable-fallback-curses")))
+     (list #:configure-flags
+           #~(list "--enable-fallback-curses")
+           #:imported-modules
+           (append %default-gnu-imported-modules
+                   %qt-build-system-modules)
+           #:modules
+           '((guix build utils)
+             (guix build gnu-build-system)
+             ((guix build qt-build-system) #:prefix qt:))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'qt-wrap
+                 (lambda args
+                   (apply (assoc-ref qt:%standard-phases 'qt-wrap)
+                          #:qtbase #$(this-package-input "qtbase")
+                          args))))))
    (inputs
     (modify-inputs inputs
       (prepend qtbase qtwayland)))
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -117,7 +117,7 @@ GCC runtime.
 (define-public windowmaker
  (package
    (name "windowmaker")
-    (version "0.95.9")
+    (version "0.96.0")
    (synopsis "NeXTSTEP-like window manager")
    (source (origin
              (method url-fetch)
@@ -126,60 +126,58 @@ GCC runtime.
                    "wmaker-" version "/WindowMaker-" version ".tar.gz"))
              (sha256
               (base32
-                "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj"))))
+                "0vbgjbqnv2gcpimnrh2fc383gxcdfhgz1j3f2lfa4jng4fx31qag"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:modules ((guix build gnu-build-system)
+     (list
+      #:modules '((guix build gnu-build-system)
                  (guix build utils)
                  (ice-9 match))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'pre-configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; 'wmaker' wants to invoke 'wmaker.inst' the first time,
-             ;; and the 'wmsetbg', so make sure it uses the right ones.
-             ;; We can't use a wrapper here because that would pollute
-             ;; $PATH in the whole session.
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin")))
-               (substitute* "src/main.c"
-                 (("\"wmaker\\.inst")
-                  (string-append "\"" bin "/wmaker.inst")))
-               (substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
-                 (("\"wmsetbg")
-                  (string-append "\"" bin "/wmsetbg")))
-               ;; Add enough cells to the command character array to
-               ;; allow passing our large path to the wmsetbg binary.
-               ;; The path to wmsetbg in Guix requires 67 extra characters.
-               (substitute* "src/defaults.c"
-                 (("len = strlen\\(text\\) \\+ 40;")
-                  (string-append "len = strlen(text) + 107;"))))))
-         (add-after 'install 'install-xsession
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (xsessions (string-append out "/share/xsessions")))
-               (mkdir-p xsessions)
-               (call-with-output-file
-                   (string-append xsessions "/windowmaker.desktop")
-                 (lambda (port)
-                   (format port "~
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'pre-configure
+            (lambda _
+              ;; 'wmaker' wants to invoke 'wmaker.inst' the first time,
+              ;; and the 'wmsetbg', so make sure it uses the right ones.
+              ;; We can't use a wrapper here because that would pollute
+              ;; $PATH in the whole session.
+              (let* ((bin (string-append #$output "/bin")))
+                (substitute* "src/main.c"
+                  (("\"wmaker\\.inst")
+                   (string-append "\"" bin "/wmaker.inst")))
+                (substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
+                  (("\"wmsetbg")
+                   (string-append "\"" bin "/wmsetbg")))
+                ;; Add enough cells to the command character array to
+                ;; allow passing our large path to the wmsetbg binary.
+                ;; The path to wmsetbg in Guix requires 67 extra characters.
+                (substitute* "src/defaults.c"
+                  (("len = strlen\\(text\\) \\+ 40;")
+                   (string-append "len = strlen(text) + 107;"))))))
+          (add-after 'install 'install-xsession
+            (lambda _
+              (let* ((xsessions (string-append #$output "/share/xsessions")))
+                (mkdir-p xsessions)
+                (call-with-output-file
+                    (string-append xsessions "/windowmaker.desktop")
+                  (lambda (port)
+                    (format port "~
                    [Desktop Entry]~@
                    Name=Window Maker~@
                    Comment=~a~@
                    Exec=~a/bin/wmaker~@
                    Type=Application~%"
-                           (string-map (match-lambda
-                                         (#\newline #\space)
-                                         (chr chr))
-                                       ,synopsis) out))))))
-         (add-after 'install-xsession 'wrap
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin")))
-               ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
-               ;; etc., so make sure everything is in $PATH.
-               (wrap-program (string-append bin "/wmaker.inst")
-                 `("PATH" ":" prefix (,bin)))))))))
+                            (string-map (match-lambda
+                                          (#\newline #\space)
+                                          (chr chr))
+                                        #$synopsis) #$output))))))
+          (add-after 'install-xsession 'wrap
+            (lambda _
+              (let* ((bin (string-append #$output "/bin")))
+                ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
+                ;; etc., so make sure everything is in $PATH.
+                (wrap-program (string-append bin "/wmaker.inst")
+                  `("PATH" ":" prefix (,bin)))))))))
    (inputs
     (list bash-minimal                 ;for wrap-program
           fontconfig
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -605,9 +605,9 @@ in the case of Firefox, it is browser/locales/all-locales."
    "zh-TW"))

 ;;; Please keep these versions in sync with icedove.
-(define %icecat-base-version "140.9.0")
+(define %icecat-base-version "140.9.1")
 (define %icecat-version (string-append %icecat-base-version "-gnu1"))
-(define %icecat-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-build-id "20260414000000") ;must be of the form YYYYMMDDhhmmss

 ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
 ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@@ -627,9 +627,9 @@ in the case of Firefox, it is browser/locales/all-locales."
                  "firefox-" upstream-firefox-version ".source.tar.xz"))
            (sha256
             (base32
-              "0b79x61w51fjf12p5sr9pipg4b3fjdnbsg0j20fdai3jq6jb4wmr"))))
+              "1hld2kbzvrmr7pqq0r5hw639xl8kw29lm2hsbn0m4kxang1fdlj5"))))

-         (gnuzilla-commit "10a8be3fcf725ed01ffb7279ec27c2fba55dd2d2")
+         (gnuzilla-commit "f3595923458a5255f61a3853bd83bb5f004dc3bc")
         (gnuzilla-source
          (origin
            (method git-fetch)
@@ -640,7 +640,7 @@ in the case of Firefox, it is browser/locales/all-locales."
                                      (string-take gnuzilla-commit 8)))
            (sha256
             (base32
-              "076s3zpq0cj24a2pjarb57k1xv9z45xazps8rgypzw8yc4pxi9rj"))))
+              "03kc08cvmdv3sxihf5hfhw2k91mg1y6f46b3x47p7q98phgk03cv"))))

         ;; 'search-patch' returns either a valid file name or #f, so wrap it
         ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@@ -1249,13 +1249,13 @@ testing.")
       (cpe-name . "firefox_esr")
       (cpe-version . ,(first (string-split version #\-)))))))

-(define %icedove-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-build-id "20260403000000") ;must be of the form YYYYMMDDhhmmss
 ;;; See <https://product-details.mozilla.org/1.0/thunderbird_versions.json>
 ;;; for the source of truth regarding Thunderbird releases.
 ;;; Please keep these version numbers in sync with icecat.
 ;;; Please also update thunderbird-comm-source and thunderbird-comm-l10n to
 ;;; the icedove version.
-(define %icedove-version "140.9.0")
+(define %icedove-version "140.9.1")

 ;; Provides the "comm" folder which is inserted into the icecat source.
 ;; Avoids the duplication of Icecat's source tarball.  Pick the changeset that
@@ -1267,11 +1267,11 @@ testing.")
    (method hg-fetch)
    (uri (hg-reference
          (url "https://hg.mozilla.org/releases/comm-esr140")
-          (changeset "8be9f2d3072c225a1e5f153745a18984c2babf8f")))
+          (changeset "427d792f23672fc4adbe9436ce7dddbb2bfb287a")))
    (file-name (string-append "thunderbird-" %icedove-version "-checkout"))
    (sha256
     (base32
-      "04j35957x03m5x7mhh8zxa86mwjy0is2vb614sr4inkvvz4rs2hg"))
+      "09fj375a0zb5kgvw94f13997zhcj67a4g5ylpdbjzfql0chh572p"))
    (patches (search-patches "icedove-observer-fix.patch"))))

 ;;; To regenerate, see the `format-locales' helper defined above.
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -181,7 +181,7 @@ collections like from @code{container/tree}.
     "This package provides a library for calling C functions from Go without
 Cgo.

-Featues:
+Features:
@itemize
@item build for other platforms easily without a C compiler
@item efficiently cache entirely Go builds
@@ -1042,7 +1042,7 @@ compile does not support generics.")
     (list
      #:skip-build? #t
      #:import-path "golang.org/x/mod"
-      ;; Test tries to acces:
+      ;; Test tries to access:
      ;; "http://ct.googleapis.com/logs/argon2020/ct/v1/get-sth": dial tcp:
      ;; lookup ct.googleapis.com
      #:test-flags #~(list "-skip" "TestCertificateTransparency")))
@@ -1712,7 +1712,7 @@ values.")
    (license license:bsd-3)))

 (define-public go-google-golang-org-genproto-googleapis-rpc
-  ;; No release or verion tags, use the latest commit.
+  ;; No release or version tags, use the latest commit.
  (let ((commit "49b9836ed3ff1e1dd329d17e442987447e931c7d")
        (revision "1"))
    (package
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -127,7 +127,7 @@ value and call @code{t.Fatal()} if the assertion fails.")
    (description
     "Correct is a collection of assertion libraries for Golang, intended to be
 used together.  It tries not to strictly enforce that, though - most of
-correct should be customizeable either by changing some options or by using
+correct should be customizable either by changing some options or by using
 only some sub-packages of correct.")
    (license license:mpl2.0)))

@@ -1195,7 +1195,7 @@ when comparing complex types like structures and maps.")
    (home-page "https://github.com/go-testfixtures/testfixtures")
    (synopsis "Ruby on Rails like test fixtures for Go")
    (description
-     "Ths package mimics the
+     "This package mimics the
@url{http://guides.rubyonrails.org/testing.html#the-test-database, Ruby on
 Rails' way} of writing tests for database applications, where sample data is
 kept in fixtures files.  Before the execution of every test, the test database
@@ -1462,7 +1462,7 @@ Node @code{nock} library, it has features like:
@item Supports map and filters to handle mocks easily
@item Wide compatible HTTP interceptor using @code{http.RoundTripper} interface
@item Works with any @code{net/http} compatible client, such as @code{gentleman}
-@item Network timeout/cancelation delay simulation
+@item Network timeout/cancellation delay simulation
@item Extensible and hackable API
@end itemize")
    (license license:expat)))
@@ -1871,7 +1871,7 @@ differently.")
              (with-directory-excursion (string-append "src/" import-path)
                (delete-file-recursively "example"))))
          (add-after 'unpack 'preserve-PATH-from-environment
-            ;; Unlike FHS systems, Guix needs to look its commands fom PATH.
+            ;; Unlike FHS systems, Guix needs to look for its commands in PATH.
            ;; Expose it by default in the test environments.
            (lambda* (#:key tests? import-path #:allow-other-keys)
              (with-directory-excursion (string-append "src/" import-path)
@@ -2254,6 +2254,45 @@ can be used in test code as a mock of the interface.")
 Perl's @url{https://metacpan.org/pod/Test::Deep, Test::Deep perl}.")
    (license license:bsd-2)))

+(define-public go-github-com-maxbrunsfeld-counterfeiter-v6
+  (package
+    (name "go-github-com-maxbrunsfeld-counterfeiter")
+    (version "6.12.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/maxbrunsfeld/counterfeiter")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0c4a8gcm3l992vydldcfsvb2jk4spnmxsk2i4klqh4fpagbpa069"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/maxbrunsfeld/counterfeiter/v6"
+      #:test-flags
+      #~(list "-skip" "TestIntegration")
+      #:test-subdirs
+      #~(list "." "arguments" "command" "generator" "integration")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'go-generate
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (invoke "go" "generate" "-v" "-n" "./...")))))))
+    (native-inputs
+     (list go-github-com-onsi-gomega
+           go-github-com-sclevine-spec
+           go-golang-org-x-text
+           go-golang-org-x-tools))
+    (home-page "https://github.com/maxbrunsfeld/counterfeiter")
+    (synopsis "Generate self-contained, type-safe test doubles in Go")
+    (description
+     "This package provides fake implementations of the object's
+collaborators.")
+    (license license:expat)))
+
 (define-public go-github-com-mfridman-tparse
  (package
    (name "go-github-com-mfridman-tparse")
@@ -2333,7 +2372,7 @@ output.")
    (home-page "https://github.com/modocache/gover")
    (synopsis "Integration with coveralls.io for *.coverprofile files")
    (description
-     "This package inplements a functionality to collect all
+     "This package implements a functionality to collect all
@code{.coverprofile} files rooted in the project and concatenante them into a
 single file ready for https://coveralls.io/.")
    (license license:asl2.0)))
@@ -2703,6 +2742,31 @@ GIT_TRACE mechanism.")
     "This package provides tools for detecting deadlocks at run-time in Go.")
    (license license:asl2.0)))

+(define-public go-github-com-sclevine-spec
+  (package
+    (name "go-github-com-sclevine-spec")
+    (version "1.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sclevine/spec")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0y3rqb7dd51qnw5ns7w5sy93879ybnlg6gwslbv5mkfnrk0gl7na"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/sclevine/spec"))
+    (home-page "https://github.com/sclevine/spec")
+    (synopsis "BDD-style test organizer for Go")
+    (description
+     "Spec is a simple BDD test organizer for Go.  It minimally extends the
+standard library @code{testing} package by facilitating easy organization of
+Go 1.7+ @url{https://blog.golang.org/subtests, subtests}.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-shabbyrobe-gocovmerge
  (package
    (name "go-github-com-shabbyrobe-gocovmerge")
@@ -3579,6 +3643,13 @@ the source code, it only prints out style mistakes.")
    (propagated-inputs
     (list go-go-yaml-in-yaml-v4))))

+(define-public go-gopkg-in-h2non-gock-v1
+  (package/inherit go-github-com-h2non-gock
+    (name "go-gopkg-in-h2non-gock-v1")
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:import-path _) "gopkg.in/h2non/gock.v1")))))
+
 (define-public go-gopkg-in-go-playground-assert-v1
  (package
    (inherit go-github-com-go-playground-assert-v2)
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1444,6 +1444,43 @@ providing bidirectional mapping values to their names, plus enum convenience
 for values.")
    (license license:bsd-3)))

+(define-public go-github-com-getsops-gopgagent
+  (package
+    (name "go-github-com-getsops-gopgagent")
+    (version "0.0.0-20241224165529-7044f28e491e")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/getsops/gopgagent")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1n1r7jkb48y06jw2dhkaqs33j6qgwf9fvbisd1zsr6v2k7wgfvf3"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            (for-each
+             (lambda (f)
+               ;; XXX: Without this snippet the build fails with
+               ;; code in directory github.com/getsops/gopgagent
+               ;; expects import "go.mozilla.org/gopgagent"
+               (substitute* f
+                 (("import \"go\\.mozilla\\.org/gopgagent\"") "")))
+             '("gpgagent.go" "gpgagent_test.go"))
+            #t))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/getsops/gopgagent"
+      #:test-flags #~(list "-vet=off")))
+    (home-page "https://github.com/getsops/gopgagent")
+    (synopsis "GPG Agent helpers for Go")
+    (description
+     "This package provides an API to interact with the local GPG Agent from
+Golang.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-gliderlabs-ssh
  (package
    (name "go-github-com-gliderlabs-ssh")
@@ -1711,6 +1748,35 @@ See http://keccak.noekeon.org.")
 MurmurHash} revision (aka MurmurHash3).")
    (license license:bsd-3)))

+(define-public go-github-com-hiddeco-sshsig
+  (package
+    (name "go-github-com-hiddeco-sshsig")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/hiddeco/sshsig")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1raq5j1hr693lcj7nrj3wnsyfp30w96apjxyjmlvxb7ihnkhikv1"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/hiddeco/sshsig"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-golang-org-x-crypto))
+    (home-page "https://github.com/hiddeco/sshsig")
+    (synopsis "Messages signing and verification using SSH in Golang")
+    (description
+     "Package sshsig provides an API to sign and verify messages using SSH
+keys.  It is an implementation of the SSH Signature format as described in
+@url{https://github.com/openssh/openssh-portable/blob/V_9_3_P1/PROTOCOL.sshsig}.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-jcmturner-aescts-v2
  (package
    (name "go-github-com-jcmturner-aescts-v2")
@@ -1951,7 +2017,7 @@ hash.")
    (description
     "Package ssh wraps the @code{crypto/ssh} package with a higher-level API
 for building SSH servers.  The goal of the API was to make it as simple as
-using net/http, so the API is very similar.  It's alternaive fork of
+using net/http, so the API is very similar.  It's alternative fork of
@url{https://github.com/gliderlabs/ssh}.")
    (license license:bsd-3)))

@@ -3750,6 +3816,123 @@ is an extremely fast non-cryptographic hash algorithm.")
@url{https://en.wikipedia.org/wiki/RC2, RC2} Cipher in Golang.")
    (license license:asl2.0)))

+(define-public go-github-com-zmap-zcertificate
+  (package
+    (name "go-github-com-zmap-zcertificate")
+    (version "0.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/zmap/zcertificate")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1lxayyxb0gvls1l05jglqdf8b7zxz3gw94kwbgxvshs7lc0s6hnw"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      ;; XXX: Source only, to break cycle with
+      ;; go-github-com-zmap-zcrypto. Addintional inputs requaired only to
+      ;; build CLI:
+      ;; 
+      ;; -  github.com/sirupsen/logrus
+      ;; -  github.com/zmap/zcrypto
+      ;; -  github.com/zmap/zlint/v3
+      #:skip-build? #t
+      #:tests? #f
+      #:import-path "github.com/zmap/zcertificate"))
+    (home-page "https://github.com/zmap/zcertificate")
+    (synopsis "ZCertificate")
+    (description "ZCertificate parses X.509 certificates and runs
+@@url{https://github.com/zmap/zlint,ZLint}.")
+    (license license:asl2.0)))
+
+(define-public go-github-com-zmap-zcrypto
+  (package
+    (name "go-github-com-zmap-zcrypto")
+    (version "0.0.0-20260309174858-0e3c42de5a13")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/zmap/zcrypto")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0vbgpr2jms9la1nrzxwcfn6ngi3c2pzglh3a3yfkm0ahxvh4wpca"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/zmap/zcrypto"
+      #:test-flags
+      ;; Network access is required.
+      #~(list "-skip" (string-join
+                       (list "TestFetchRemote"
+                             "TestVerifyHostname"
+                             "TestTLSVersions"
+                             "TestCipherSuitesBadSSL")
+                       "|"))))
+    (native-inputs
+     (list go-github-com-stretchr-testify
+           go-gopkg-in-check-v1))
+    (propagated-inputs
+     (list go-github-com-mreiferson-go-httpclient
+           go-github-com-op-go-logging
+           go-github-com-sirupsen-logrus
+           go-github-com-weppos-publicsuffix-go
+           go-github-com-zmap-zcertificate
+           go-golang-org-x-crypto
+           go-golang-org-x-net))
+    (home-page "https://github.com/zmap/zcrypto")
+    (synopsis "Liberal Go TLS + X.509 Library for Research")
+    (description
+     "ZCrypto is a research and data collection cryptography library, designed
+to be used for measuring and analyzing cryptographic deployments on the
+Internet.  It is largely centered around the @code{WebPKI}.")
+    ;; See LICENSE file for more details.
+    (license (list license:asl2.0 license:expat license:isc))))
+
+(define-public go-github-com-zmap-zlint-v3
+  (package
+    (name "go-github-com-zmap-zlint-v3")
+    (version "3.6.8")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/zmap/zlint")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "054ddx6xdzhdjd214kp3kby0q5w4z1d4n61fav5vz73afm4z4bij"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/zmap/zlint/v3"
+      #:unpack-path "github.com/zmap/zlint"
+      #:build-flags
+      #~(list (string-append "-ldflags=-X main.version=" #$version))
+      #:test-flags
+      ;; gen_test.go:236: exec: "git": executable file not found in $PATH
+      #~(list "-skip" "TestGetTestData|TestSaveCert")))
+    (propagated-inputs
+     (list go-github-com-pelletier-go-toml
+           go-github-com-sirupsen-logrus
+           go-github-com-zmap-zcrypto
+           go-golang-org-x-crypto
+           go-golang-org-x-net
+           go-golang-org-x-text))
+    (home-page "https://github.com/zmap/zlint")
+    (synopsis "X.509 Certificate Linter")
+    (description
+     "ZLint is a X.509 certificate linter that checks for consistency with
+standards (e.g. @url{https://www.ietf.org/rfc/rfc5280.txt, RFC 5280}) and
+other relevant PKI requirements (e.g.
+@url{https://cabforum.org/wp-content/uploads/CA-Browser-Forum-BR-1.4.8.pdf,
+CA/Browser Forum Baseline Requirements}).")
+    (license license:asl2.0)))
+
 (define-public go-gitlab-com-nyarla-go-crypt
  (package
    (name "go-gitlab-com-nyarla-go-crypt")
@@ -4229,6 +4412,19 @@ traffic.")))
 +utility to convert SSH RSA keys to GPG keys.")
    (license license:expat)))

+(define-public zlint
+  (package/inherit go-github-com-zmap-zlint-v3
+    (name "zlint")
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:tests? _ #t) #f)
+       ((#:skip-build? _ #t) #f)
+       ((#:install-source? _ #t) #f)
+       ((#:import-path _) "github.com/zmap/zlint/v3/cmd/zlint")))
+    (native-inputs (package-propagated-inputs go-github-com-zmap-zlint-v3))
+    (propagated-inputs '())
+    (inputs '())))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
--- a/gnu/packages/golang-vcs.scm
+++ b/gnu/packages/golang-vcs.scm
@@ -295,6 +295,115 @@ using the Git pkt-line format used in various Git operations.")
         (replace "go-github-com-go-git-gcfg"
           go-github-com-go-git-gcfg-v2))))))

+(define-public go-github-com-cli-go-gh-v2
+  (package
+    (name "go-github-com-cli-go-gh-v2")
+    (version "2.13.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/cli/go-gh")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1a918ll60h65abs14mpnclk1w3468mi7khasixif04ihxd0rcsns"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/cli/go-gh/v2"
+      #:embed-files #~(list ".*\\.xml")
+      ;; Network access or git configuration are required.
+      #:test-flags #~(list "-skip" "TestRemotes|TestNewHTTPClient")))
+    (native-inputs
+     (list go-github-com-alecthomas-chroma-v2
+           go-github-com-leaanthony-go-ansi-parser
+           go-github-com-stretchr-testify
+           go-gopkg-in-h2non-gock-v1))
+    (propagated-inputs
+     (list go-github-com-alecaivazis-survey-v2
+           go-github-com-charmbracelet-glamour
+           go-github-com-charmbracelet-lipgloss
+           go-github-com-cli-browser
+           go-github-com-cli-safeexec
+           go-github-com-cli-shurcool-graphql
+           go-github-com-google-shlex
+           go-github-com-henvic-httpretty
+           go-github-com-itchyny-gojq
+           go-github-com-makenowjust-heredoc
+           go-github-com-masterminds-sprig-v3
+           go-github-com-mgutz-ansi
+           go-github-com-muesli-reflow
+           go-github-com-muesli-termenv
+           go-github-com-thlib-go-timezone-local
+           go-golang-org-x-term
+           go-golang-org-x-text
+           go-gopkg-in-yaml-v3))
+    (home-page "https://github.com/cli/go-gh")
+    (synopsis "Go library for the GitHub CLI")
+    (description
+     "Package gh is a library for CLI Go applications to help interface with
+the gh CLI tool, and the @code{GitHub} API.")
+    (license license:expat)))
+
+(define-public go-github-com-cli-go-internal
+  (package
+    (name "go-github-com-cli-go-internal")
+    (version "0.0.0-20241025142207-6c48bcd5ce24")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/cli/go-internal")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1s2rnmsdj22hg8hz9xv2fj1vs1k9xfz8rvz9bm1cg3ddq33hl4a5"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/cli/go-internal"
+      #:test-flags
+      ;; TestSimple/cover requires network access to proxy.golang.org.
+      #~(list "-skip" "TestSimple/cover")))
+    (propagated-inputs
+     (list go-golang-org-x-mod
+           go-golang-org-x-sys
+           go-golang-org-x-tools))
+    (home-page "https://github.com/cli/go-internal")
+    (synopsis "Internal utilities for GitHub CLI")
+    (description
+     "This package provides internal utilities for the GitHub CLI.  It is a
+hard fork of @code{testscript} to allow the @code{gh} maintainers to explore
+its use while providing flexibility for modifications and extensions.")
+    (license license:bsd-3)))
+
+(define-public go-github-com-cli-shurcool-graphql
+  (package
+    (name "go-github-com-cli-shurcool-graphql")
+    (version "0.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/cli/shurcooL-graphql")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0w5ixfr4ia35n8adadr2rsca3f04bq36fxkgh27fw7rd0mxf199l"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/cli/shurcooL-graphql"))
+    (home-page "https://github.com/cli/shurcooL-graphql")
+    (synopsis "GraphQL client implementation for GitHub CLI")
+    (description
+     "This package provides a GraphQL client implementation forked from
+@code{shurcooL/graphql}, customized for use in the GitHub CLI.")
+    (license license:expat)))
+
 (define-public go-github-com-jiangxin-goconfig
  (package
    (name "go-github-com-jiangxin-goconfig")
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1022,56 +1022,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
          (map (lambda (suffix) (string-append "armv9" suffix "-a"))
               '("" ".1" ".2" ".3" ".4" ".5"))))

-(define-public go-1.23
-  (package
-    (inherit go-1.22)
-    (name "go")
-    (version "1.23.12")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/golang/go")
-             (commit (string-append "go" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0nxcp8wikn93zxipm829dyyagwys13yhf452ai357wzbdzqihm7x"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments go-1.22)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (replace 'disable-more-tests
-              (lambda _
-                #$@(cond
-                     ((target-aarch64?)
-                      ;; https://go-review.googlesource.com/c/go/+/151303
-                      ;; This test is known buggy on aarch64 and is enabled and
-                      ;; disabled upstream with some regularity.
-                      #~((substitute* "src/plugin/plugin_test.go"
-                           (("package plugin_test")
-                            (string-append "// +build !linux linux,!arm64\n\n"
-                                           "package plugin_test")))))
-                     ((target-arm32?)
-                      ;; This test fails when run on aarch64-linux.
-                      #~((substitute* "src/cmd/link/internal/ld/elf_test.go"
-                           (("TestElfBindNow.*" all)
-                            (string-append
-                              all
-                              "        if runtime.GOARCH == \"arm\" {\n"
-                              "                t.Skipf(\"skipping; flaky on armhf\")\n"
-                              "        }\n")))))
-                     (else (list #t)))))))))
-    (properties
-     `((compiler-cpu-architectures
-         ("aarch64" ,@%go-1.23-arm64-micro-architectures)
-         ("armhf" ,@%go-1.17-arm-micro-architectures)
-         ("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)
-         ("x86_64" ,@%go-1.18-x86_64-micro-architectures))))
-    (native-inputs
-     ;; setarch was added to the tsan test suite in 1.23.12
-     `(("go" ,util-linux)
-       ,@(package-native-inputs go-1.22)))))
-
 (define-public go-1.24
  (package
    (inherit go-1.22)
@@ -1239,7 +1189,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
 (define-public go-std-1.20 (make-go-std go-1.20))
 (define-public go-std-1.21 (make-go-std go-1.21))
 (define-public go-std-1.22 (make-go-std go-1.22))
-(define-public go-std-1.23 (make-go-std go-1.23))
 (define-public go-std-1.24 (make-go-std go-1.24))
 (define-public go-std-1.25 (make-go-std go-1.25))
 (define-public go-std-1.26 (make-go-std go-1.26))
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -129,7 +129,7 @@
           libxv
           mesa
           sdl
-           v4l-utils-minimal))
+           v4l-utils))
    (synopsis "1394-Based Digital Camera Control Library")
    (description "LibDC1394 is a library that provides functionality to control
 any camera that conforms to the 1394-Based Digital Camera Specification written
@@ -721,7 +721,7 @@ for the GStreamer multimedia library.")
           speex
           taglib
           twolame
-           v4l-utils-minimal
+           v4l-utils
           wavpack
           zlib))
    (propagated-inputs
@@ -942,7 +942,7 @@ model to base your own plug-in on, here it is.")
            tinyalsa
            transcode
            usrsctp
-            v4l-utils-minimal
+            v4l-utils
            vo-aacenc
            vo-amrwbenc
            vulkan-headers
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2183,11 +2183,9 @@ and routines to assist in editing internationalized text.")
    (license license:lgpl2.1+)))

 (define-public girara
-  ;; TODO: Move propagated inputs to inputs after core-updates is merged (as
-  ;; of 2024-03)
  (package
    (name "girara")
-    (version "0.4.5")
+    (version "2026.02.04")
    (source
     (origin
       (method git-fetch)
@@ -2196,35 +2194,10 @@ and routines to assist in editing internationalized text.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "04igidbihgq5k7fh0jd5n26w00qlb47riky6q7qlp5k314d6cd2y"))))
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'start-xserver
-            ;; Tests require a running X server.
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((xorg-server (assoc-ref inputs "xorg-server"))
-                    (display ":1"))
-                (setenv "DISPLAY" display)
-
-                ;; On busy machines, tests may take longer than
-                ;; the default of four seconds.
-                (setenv "CK_DEFAULT_TIMEOUT" "20")
-
-                ;; Don't fail due to missing '/etc/machine-id'.
-                (setenv "DBUS_FATAL_WARNINGS" "0")
-                (zero? (system (string-append xorg-server "/bin/Xvfb "
-                                              display " &")))))))))
-    (native-inputs
-     (list pkg-config
-           check
-           gettext-minimal
-           `(,glib "bin")
-           xorg-server-for-tests))
-    ;; Listed in 'Requires.private' of 'girara.pc'.
-    (propagated-inputs (list gtk+ json-glib))
+        (base32 "04adir5a8g2hqgv4vzpg52i2524abpcrqf3fcffrbwp8syan0df1"))))
    (build-system meson-build-system)
+    (native-inputs (list pkg-config))
+    (inputs (list glib))
    (home-page "https://pwmt.org/projects/girara/")
    (synopsis "Library for minimalistic gtk+3 user interfaces")
    (description "Girara is a library that implements a user interface that
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5787,6 +5787,43 @@ reading and writing PNG data, as well as some graphic primitives and basic image
 processing filters.")
    (license license:gpl3+)))

+(define-public guile-pnm
+  (package
+    (name "guile-pnm")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/artyom-poptsov/guile-pnm")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1yvsni4hll20g99zq4wl734f9i8gpjr1sqsnk3a93k2dd7b6ymac"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags
+      #~(list "GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
+    (native-inputs (list autoconf
+                         automake
+                         pkg-config
+                         texinfo
+                         ;; needed when cross-compiling.
+                         guile-3.0
+                         guile-lib
+                         guile-smc))
+    (inputs (list guile-3.0 guile-lib))
+    (propagated-inputs (list guile-smc))
+    (home-page "https://github.com/artyom-poptsov/guile-pnm")
+    (synopsis "NetBPM (PNM) library for GNU Guile")
+    (description
+     "@code{guile-pnm} is a GNU Guile library for working with the
+@url{https://en.wikipedia.org/wiki/Netpbm, NetPBM} format (also known as PNM),
+including portable bitmap (PBM), portable graymap (PGM) and portable
+pixel (PPM) variants.")
+    (license license:gpl3+)))
+
 (define-public guile-cv
  (package
    (name "guile-cv")
@@ -7590,7 +7627,7 @@ with a FSM is being built (for example, from a Makefile.)")
 (define-public guile-ini
  (package
    (name "guile-ini")
-    (version "0.5.6")
+    (version "1.0.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -7599,7 +7636,7 @@ with a FSM is being built (for example, from a Makefile.)")
              (file-name (string-append name "-" version))
              (sha256
               (base32
-                "0mz7mpcf6q1z9j9ydz1ngr4hglci3ghmharv1isx9wgby3l2dcf5"))))
+                "12mfch7dznx67r5zw88pp4ma3pw6akif7kdr0kak1gvawgfy277y"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
@@ -7654,8 +7691,8 @@ is an attempt to combine both into something useful.")
      (license license:asl2.0))))

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

 (define-public ghc-tasty-quickcheck
  (package
    (name "ghc-tasty-quickcheck")
-    (version "0.10.2")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-quickcheck" version))
-              (sha256
-               (base32
-                "1qnc6rdvjvlw08q6sln2n98rvj0s0pp689h6w4z58smjbn0lr25l"))))
+    (version "0.11.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-quickcheck" version))
+       (sha256
+        (base32 "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-quickcheck")))
    (inputs (list ghc-tagged ghc-tasty ghc-random ghc-quickcheck
                  ghc-optparse-applicative))
-    (native-inputs (list ghc-tasty-hunit ghc-pcre-light))
+    (native-inputs (list ghc-regex-tdfa ghc-tasty-hunit))
+    (arguments
+     `(#:cabal-revision ("3"
+                         "1wzvha4xam8npx5mk33c056grmrqnjd6m38nnm6d7y99w2mn1a7w")))
    (home-page "https://github.com/UnkindPartition/tasty")
    (synopsis "QuickCheck support for the Tasty test framework")
    (description "This package provides QuickCheck support for the Tasty
@@ -140,22 +140,23 @@ contains the correct result for the test.")
 (define-public ghc-tasty
  (package
    (name "ghc-tasty")
-    (version "1.4.3")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty" version))
-              (sha256
-               (base32
-                "006bf4gyc30i2gvb17hj1mzrh1kwnwf7l050x3f72wi6c2axl87l"))))
+    (version "1.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty" version))
+       (sha256
+        (base32 "10076vlklbcyiz7plakrihava5sy3dvwhskjldqzhfl18jvcg82l"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty")))
    (inputs
-      (append
-        (list ghc-tagged ghc-optparse-applicative ghc-ansi-terminal)
-        ;; TODO: Add ghc-unbounded-delays unconditionally on next rebuild cycle.
-        (if (member (%current-system) '("i686-linux"))
-            (list ghc-unbounded-delays)
-            '())))
+      (list ghc-tagged
+            ghc-optparse-applicative
+            ghc-ansi-terminal
+            ghc-unbounded-delays)) ; needed on 32-bit architectures
+    (arguments
+     `(#:cabal-revision ("2"
+                         "04llcf1i3gawdik0bjhxdgls2wkiqlx0gi76nfh784nv2qzxlpbb")))
    (home-page "https://github.com/UnkindPartition/tasty")
    (synopsis "Modern and extensible testing framework")
    (description
@@ -167,17 +168,20 @@ and any other types of tests into a single test suite.")
 (define-public ghc-tasty-hedgehog
  (package
    (name "ghc-tasty-hedgehog")
-    (version "1.3.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-hedgehog" version))
-              (sha256
-               (base32
-                "1iq452mvd9wc9pfmjsmm848jwp3cvsk1faf2mlr21vcs0yaxvq3m"))))
+    (version "1.4.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-hedgehog" version))
+       (sha256
+        (base32 "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-hedgehog")))
    (inputs (list ghc-tagged ghc-tasty ghc-hedgehog))
    (native-inputs (list ghc-tasty-expected-failure))
+    (arguments
+     `(#:cabal-revision ("6"
+                         "1rb8ncp6xyy7jr6v0hyls9m529ba0djndsxgxmkgr52rk3qq8lrc")))
    (home-page "https://github.com/qfpl/tasty-hedgehog")
    (synopsis "Integration for tasty and hedgehog")
    (description
@@ -190,22 +194,25 @@ framework}.")
 (define-public ghc-tasty-hspec
  (package
    (name "ghc-tasty-hspec")
-    (version "1.2.0.2")
+    (version "1.2.0.4")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "tasty-hspec" version))
       (sha256
-        (base32 "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"))))
+        (base32 "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-hspec")))
    (inputs (list ghc-hspec
+                  ghc-hspec-api
                  ghc-hspec-core
                  ghc-quickcheck
                  ghc-tasty
                  ghc-tasty-smallcheck
-                  ghc-tasty-quickcheck
-                  ghc-tagged))
+                  ghc-tasty-quickcheck))
+    (arguments
+     `(#:cabal-revision ("7"
+                         "0s1y34i8g7fva0z10ws3ipcy2jmlvqk0v4hdbx8rqnby5n0l5kay")))
    (home-page "https://github.com/mitchellwrosen/tasty-hspec")
    (synopsis "Hspec support for the Tasty test framework")
    (description
@@ -215,19 +222,17 @@ framework}.")
 (define-public ghc-tasty-hunit
  (package
    (name "ghc-tasty-hunit")
-    (version "0.10.0.3")
+    (version "0.10.2")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "tasty-hunit" version))
       (sha256
-        (base32
-         "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"))))
+        (base32 "1xh33ss7dncm7zanzkzh7ywb3a46k7vkcbh6v8jb767gq6kizw2s"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-hunit")))
-    (inputs
-     (list ghc-call-stack-boot ghc-tasty))
-    (home-page "http://documentup.com/feuerbach/tasty")
+    (inputs (list ghc-tasty ghc-call-stack-boot))
+    (home-page "https://github.com/UnkindPartition/tasty")
    (synopsis "HUnit support for the Tasty test framework")
    (description "This package provides HUnit support for the Tasty Haskell
 test framework.")
@@ -257,13 +262,13 @@ tasty.")
 (define-public ghc-tasty-lua
  (package
    (name "ghc-tasty-lua")
-    (version "1.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-lua" version))
-              (sha256
-               (base32
-                "1vnyvgcjsvqhwwyqkbgqksr9ppj5whiihpwcqkg33sl7jj3ysdwv"))))
+    (version "1.1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-lua" version))
+       (sha256
+        (base32 "03b2n3gw2w70cnl57w3sh3cv5ka270sf07jlxpb4zs0z5gh83p1r"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-lua")))
    (inputs (list ghc-hslua-core
@@ -288,16 +293,15 @@ from Lua.")
       (method url-fetch)
       (uri (hackage-uri "tasty-th" version))
       (sha256
-        (base32
-         "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
+        (base32 "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-th")))
-    (inputs
-     (list ghc-haskell-src-exts ghc-tasty ghc-tasty-hunit))
+    (inputs (list ghc-haskell-src-exts ghc-tasty))
+    (native-inputs (list ghc-tasty-hunit))
    (home-page "https://github.com/bennofs/tasty-th")
    (synopsis "Automatically generate tasty TestTrees")
    (description
-      "Tasty-th automatically generates tasty TestTrees from functions of the
+     "Tasty-th automatically generates tasty TestTrees from functions of the
 current module, using TemplateHaskell.  This is a fork the original
 test-framework-th package, modified to work with tasty instead of
 test-framework.")
@@ -306,28 +310,27 @@ test-framework.")
 (define-public ghc-tasty-rerun
  (package
    (name "ghc-tasty-rerun")
-    (version "1.1.18")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-rerun" version))
-              (sha256
-               (base32
-                "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"))))
+    (version "1.1.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-rerun" version))
+       (sha256
+        (base32 "0px58jm1yqbg32qf2s0yk09d2qdjxkkz9df89f31q3nzw85jv2ky"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-rerun")))
-    (inputs
-     (list ghc-optparse-applicative ghc-reducers ghc-split ghc-tagged
-           ghc-tasty))
+    (inputs (list ghc-optparse-applicative ghc-split ghc-tagged ghc-tasty))
    (arguments
-     `(#:cabal-revision ("3"
-                         "0091arn90cx5rzn5n2bpb9alzybwraf9yj7hb0bwdfyamzpf3pkb")))
+     `(#:cabal-revision ("1"
+                         "13xmx91hp7i0qzrhada9ckliqkynwlwa8x6pjbvxjcy1y0qsd7hk")))
    (home-page "https://github.com/ocharles/tasty-rerun")
    (synopsis "Run tests by filtering the test tree")
-    (description "This package adds the ability to run tests by filtering the
+    (description
+     "This package adds the ability to run tests by filtering the
 test tree based on the result of a previous test run.  You can use this to run
 only those tests that failed in the last run, or to only run the tests that have
 been added since previous test run.")
-  (license license:bsd-3)))
+    (license license:bsd-3)))

 (define-public ghc-tasty-expected-failure
  (package
@@ -362,17 +365,17 @@ development.")
 (define-public ghc-quickcheck-instances
  (package
    (name "ghc-quickcheck-instances")
-    (version "0.3.29.1")
+    (version "0.3.33")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "quickcheck-instances" version))
       (sha256
-        (base32 "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"))))
+        (base32 "0rl8y3rb4fm4nqz122bp5f2aya4f8bc9m9i9n2vwlyq2gdacs0v8"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-instances")))
    (inputs (list ghc-quickcheck
-                  ghc-splitmix
+                  ghc-splitmix-bootstrap
                  ghc-case-insensitive
                  ghc-data-fix
                  ghc-hashable
@@ -383,17 +386,15 @@ development.")
                  ghc-scientific
                  ghc-strict
                  ghc-tagged
+                  ghc-text-short
                  ghc-these
                  ghc-time-compat
-                  ghc-transformers-compat
                  ghc-unordered-containers
                  ghc-uuid-types
-                  ghc-vector
-                  ghc-data-array-byte
-                  ghc-text-short))
+                  ghc-vector))
    (arguments
-     `(#:cabal-revision ("2"
-                         "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip")))
+     `(#:cabal-revision ("1"
+                         "1xkc7rsfgya4rwiizh0yfincws3knpdnh08m280v1dgik4kv37vh")))
    (home-page "https://github.com/haskellari/qc-instances")
    (synopsis "Common quickcheck instances")
    (description "This package provides QuickCheck instances for types
@@ -409,17 +410,38 @@ provided by the Haskell Platform.")
       (method url-fetch)
       (uri (hackage-uri "quickcheck-unicode" version))
       (sha256
-        (base32
-         "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"))))
+        (base32 "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-unicode")))
    (inputs (list ghc-quickcheck))
-    (home-page
-     "https://github.com/bos/quickcheck-unicode")
+    (home-page "https://github.com/bos/quickcheck-unicode")
    (synopsis "Generator functions Unicode-related tests")
    (description "This package provides generator and shrink functions for
 testing Unicode-related software.")
-    (license license:bsd-3)))
+    (license license:bsd-2)))
+
+(define-public ghc-quickcheck-text
+  (package
+    (name "ghc-quickcheck-text")
+    (version "0.1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "quickcheck-text" version))
+       (sha256
+        (base32 "02dbs0k6igmsa1hcw8yfvp09v7038vp4zlsp9706km3cmswgshj4"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "quickcheck-text")))
+    (inputs (list ghc-quickcheck))
+    (home-page "https://github.com/olorin/quickcheck-text")
+    (synopsis "Alternative arbitrary instance for Text")
+    (description
+     "The usual Arbitrary instance for Text (in
+<https://hackage.haskell.org/package/quickcheck-instances quickcheck-instances>)
+only has single-byte instances and so isn't an ideal representation of a valid
+UTF-8 character.  This package has generators for one-, two- and three-byte
+UTF-8 characters (all that are currently in use).")
+    (license license:expat)))

 (define-public ghc-quickcheck-io
  (package
@@ -446,17 +468,19 @@ use HUnit assertions as QuickCheck properties.")
 (define-public ghc-quickcheck
  (package
    (name "ghc-quickcheck")
-    (version "2.14.3")
+    (version "2.15.0.1")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "QuickCheck" version))
       (sha256
-        (base32 "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw"))))
+        (base32 "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "QuickCheck")))
-    (inputs
-     (list ghc-random ghc-splitmix-bootstrap))
+    (inputs (list ghc-random-bootstrap ghc-splitmix-bootstrap))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "0cgfp4s51cjphsn9cls6rndisvqmi94vn95xan9g1yz6p5xk7z8c")))
    (home-page "https://github.com/nick8325/quickcheck")
    (synopsis "Automatic testing of Haskell programs")
    (description
@@ -479,10 +503,8 @@ expressed in Haskell, using combinators defined in the QuickCheck library.")
        (base32 "1kyam4cy7qmnizjwjm8jamq43w7f0fs6ljfplwj0ib6wi2kjh0wv"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-assertions")))
-    (native-inputs
-     (list ghc-hspec))
-    (inputs
-     (list ghc-ieee754 ghc-pretty-show ghc-quickcheck))
+    (inputs (list ghc-quickcheck ghc-ieee754 ghc-pretty-show))
+    (native-inputs (list ghc-hspec))
    (home-page "https://github.com/s9gf4ult/quickcheck-assertions")
    (synopsis "HUnit-like assertions for QuickCheck")
    (description
@@ -494,33 +516,27 @@ HUnit.")
 (define-public ghc-test-framework
  (package
    (name "ghc-test-framework")
-    (version "0.8.2.0")
+    (version "0.8.2.2")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "test-framework" version))
       (sha256
-        (base32
-         "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"))))
+        (base32 "04ijf5x6xx8i5lqv9ir33zs1rfzc4qkwwz8c1fdycnzvydcv4dnp"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "test-framework")))
+    (inputs (list ghc-ansi-terminal
+                  ghc-ansi-wl-pprint
+                  ghc-random
+                  ghc-regex-posix
+                  ghc-old-locale
+                  ghc-xml
+                  ghc-hostname))
+    (native-inputs (list ghc-hunit ghc-quickcheck ghc-semigroups-bootstrap))
    (arguments
-     `(#:tests? #f  ; FIXME: Tests do not build.
-       #:cabal-revision
-       ("6" "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r")))
-    ;(native-inputs
-    ; (list ghc-hunit ghc-quickcheck))
-    (inputs
-     `(("ghc-ansi-terminal" ,ghc-ansi-terminal)
-       ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
-       ("ghc-hostname" ,ghc-hostname)
-       ("ghc-old-locale" ,ghc-old-locale)
-       ("ghc-random" ,ghc-random)
-       ("ghc-regex-posix" ,ghc-regex-posix)
-       ("ghc-xml" ,ghc-xml)
-       ("ghc-libxml" ,ghc-libxml)
-       ("ghc-semigroups" ,ghc-semigroups-bootstrap)))
-    (home-page "https://batterseapower.github.io/test-framework/")
+     `(#:cabal-revision ("1"
+                         "1yv1qsr6bxphxk9430id9bqhfmkffdqmfg0k017dp9pnn4pqj0zh")))
+    (home-page "https://github.com/haskell/test-framework#readme")
    (synopsis "Framework for running and organising tests")
    (description
     "This package allows tests such as QuickCheck properties and HUnit test
@@ -557,23 +573,21 @@ reporting and test statistics output.")
 (define-public ghc-test-framework-quickcheck2
  (package
    (name "ghc-test-framework-quickcheck2")
-    (version "0.3.0.5")
+    (version "0.3.0.6")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "test-framework-quickcheck2" version))
       (sha256
-        (base32
-         "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"))))
+        (base32 "1d0w2q9sm8aayk0aj1zr2irpnqwpzixn6pdfq1i904vs1kkb2xin"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "test-framework-quickcheck2")))
+    (inputs (list ghc-test-framework ghc-quickcheck ghc-extensible-exceptions
+                  ghc-random))
    (arguments
-     `(#:cabal-revision
-       ("3" "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh")))
-    (inputs
-     (list ghc-extensible-exceptions ghc-quickcheck ghc-random
-           ghc-test-framework))
-    (home-page "https://batterseapower.github.io/test-framework/")
+     `(#:cabal-revision ("1"
+                         "1af2gw9gvq143jdqmsnxj23cgss9ffdyr67951a5x151aps04y7z")))
+    (home-page "https://github.com/haskell/test-framework")
    (synopsis "QuickCheck2 support for test-framework")
    (description
     "This package provides QuickCheck2 support for the test-framework
@@ -592,9 +606,8 @@ package.")
        (base32 "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "test-framework-smallcheck")))
-    (inputs
-     (list ghc-smallcheck ghc-test-framework))
-    (home-page "https://github.com/Bodigrim/smallcheck")
+    (inputs (list ghc-test-framework ghc-smallcheck))
+    (home-page "https://github.com/feuerbach/smallcheck")
    (synopsis "SmallCheck support for test-framework")
    (description
     "This package lets programmers use SmallCheck properties in Haskell's
@@ -660,17 +673,17 @@ JUnit tool for Java.")
 (define-public hspec-discover
  (package
    (name "hspec-discover")
-    (version "2.9.7")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hspec-discover" version))
-              (sha256
-               (base32
-                "0536kdxjw6p8b6gcwvmr22jbmb6cgzbddi0fkd01b2m847z37sb5"))))
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-discover" version))
+       (sha256
+        (base32 "044vgsy45ff00h9z2k3jgn2m37npcjiacc4cifahrjlmwa7a7ylp"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-discover")))
    (native-inputs (list ghc-quickcheck ghc-hspec-meta ghc-mockery-bootstrap))
-    (home-page "http://hspec.github.io/")
+    (home-page "https://hspec.github.io/")
    (synopsis "Automatically discover and run Hspec tests")
    (description "hspec-discover is a tool which automatically discovers and
 runs Hspec tests.")
@@ -679,28 +692,30 @@ runs Hspec tests.")
 (define-public ghc-hspec-core
  (package
    (name "ghc-hspec-core")
-    (version "2.9.7")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hspec-core" version))
-              (sha256
-               (base32
-                "040rzqiqwkp373jjpij8lkmv08pp2ya92zzcf95bw8px215rp08n"))))
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-core" version))
+       (sha256
+        (base32 "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-core")))
    (inputs (list ghc-hunit
                  ghc-quickcheck
                  ghc-ansi-terminal
                  ghc-call-stack
-                  ghc-clock
+                  ghc-haskell-lexer
                  ghc-hspec-expectations
                  ghc-quickcheck-io
                  ghc-random
-                  ghc-setenv
                  ghc-tf-random))
    (native-inputs (list ghc-base-orphans-bootstrap ghc-hspec-meta
-                         ghc-silently-bootstrap ghc-temporary))
-    (home-page "http://hspec.github.io/")
+                         ghc-silently-bootstrap ghc-temporary-bootstrap))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq")))
+    (home-page "https://hspec.github.io/")
    (synopsis "Testing framework for Haskell")
    (description "This library exposes internal types and functions that can
 be used to extend Hspec's functionality.")
@@ -709,23 +724,28 @@ be used to extend Hspec's functionality.")
 (define-public ghc-hspec-meta
  (package
    (name "ghc-hspec-meta")
-    (version "2.9.3")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hspec-meta" version))
-              (sha256
-               (base32
-                "1raxwpsmcijl3x2h5naw6aydhbiknxvhj3x7v384bi1rqi51ainm"))))
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-meta" version))
+       (sha256
+        (base32 "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-meta")))
-    (inputs (list ghc-quickcheck
+    (inputs (list ghc-hunit
+                  ghc-quickcheck
                  ghc-ansi-terminal
                  ghc-call-stack-boot
-                  ghc-clock
+                  ghc-haskell-lexer
+                  ghc-hspec-expectations
                  ghc-quickcheck-io
                  ghc-random
-                  ghc-setenv))
-    (home-page "http://hspec.github.io/")
+                  ghc-tf-random))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d")))
+    (home-page "https://hspec.github.io/")
    (synopsis "Version of Hspec to test Hspec itself")
    (description "This library provides a stable version of Hspec which is
 used to test the in-development version of Hspec.")
@@ -734,38 +754,58 @@ used to test the in-development version of Hspec.")
 (define-public ghc-hspec
  (package
    (name "ghc-hspec")
-    (version "2.9.7")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hspec" version))
-              (sha256
-               (base32
-                "092sfqjkargxxszp9jjqa8ldjz0xv34jwn6k21q59ys5ckvsrpc1"))))
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec" version))
+       (sha256
+        (base32 "1zdgkn0gkcphcsfqcqwcfqiqvkz12ljks46v3czpaysndz8icfip"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec")))
    (inputs (list ghc-quickcheck ghc-hspec-core hspec-discover
                  ghc-hspec-expectations))
-    (home-page "http://hspec.github.io/")
+    (home-page "https://hspec.github.io/")
    (synopsis "Testing Framework for Haskell")
    (description "This library provides the Hspec testing framework for
 Haskell, inspired by the Ruby library RSpec.")
    (license license:expat)))

+(define-public ghc-hspec-api
+  (package
+    (name "ghc-hspec-api")
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-api" version))
+       (sha256
+        (base32 "1xn2b2hafyq6qm3zaia9nw27ir4cg8v2qn499bz2zwnp2vkjra07"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "hspec-api")))
+    (inputs (list ghc-hspec-core))
+    (native-inputs (list ghc-hspec))
+    (home-page "https://hspec.github.io/")
+    (synopsis "A Testing Framework for Haskell")
+    (description
+     "This package provides a stable API that can be used to extend Hspec's
+functionality.")
+    (license license:expat)))
+
 (define-public ghc-hspec-contrib
  (package
    (name "ghc-hspec-contrib")
-    (version "0.5.1.1")
+    (version "0.5.2")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "hspec-contrib" version))
       (sha256
-        (base32 "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"))))
+        (base32 "0002xzvyh790iwf1y33d4nflrbp5sxvpsp010srcfryf1n3qx2b0"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-contrib")))
    (inputs (list ghc-hunit ghc-call-stack ghc-hspec-core))
    (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover))
-    (arguments (list #:tests? #f)) ; Fail to build.
    (home-page "https://hspec.github.io/")
    (synopsis "Contributed functionality for Hspec")
    (description "This package provides contributed Hspec extensions.")
@@ -774,22 +814,25 @@ Haskell, inspired by the Ruby library RSpec.")
 (define-public ghc-hspec-expectations
  (package
    (name "ghc-hspec-expectations")
-    (version "0.8.2")
+    (version "0.8.4")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "hspec-expectations" version))
       (sha256
-        (base32
-         "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1"))))
+        (base32 "1zr1pqchcwglfr5dvcrgc1l5x924n9w09n2zr68dmkqf4dzdx3bv"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-expectations")))
+    (inputs (list ghc-hunit ghc-call-stack))
+    (arguments
    ;; Tests depend on ghc-nanospec.
-    (arguments '(#:tests? #f))
-    (inputs (list ghc-hunit))
-    (home-page "https://github.com/sol/hspec-expectations")
+     `(#:tests? #f
+       #:cabal-revision ("2"
+                         "14zzsjqcz1zbnvi50i82lx84nc8b5da7ar5cazzh44lklyag0ds2")))
+    (home-page "https://github.com/hspec/hspec-expectations#readme")
    (synopsis "Catchy combinators for HUnit")
-    (description "This library provides catchy combinators for HUnit, see
+    (description
+     "This library provides catchy combinators for HUnit, see
@uref{https://github.com/sol/hspec-expectations#readme, the README}.")
    (license license:expat)))

@@ -854,13 +897,13 @@ implementations of cryptographic ciphers.")
 (define-public ghc-hedgehog
  (package
    (name "ghc-hedgehog")
-    (version "1.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "hedgehog" version))
-              (sha256
-               (base32
-                "0dbk75hk6hqpzkjdlpw3s63qhm42kqigij33p321by6xndb59jg1"))))
+    (version "1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hedgehog" version))
+       (sha256
+        (base32 "0sl6x9q9kyrpv73565w9na9dm10wzxdl0qgiraqarffynfgn0hg9"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hedgehog")))
    (inputs (list ghc-ansi-terminal
@@ -875,8 +918,12 @@ implementations of cryptographic ciphers.")
                  ghc-primitive
                  ghc-random
                  ghc-resourcet
+                  ghc-safe-exceptions
                  ghc-transformers-base
                  ghc-wl-pprint-annotated))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "1m0b9m8dw5nw4b3w1jbp5fd0b0kqlyvvy3qsfxc7md77iafxq169")))
    (home-page "https://hedgehog.qa")
    (synopsis "Property-based testing in the spirt of QuickCheck")
    (description
@@ -892,26 +939,16 @@ To get started quickly, see the examples:
 (define-public cabal-doctest
  (package
    (name "cabal-doctest")
-    (version "1.0.9")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "cabal-doctest" version))
-              (sha256
-               (base32
-                "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"))))
+    (version "1.0.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "cabal-doctest" version))
+       (sha256
+        (base32 "0gwjpwv2v7c7gs2dvf7ixsxx6likmgw5yi0fy4bqc0i7nkqg4bfw"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cabal-doctest")))
-    (arguments
-     `(#:cabal-revision ("2"
-                         "0868js0qgfhvmyw4hjzrvmlzyqsm8dfsbmqhybxb90x44xi3r0i1")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'update-constraints
-           (lambda _
-             (substitute* "cabal-doctest.cabal"
-               (("\\b(Cabal|base)\\s+[^,]+" all dep)
-                dep)))))))
-    (home-page "https://github.com/haskellari/cabal-doctest")
+    (home-page "https://github.com/ulidtko/cabal-doctest")
    (synopsis "Setup.hs helper for running doctests")
    (description
     "To properly work, the @code{doctest} package needs plenty of
@@ -971,13 +1008,13 @@ random testing, and hybrids of the two.")
 (define-public ghc-inspection-testing
  (package
    (name "ghc-inspection-testing")
-    (version "0.4.6.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "inspection-testing" version))
-              (sha256
-               (base32
-                "0mxff0v3ciccbk4b8kxnh4752fzbwn7213qd8xji0csv6gi2w83y"))))
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "inspection-testing" version))
+       (sha256
+        (base32 "0zi1q86sd9jy5dpqfs2j71acdl7kvik0ps78xirpdhyldhwwyqws"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "inspection-testing")))
    (home-page "https://github.com/nomeata/inspection-testing")
@@ -1010,33 +1047,33 @@ examples and more information.")
    (name "ghc-quickcheck-classes")
    (version "0.6.5.0")
    (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "quickcheck-classes" version))
-        (sha256
-          (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "quickcheck-classes" version))
+       (sha256
+        (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-classes")))
-    (inputs
-      (list ghc-quickcheck
-            ghc-primitive
-            ghc-primitive-addr
-            ghc-quickcheck-classes-base
-            ghc-aeson
-            ghc-semigroupoids
-            ghc-semirings
-            ghc-vector))
-    (native-inputs
-      (list ghc-base-orphans
-            ghc-tagged
-            ghc-base-orphans
-            ghc-tagged
-            ghc-tasty
-            ghc-tasty-quickcheck))
+    (inputs (list ghc-quickcheck
+                  ghc-primitive
+                  ghc-primitive-addr
+                  ghc-quickcheck-classes-base
+                  ghc-semigroups-bootstrap
+                  ghc-fail
+                  ghc-tagged
+                  ghc-aeson
+                  ghc-semigroupoids
+                  ghc-semirings
+                  ghc-vector))
+    (native-inputs (list ghc-base-orphans ghc-base-orphans ghc-tasty
+                         ghc-tasty-quickcheck))
+    (arguments
+     `(#:cabal-revision ("3"
+                         "1pawam5rsdcdv21fqc87khzqjm0ixwzklfxd6gk3b2qrr5q66bn5")))
    (home-page "https://github.com/andrewthad/quickcheck-classes#readme")
    (synopsis "QuickCheck common typeclasses")
    (description
-      "This library provides QuickCheck properties to ensure that typeclass
+     "This library provides QuickCheck properties to ensure that typeclass
 instances adhere to the set of laws that they are supposed to.  There are
 other libraries that do similar things, such as @code{genvalidity-hspec} and
@code{checkers}.  This library differs from other solutions by not introducing
@@ -1052,24 +1089,26 @@ constraints more cleanly.")
    (name "ghc-quickcheck-classes-base")
    (version "0.6.2.0")
    (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "quickcheck-classes-base" version))
-        (sha256
-          (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "quickcheck-classes-base" version))
+       (sha256
+        (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-classes-base")))
-    (inputs
-      (list ghc-quickcheck
-            ghc-contravariant
-            ghc-bifunctors
-            ghc-semigroups
-            ghc-fail
-            ghc-tagged))
+    (inputs (list ghc-quickcheck
+                  ghc-contravariant
+                  ghc-bifunctors
+                  ghc-semigroups-bootstrap
+                  ghc-fail
+                  ghc-tagged))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1p3v38jhpx0r6rnvaspkkivl8xyq2mq4xnmycgmkj1gr77vplkdr")))
    (home-page "https://github.com/andrewthad/quickcheck-classes#readme")
    (synopsis "QuickCheck common typeclasses from `base`")
    (description
-      "This library is a minimal variant of `quickcheck-classes` that only
+     "This library is a minimal variant of `quickcheck-classes` that only
 provides laws for typeclasses from `base`.  The main purpose of splitting this
 out is so that `primitive` can depend on `quickcheck-classes-base` in its test
 suite, avoiding the circular dependency that arises if `quickcheck-classes` is
@@ -1087,67 +1126,61 @@ this library uses the higher-kinded typeclasses
 (define-public ghc-doctest-lib
  (package
    (name "ghc-doctest-lib")
-    (version "0.1")
+    (version "0.1.1.1")
    (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "doctest-lib" version))
-        (sha256
-          (base32 "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "doctest-lib" version))
+       (sha256
+        (base32 "1hb3zx1xzib3v41blnwcbhc2v0rzwdzq7gm4sajqndimwjkkxc67"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "doctest-lib")))
    (home-page "https://hub.darcs.net/thielema/doctest-lib/")
    (synopsis "Parts of doctest exposed as library")
    (description
-      "Parts of doctest exposed as library.  For use with the doctest-extract utility.")
+     "Parts of doctest exposed as library.  For use with the doctest-extract utility.")
    (license license:expat)))

 (define-public ghc-doctest-exitcode-stdio
  (package
    (name "ghc-doctest-exitcode-stdio")
-    (version "0.0")
+    (version "0.0.0.1")
    (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "doctest-exitcode-stdio" version))
-        (sha256
-          (base32 "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "doctest-exitcode-stdio" version))
+       (sha256
+        (base32 "0kg5xiw4giyvqpcj6cxqqnysvixhxlwm0pbg3qks8dzwb5w79dvk"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "doctest-exitcode-stdio")))
-    (inputs
-      (list ghc-doctest-lib ghc-quickcheck ghc-semigroups))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "1065s8bch6zhl6mc8nhvfpwd1irmjd04z7xgycbpihc14x4ijim3")))
+    (inputs (list ghc-doctest-lib ghc-quickcheck ghc-semigroups))
    (home-page "https://hub.darcs.net/thielema/doctest-exitcode-stdio/")
    (synopsis "Run Doctests in a @code{Cabal.Test.exitcode-stdio} environment")
    (description
-      "This package allows on to run Doctests in a Cabal.Test.exitcode-stdio
+     "This package allows on to run Doctests in a Cabal.Test.exitcode-stdio
 environment.")
    (license license:bsd-3)))

 (define-public ghc-tasty-silver
  (package
    (name "ghc-tasty-silver")
-    (version "3.3.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-silver" version))
-              (sha256
-               (base32
-                "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m"))))
+    (version "3.3.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-silver" version))
+       (sha256
+        (base32 "01w3576kymglcddinh10m1wgy71dia49k2pnw5y1c97jjrhanf17"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-silver")))
    (inputs (list ghc-ansi-terminal
-                  ghc-async
                  ghc-optparse-applicative
                  ghc-process-extras
                  ghc-regex-tdfa
                  ghc-silently
                  ghc-tagged
                  ghc-tasty
-                  ghc-temporary
-                  ghc-semigroups))
+                  ghc-temporary))
    (native-inputs (list ghc-tasty-hunit))
    (home-page "https://github.com/phile314/tasty-silver")
    (synopsis "Fancy test runner, including support for golden tests")
@@ -1163,16 +1196,19 @@ result of golden tests.")
 (define-public ghc-tasty-inspection-testing
  (package
    (name "ghc-tasty-inspection-testing")
-    (version "0.1.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "tasty-inspection-testing" version))
-              (sha256
-               (base32
-                "0p46w44f19w7lvdzyg3vq6qzix0rjp8p23ilxz82dviq38lgmifp"))))
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "tasty-inspection-testing" version))
+       (sha256
+        (base32 "0wl2xlnbmqdkwhi4ic6a4q4lxf9qg433lidi8d0hlp3ykrjpbcay"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-inspection-testing")))
    (inputs (list ghc-inspection-testing ghc-tasty))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "0z9al0hyq381fw146agbpz7rf24rwms1w91m7s0k1w3xbfw16l9n")))
    (home-page "https://github.com/Bodigrim/tasty-inspection-testing")
    (synopsis "Inspection testing support for tasty")
    (description
@@ -1182,13 +1218,13 @@ result of golden tests.")
 (define-public ghc-proctest
  (package
    (name "ghc-proctest")
-    (version "0.1.3.0")
+    (version "0.1.3.1")
    (source (origin
              (method url-fetch)
              (uri (hackage-uri "proctest" version))
              (sha256
               (base32
-                "02iz323arx9zwclvspgaaqz81bp6jdnj89pjm08n2gamg39zsbdn"))))
+                "0yvhc0l5aj170ymhjx4ig0im0yd7wfa150m5lqhabr8j7cf16l7y"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "proctest")))
    (inputs (list ghc-hunit ghc-hspec ghc-quickcheck))
--- a/gnu/packages/haskell-crypto.scm
+++ b/gnu/packages/haskell-crypto.scm
@@ -62,18 +62,19 @@ format.")
  (package
    (name "ghc-asn1-encoding")
    (version "0.9.6")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "asn1-encoding" version))
-              (sha256
-               (base32
-                "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "asn1-encoding" version))
+       (sha256
+        (base32 "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "asn1-encoding")))
-    (inputs
-     (list ghc-hourglass ghc-asn1-types))
-    (native-inputs
-     (list ghc-tasty ghc-tasty-quickcheck))
+    (inputs (list ghc-hourglass ghc-asn1-types))
+    (native-inputs (list ghc-tasty ghc-tasty-quickcheck))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97")))
    (home-page "https://github.com/vincenthz/hs-asn1")
    (synopsis "ASN1 data reader and writer in RAW, BER and DER forms")
    (description
@@ -111,15 +112,18 @@ when ASN1 pattern matching is not convenient.")
       (method url-fetch)
       (uri (hackage-uri "crypto-api" version))
       (sha256
-        (base32
-         "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"))))
+        (base32 "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypto-api")))
    (inputs (list ghc-cereal ghc-tagged ghc-entropy))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1z6n1sa5pn3iqvqjrd8hv4bc2pxzsrhm5sh0l8z7g9lbqp6w0wp5")))
    (home-page "https://github.com/TomMD/crypto-api")
    (synopsis "Provides generic interface for cryptographic operations
 for Haskell")
-    (description "This Haskell package provides a generic interface for
+    (description
+     "This Haskell package provides a generic interface for
 cryptographic operations (hashes, ciphers, randomness).

 Maintainers of hash and cipher implementations are encouraged to add instances
@@ -197,13 +201,15 @@ that hides the C implementation.")
       (method url-fetch)
       (uri (hackage-uri "cryptohash-md5" version))
       (sha256
-        (base32
-         "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
+        (base32 "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cryptohash-md5")))
    (native-inputs (list ghc-base16-bytestring ghc-puremd5 ghc-tasty
-                         ghc-tasty-hunit ghc-tasty-quickcheck))
-    (home-page "https://github.com/hvr/cryptohash-md5")
+                         ghc-tasty-quickcheck ghc-tasty-hunit))
+    (arguments
+     `(#:cabal-revision ("6"
+                         "0m7f9mgw4w9vcch37ja9zgbn0knq8rjppqr9x2ylkcdxfdnmhhif")))
+    (home-page "https://github.com/haskell-hvr/cryptohash-md5")
    (synopsis "MD5 implementation for Haskell")
    (description "This Haskell package provides implementation of MD5.")
    (license license:bsd-3)))
@@ -212,20 +218,20 @@ that hides the C implementation.")
  (package
    (name "ghc-cryptohash-sha1")
    (version "0.11.101.0")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "cryptohash-sha1" version))
-              (sha256
-               (base32
-                "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "cryptohash-sha1" version))
+       (sha256
+        (base32 "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cryptohash-sha1")))
    (native-inputs (list ghc-base16-bytestring ghc-sha ghc-tasty
                         ghc-tasty-quickcheck ghc-tasty-hunit))
    (arguments
-     `(#:cabal-revision ("1"
-                         "0bz9rfl7b2iwn45m0lxcmsyi5rrv3xdgzx2lzr79bds91dw6i25b")))
-    (home-page "https://github.com/hvr/cryptohash-sha1")
+     `(#:cabal-revision ("6"
+                         "1cxdw2y10z4v0mz91wki7f233jziipx85j4qy5msig4nv3djkprb")))
+    (home-page "https://github.com/haskell-hvr/cryptohash-sha1")
    (synopsis "SHA-1 implementation for Haskell")
    (description
     "This Haskell package provides an incremental and one-pass,
@@ -246,20 +252,18 @@ the C implementation.")
       (method url-fetch)
       (uri (hackage-uri "cryptohash-sha256" version))
       (sha256
-        (base32
-         "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"))))
+        (base32 "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cryptohash-sha256")))
+    (native-inputs (list ghc-base16-bytestring ghc-sha ghc-tasty
+                         ghc-tasty-quickcheck ghc-tasty-hunit))
    (arguments
-     `(#:cabal-revision
-       ("1" "1hyzqv30rpj920ddnr0zypyjjlh52vyp2d140pn2byayj820rkgs")
-       #:tests? #f)) ; TODO: tasty ==1.1.*
-    (native-inputs
-     (list ghc-base16-bytestring ghc-sha ghc-tasty ghc-tasty-hunit
-           ghc-tasty-quickcheck))
-    (home-page "https://github.com/hvr/cryptohash-sha1")
+     `(#:cabal-revision ("6"
+                         "01s12sl5mxvraj5fj3cs0pkb03pm8xpjz13y09dpl7i6rv6f578f")))
+    (home-page "https://github.com/haskell-hvr/cryptohash-sha256")
    (synopsis "SHA-256 implementation for Haskell")
-    (description "This Haskell package provides an incremental and
+    (description
+     "This Haskell package provides an incremental and
 one-pass, pure API to the @uref{https://en.wikipedia.org/wiki/SHA-2,
 SHA-256 cryptographic hash algorithm}, with performance close to the
 fastest implementations available in other languages.
@@ -272,12 +276,12 @@ the C implementation.")
  (package
    (name "ghc-cryptonite")
    (version "0.30")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "cryptonite" version))
-              (sha256
-               (base32
-                "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "cryptonite" version))
+       (sha256
+        (base32 "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cryptonite")))
    (inputs (list ghc-memory ghc-basement))
@@ -295,13 +299,13 @@ generators, and more.")
 (define-public ghc-curve25519
  (package
  (name "ghc-curve25519")
-  (version "0.2.7")
+  (version "0.2.8.1")
  (source
   (origin
     (method url-fetch)
     (uri (hackage-uri "curve25519" version))
     (sha256
-      (base32 "1p8b1lppkvc19974hr43lcqdi4nj55j2nf7gsnp8dn7gyf23aayq"))))
+      (base32 "0p2rxad477cxbpxryvp78v8nrrf5gm35106jbqrj5cjgksappkdj"))))
  (build-system haskell-build-system)
  (native-inputs
   (list ghc-hunit
@@ -326,19 +330,17 @@ elsewhere.")
 (define-public ghc-digest
  (package
    (name "ghc-digest")
-    (version "0.0.1.7")
+    (version "0.0.2.1")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "digest" version))
       (sha256
-        (base32 "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"))))
+        (base32 "163418p50bqdxn8ajzj6x3455xbch9jq1w6psbkdz5qzw017py6b"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "digest")))
    (arguments
-     `(#:extra-directories ("zlib")
-       #:cabal-revision ("1"
-                         "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl")))
+     `(#:extra-directories ("zlib")))
    (inputs (list zlib))
    (native-inputs (list pkg-config))
    (home-page "http://hackage.haskell.org/package/digest")
@@ -352,13 +354,13 @@ are implemented as FFI bindings to efficient code from zlib.")
 (define-public ghc-entropy
  (package
    (name "ghc-entropy")
-    (version "0.4.1.10")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "entropy" version))
-              (sha256
-               (base32
-                "1rbx4ydabrjs8kkdg9laznkh9nisiq6b5z93vnp9bh6iy59ivb45"))))
+    (version "0.4.1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "entropy" version))
+       (sha256
+        (base32 "1slj5n783k2amsx2hqs5qwvcw4rgfhdhgmiyg7cii0wg4w0mmpgm"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "entropy")))
    (home-page "https://github.com/TomMD/entropy")
@@ -415,6 +417,35 @@ the MD5 digest (hash) algorithm.  This now supports the @code{crypto-api} class
 interface.")
    (license license:bsd-3)))

+(define-public ghc-rsa
+  (package
+    (name "ghc-rsa")
+    (version "2.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "RSA" version))
+       (sha256
+        (base32 "0hchsqrxpfw7mqrqwscfy8ig1w2di6w3nxpzi873w0gibv2diibj"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "RSA")))
+    (inputs (list ghc-crypto-api ghc-crypto-pubkey-types ghc-sha))
+    (native-inputs (list ghc-quickcheck ghc-tagged ghc-test-framework
+                         ghc-test-framework-quickcheck2))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "090yzm99fmh7c6z4m9hbkasqhc3xlw104g2b6wnk77n1abd13ryj")))
+    (home-page "http://hackage.haskell.org/package/RSA")
+    (synopsis
+     "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.")
+    (description
+     "This library implements the RSA encryption and signature algorithms for
+arbitrarily-sized @code{ByteStrings}.  While the implementations work, they are
+not necessarily the fastest ones on the planet.  Particularly key generation.
+The algorithms included are based of RFC 3447, or the Public-Key Cryptography
+Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).")
+    (license license:bsd-3)))
+
 (define-public ghc-sha
  (package
    (name "ghc-sha")
@@ -594,6 +625,24 @@ implementation.  If it matters for your case, you should make sure you have
 AES-NI available, or you'll need to use a different implementation.")
    (license license:bsd-3)))

+(define-public ghc-crypto-pubkey-types
+  (package
+    (name "ghc-crypto-pubkey-types")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypto-pubkey-types" version))
+       (sha256
+        (base32 "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypto-pubkey-types")))
+    (inputs (list ghc-asn1-types ghc-asn1-encoding))
+    (home-page "http://github.com/vincenthz/hs-crypto-pubkey-types")
+    (synopsis "Generic cryptography Public keys algorithm types")
+    (description "Generic cryptography public keys algorithm types.")
+    (license license:bsd-3)))
+
 (define-public ghc-crypto-random
  (package
    (name "ghc-crypto-random")
@@ -617,13 +666,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton
  (package
    (name "ghc-crypton")
-    (version "0.34")
+    (version "1.0.4")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "crypton" version))
       (sha256
-        (base32 "1mhypjhzn95in853bp7ary0a2xc6lsji6j8hrrgn2mfa4ilq8i24"))))
+        (base32 "06h1qjvqd8gmiyzvh31sc061vcgns101l0774c44a8k44015925l"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypton")))
    (inputs (list ghc-memory ghc-basement))
@@ -653,13 +702,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton-x509
  (package
    (name "ghc-crypton-x509")
-    (version "1.7.6")
+    (version "1.7.7")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "crypton-x509" version))
       (sha256
-        (base32 "1zyaz0krf08g36g30zr5wn8f2x51l4dj2zcjnhpiw9h05p54mdzb"))))
+        (base32 "10pkva9wvm6ih48bprxlnyhnn3nr6xq9dhkrk4hfxpsaij6f9v7g"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypton-x509")))
    (inputs (list ghc-memory
@@ -669,13 +718,7 @@ abstraction for CPRNGs.")
                  ghc-asn1-encoding
                  ghc-asn1-parse
                  ghc-crypton))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-x509))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "10a2x47znhbayyfr6fqgq27623akpycyjbfxz4hnavavf1x6ary5")
-       ;; build phase fails when tests are activated.
-       ;; See https://github.com/kazu-yamamoto/crypton-certificate/pull/7
-       #:tests? #f))
+    (native-inputs (list ghc-tasty ghc-tasty-quickcheck))
    (home-page "https://github.com/kazu-yamamoto/crypton-certificate")
    (synopsis "X509 reader and writer")
    (description "This package provides generic X509 support for Haskell.")
@@ -684,13 +727,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton-x509-store
  (package
    (name "ghc-crypton-x509-store")
-    (version "1.6.9")
+    (version "1.6.11")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "crypton-x509-store" version))
       (sha256
-        (base32 "0vr5b9cyf9x016wn1g0bryslf5nz8jq2sy8r3llwqfg02apihqiy"))))
+        (base32 "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypton-x509-store")))
    (inputs (list ghc-pem ghc-asn1-types ghc-asn1-encoding ghc-crypton
@@ -727,24 +770,25 @@ storage methods, and accessors.")
 (define-public ghc-crypton-x509-validation
  (package
    (name "ghc-crypton-x509-validation")
-    (version "1.6.12")
+    (version "1.6.14")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "crypton-x509-validation" version))
       (sha256
-        (base32 "1xjhwvmkcy47a6xiqxb3xy944ca7g660203jdrz5xzd46zibfq0f"))))
+        (base32 "07b09kgrd3m5ahxpj458r5ycd30bz8ldwjwf19mdcnfv4x0kj3pd"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypton-x509-validation")))
    (inputs (list ghc-memory
                  ghc-hourglass
-                  ghc-data-default-class
+                  ghc-data-default
                  ghc-pem
                  ghc-asn1-types
                  ghc-asn1-encoding
                  ghc-crypton-x509
                  ghc-crypton-x509-store
-                  ghc-crypton))
+                  ghc-crypton
+                  ghc-iproute))
    (native-inputs (list ghc-tasty ghc-tasty-hunit))
    (home-page "https://github.com/kazu-yamamoto/crypton-certificate")
    (synopsis "X.509 Certificate and CRL validation")
@@ -752,6 +796,44 @@ storage methods, and accessors.")
 and @dfn{Certificates revocation list} (CRL) validation.")
    (license license:bsd-3)))

+(define-public ghc-crypton-socks
+  (package
+    (name "ghc-crypton-socks")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypton-socks" version))
+       (sha256
+        (base32 "0fwzlvndyxjwhxambxdjzzm63yvb6jzsg53dkv3i6x17biz0hdm8"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypton-socks")))
+    (inputs (list ghc-cereal ghc-network ghc-network-bsd))
+    (home-page "http://github.com/mpilgrem/crypton-socks")
+    (synopsis "SOCKS Protocol Version 5")
+    (description
+     "This package provides a library implementing SOCKS Protocol Version 5.")
+    (license license:bsd-3)))
+
+(define-public ghc-crypto-token
+  (package
+    (name "ghc-crypto-token")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypto-token" version))
+       (sha256
+        (base32 "18xphlvn6wzyi6lqrvm5vic97pkcbiph1938p5l1mb22rj5215zm"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypto-token")))
+    (inputs (list ghc-crypton ghc-memory ghc-network-byte-order))
+    (native-inputs (list ghc-hspec hspec-discover))
+    (home-page "http://hackage.haskell.org/package/crypto-token")
+    (synopsis "crypto tokens")
+    (description "Encrypted tokens/tickets to keep state in the client side.")
+    (license license:bsd-3)))
+
 (define-public ghc-cprng-aes
  (package
    (name "ghc-cprng-aes")
@@ -804,20 +886,19 @@ percent.
       (method url-fetch)
       (uri (hackage-uri "ed25519" version))
       (sha256
-        (base32
-         "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
+        (base32 "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "ed25519")))
+    (native-inputs (list ghc-quickcheck ghc-doctest))
    (arguments
-     `(#:cabal-revision
-       ("6" "0qyx6cl52fnll8lp6v9133wfvv3zhvq7v2crn441mng520j9wp48")
-       ;; We omit these test suites because they require old versions of
-       ;; packages and packages we do not have.
-       #:configure-flags
-       '("--flags=-test-hlint -test-doctests -test-properties")))
-    (home-page "http://thoughtpolice.github.com/hs-ed25519")
+     `(#:cabal-revision ("9"
+                         "0y5vfdcys18waa5k5zxiq9n8jq0l05j76riml23i0gxmwgdhsmgi")
+       ;; the tests don't work with current versions of the test frameworks
+       #:tests? #f))
+    (home-page "https://github.com/thoughtpolice/hs-ed25519/")
    (synopsis "Ed25519 cryptographic signatures")
-    (description "This package provides a simple, fast, self-contained
+    (description
+     "This package provides a simple, fast, self-contained
 copy of the Ed25519 public-key signature system with a clean interface.
 It also includes support for detached signatures, and thorough
 documentation on the design and implementation, including usage
@@ -827,29 +908,41 @@ guidelines.")
 (define-public ghc-tls
  (package
    (name "ghc-tls")
-    (version "1.5.8")
+    (version "2.1.8")
    (source (origin
              (method url-fetch)
              (uri (hackage-uri "tls" version))
              (sha256
               (base32
-                "0rxdv8ab98kd4nqql7djmmi51k4vayq21s38s43sx3rzn0iyla3b"))))
+                "1csdy3426lva1a5f7gh9qm96vzfraqj91jbxlm79wbf1jsdzfhsq"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tls")))
-    (inputs (list ghc-cereal
-                  ghc-data-default-class
-                  ghc-memory
-                  ghc-cryptonite
-                  ghc-asn1-types
+    (inputs (list ghc-asn1-types
                  ghc-asn1-encoding
-                  ghc-x509
-                  ghc-x509-store
-                  ghc-x509-validation
-                  ghc-async
-                  ghc-hourglass
-                  ghc-network))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck))
-    (home-page "http://github.com/vincenthz/hs-tls")
+                  ghc-base16-bytestring
+                  ghc-cereal
+                  ghc-crypton
+                  ghc-crypton-x509
+                  ghc-crypton-x509-store
+                  ghc-crypton-x509-validation
+                  ghc-data-default
+                  ghc-memory
+                  ghc-network
+                  ghc-serialise
+                  ghc-transformers
+                  ghc-unix-time
+                  ghc-zlib))
+    (native-inputs (list ghc-quickcheck
+                         ghc-asn1-types
+                         ghc-async
+                         ghc-crypton
+                         ghc-crypton-x509
+                         ghc-crypton-x509-validation
+                         ghc-hourglass
+                         ghc-hspec
+                         ghc-serialise
+                         hspec-discover))
+    (home-page "http://github.com/haskell-tls/hs-tls")
    (synopsis "TLS/SSL protocol native implementation (Server and Client)")
    (description
     "Native Haskell TLS and SSL protocol implementation for server and client.
@@ -861,43 +954,6 @@ Ephemeral (Elliptic curve and regular) Diffie Hellman key exchanges, and many
 extensions.")
    (license license:bsd-3)))

-(define-public ghc-tls-1.9
-  (package
-    (name "ghc-tls")
-    (version "1.9.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tls" version))
-       (sha256
-        (base32 "0gj3af9sqd0bw7dpcqfyvbslpxsk2ij00a77kl710fwhw35vj1an"))))
-    (build-system haskell-build-system)
-    (properties '((upstream-name . "tls")))
-    (inputs (list ghc-cereal
-                  ghc-data-default-class
-                  ghc-memory
-                  ghc-crypton
-                  ghc-asn1-types
-                  ghc-asn1-encoding
-                  ghc-crypton-x509
-                  ghc-crypton-x509-store
-                  ghc-crypton-x509-validation
-                  ghc-async
-                  ghc-unix-time
-                  ghc-network))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck))
-    (home-page "https://github.com/haskell-tls/hs-tls")
-    (synopsis "TLS/SSL protocol native implementation (server and client)")
-    (description
-     "This package provides a native Haskell TLS and SSL protocol
-implementation for server and client.  It provides a high-level implementation
-of a sensitive security protocol, eliminating a common set of security issues
-through the use of the advanced type system, high level constructions and
-common Haskell features.  It currently implements the SSL3.0, TLS1.0, TLS1.1
-and TLS1.2 protocol, and supports RSA and Ephemeral (Elliptic curve and
-regular) Diffie Hellman key exchanges, and many extensions.")
-    (license license:bsd-3)))
-
 (define-public ghc-hsopenssl
  (package
    (name "ghc-hsopenssl")
@@ -960,17 +1016,14 @@ the tls package, and borrows some ideas from x509-system.")
       (method url-fetch)
       (uri (hackage-uri "openssl-streams" version))
       (sha256
-        (base32
-         "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
+        (base32 "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "openssl-streams")))
-    (inputs
-     (list ghc-hsopenssl ghc-io-streams ghc-network))
-    (native-inputs
-     (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
+    (inputs (list ghc-hsopenssl ghc-io-streams ghc-network))
+    (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
    (arguments
-     `(#:cabal-revision ("1"
-                         "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp")))
+     `(#:cabal-revision ("3"
+                         "1vizl9yajkbd59rrnfb38xwq7hfj36avbv6vwqnkhbvz3qaj3dwg")))
    (home-page "https://hackage.haskell.org/package/openssl-streams")
    (synopsis "OpenSSL network support for io-streams")
    (description "This library contains io-streams routines for secure
--- a/gnu/packages/haskell-web.scm
+++ b/gnu/packages/haskell-web.scm
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -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
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -518,6 +518,8 @@ Japanese language input in most graphical applications.")
    (arguments
     (list
      #:tests? #f ;no tests
+      #:configure-flags
+      #~(list "CFLAGS=-Wno-error=incompatible-pointer-types")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-skk-jisyo
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -669,7 +669,7 @@ and WebP.")
 (define-public mcomix
  (package
    (name "mcomix")
-    (version "3.1.0")
+    (version "3.1.1")
    (source
     (origin
       (method url-fetch)
@@ -677,7 +677,7 @@ and WebP.")
                           "mcomix-" version ".tar.gz"))
       (sha256
        (base32
-         "09y4nhlcqvvhz0wscx4zpqxmyhiwh8wrjnhk52awxhzvgyx6wa7r"))))
+         "1y6fps1fbzjc4sdm381432zvrq97iadbz4yyxxsfnzf0ggnsl2m1"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -720,8 +720,14 @@ and WebP.")
               (wrap-program prog
                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
    (native-inputs (list python-setuptools))
-    (inputs
-     (list bash-minimal p7zip python python-pillow python-pygobject python-pycairo gtk+))
+    (inputs (list bash-minimal
+                  gobject-introspection
+                  gtk+
+                  p7zip
+                  python
+                  python-pillow
+                  python-pycairo
+                  python-pygobject))
    (home-page "https://sourceforge.net/p/mcomix/wiki/Home/")
    (synopsis "Image viewer for comics")
    (description "MComix is a customizable image viewer that specializes as
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -75,33 +75,26 @@
 (define-public babeltrace
  (package
    (name "babeltrace")
-    (version "2.0.5")
+    (version "2.1.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://www.efficios.com/files/babeltrace/babeltrace2-"
                                  version ".tar.bz2"))
              (sha256
-               (base32 "1d7jxljbfb4y8jmxm7744ndhh9k9rw8qhmnljb19wz7flzr9x3vv"))))
+               (base32 "171cn0y6qbixqggbw7minf4ggfa1j5yc0a1bsj5rnrxd6k93z0qj"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f  ; FIXME - When Python's bindings are enabled, tests do not
                    ; pass.
       #:make-flags
       ,#~(list
-           (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
-           "DISTSETUPOPTS=--single-version-externally-managed") ;no .egg files
+           (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
       #:configure-flags
       '("--enable-debug-info"
         "--enable-man-pages"
         "--enable-python-bindings"
         "--enable-python-plugins")
-       #:phases
-       (modify-phases %standard-phases
-         ;; These are recommended in the project's README for a development
-         ;; build configuration.
-         (add-after 'unpack 'reconfigure
-           (lambda _
-             (delete-file "configure"))))))
+       ))
    (inputs
     (list glib))
    ;; NOTE - elfutils is used for the LTTng debug information filter
@@ -110,30 +103,15 @@
    ;; `#:configure-flags`.
    (propagated-inputs
     (list elfutils))
-    ;; NOTE - python-3 is set here for generating the bindings.  Users need to
-    ;; install python-3 in their profile in order to use these bindings.
-    ;;
-    ;; NOTE - Babeltrace 2.0.4 is distributed with a aclocal.m4 that does not
-    ;; support Python3.10.  We can either disable Python's bindings or we can
-    ;; reconfigure the project with our autoconf.  This is because the
-    ;; distribution tarballs are generated on Ubuntu LTS 18.04.
-    ;;
-    ;; `paredit-raise-sexp' on the first list of native inputs and remove the
-    ;; 'autoreconf invocation whenever we bump to the next version that is
-    ;; goind to be generated on Ubuntu LTS 22.04.
    (native-inputs
-     (append
-      (list asciidoc
-            bison
-            flex
-            pkg-config
-            python-3
-            python-sphinx
-            swig-4.0
-            xmltoman)
-      (list autoconf
-            automake
-            libtool)))
+     (list asciidoc
+           bison
+           flex
+           pkg-config
+           python-3
+           python-sphinx
+           swig-4.0
+           xmltoman))
    (home-page "https://babeltrace.org/")
    (synopsis "Trace manipulation toolkit")
    (description "Babeltrace 2 is a framework for viewing, converting,
@@ -388,14 +366,14 @@ many probes which instrument numerous interesting parts of Linux.")
 (define-public lttng-ust
  (package
    (name "lttng-ust")
-    (version "2.13.8")
+    (version "2.15.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://lttng.org/files/lttng-ust/"
                                  "lttng-ust-" version ".tar.bz2"))
              (sha256
               (base32
-                "0dyr4j8f8y6fmfpxb3ajkc1ndwpl1baxzbyc4ksx8ym3p7d9ivyl"))))
+                "0a1yk6cci5yqkdy3fvjdky0lc1sbpcxhpm43vb3h1pahg8y75jbb"))))
    (build-system gnu-build-system)
    (inputs
     (list numactl))
@@ -414,23 +392,19 @@ to ring buffers shared with a consumer daemon.")
 (define-public lttng-tools
  (package
    (name "lttng-tools")
-    (version "2.13.14")
+    (version "2.15.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://lttng.org/files/lttng-tools/"
                                  "lttng-tools-" version ".tar.bz2"))
              (sha256
               (base32
-                "1jxdwm0a3z70jrx6yg57x5cswi7ycgyazng41rkgxnq7mp2gggak"))))
+                "12pjxdfqg9ri4wng143x9dvwcrx9q2kg1isv4xc1v9vdalb92wsd"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags '("--enable-python-bindings")
-       ;; FIXME - Tests are disabled for now because one test hangs
-       ;; indefinetely.  Also, parallel testing is not possible because of how
-       ;; the lttng-daemon handles sessions.  Thus, keep parallel testing
-       ;; disabled even after tests are enabled!
+       ;; FIXME - Tests are disabled for now.
       #:tests? #f
-       #:parallel-tests? #f
       #:phases
       (modify-phases %standard-phases
         (add-before 'configure 'set-environment-variables
@@ -440,11 +414,8 @@ to ring buffers shared with a consumer daemon.")
         ;; We don't put (which "man") here because LTTng uses execlp.
         (add-after 'unpack 'patch-default-man-path
           (lambda _
-             (substitute* "src/common/defaults.h"
-               (("/usr/bin/man") "man"))))
-         (add-before 'configure 'autoreconf
-           (lambda _
-             (invoke "autoreconf" "-vfi"))))))
+             (substitute* "src/common/defaults.hpp"
+               (("/usr/bin/man") "man")))))))
    ;; NOTE - Users have to install python-3 in their profile to use the
    ;; bindings.  We don't put it in the inputs, because the rest of the tools
    ;; can work without it.
@@ -452,31 +423,22 @@ to ring buffers shared with a consumer daemon.")
     (list liburcu popt numactl))
    (propagated-inputs
     (list kmod module-init-tools))
-    ;; NOTE - LTTng 2.13.9 is distributed with a aclocal.m4 that does not
-    ;; support Python3.10.  We can either disable Python's bindings or we can
-    ;; reconfigure the project with our autoconf.  This is because the
-    ;; distribution tarballs are generated on Ubuntu LTS 18.04.
-    ;;
-    ;; `paredit-raise-sexp' on the first list of native inputs and remove the
-    ;; 'autoreconf build step whenever we bump to the next version that is
-    ;; goind to be generated on Ubuntu LTS 22.04.
    (native-inputs
-     (append
-      (list pkg-config
-            perl
-            libpfm4
-            python-3
-            swig-4.0
-            procps
-            which
-            flex
-            bison
-            asciidoc
-            libxml2
-            lttng-ust)
-      (list autoconf
-            automake
-            libtool)))
+     (list
+      asciidoc
+      babeltrace
+      bison
+      flex
+      libpfm4
+      libxml2
+      lttng-ust
+      perl
+      procps
+      python-3
+      swig-4.0
+      which
+      pkg-config
+      ))
    (home-page "https://lttng.org/")
    (synopsis "LTTng userspace tracer libraries")
    (description "The lttng-tools project provides a session
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -298,8 +298,8 @@ Verification specification
    (home-page "https://github.com/ipfs/go-bitfield")
    (synopsis "Allocated up-front Bitfield for Golang")
    (description
-     "This package implements a functionality similar to standard
-@code{big.Int} with some optimizations to use in IPFS.")
+     "This package implements bitfields to the standard library's @code{big.Int}
+with some optimizations for use in IPFS.")
    (license (list license:expat license:asl2.0))))

 (define-public go-github-com-ipfs-go-block-format
@@ -1191,11 +1191,9 @@ IPLD graph as detailed below.  Objects are demonstrated here using both
           go-github-com-libp2p-go-libp2p))
    (home-page "https://github.com/ipfs/go-peertaskqueue")
    (synopsis "Prioritized queue of abstract tasks distributed among peers")
-    ;; Project has nothing in README, see
-    ;; <https://github.com/ipfs/go-peertaskqueue/issues/1>.
    (description
-     "This package implements a functionality to prioritize queue of abstract
-tasks distributed among peers.")
+     "This package implements a prioritized list of tasks to be executed on
+peers.")
    (license (list license:asl2.0 license:expat))))

 (define-public go-github-com-ipfs-go-test
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -1039,6 +1039,7 @@ but can also be used independently as a logging bot.")
       (uri (git-reference
              (url "https://git.causal.agency/scooper")
              (commit version)))
+       (file-name (git-file-name name version))
       (sha256
        (base32 "0sqb8hg402il38pjhwa3lfyrskf1yr6yjd5fswqvk3d15v1jq4m8"))))
    (build-system gnu-build-system)
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1499,7 +1499,7 @@ new Date();"))))
                              (for-each reset-file-timestamp
                                        (find-files dir #:directories? #t)))
                            (with-directory-excursion dir
-                              (let ((files (find-files "." #:directories? #t)))
+                              (let ((files (find-files ".")))
                                (apply invoke "zip" "-0" "-X" archive files)))))))
                (for-each repack-archive
                          (find-files #$output:doc "\\.zip$"))
--- a/gnu/packages/kubernetes.scm
+++ b/gnu/packages/kubernetes.scm
@@ -0,0 +1,99 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2026 Arthur Rodrigues <arthurhdrodrigues@proton.me>
+;;;
+;;; 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/>.
+
+(define-module (gnu packages kubernetes)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system go)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-web)
+  #:use-module (gnu packages golang-xyz)
+  #:use-module (gnu packages prometheus))
+
+
+;;;
+;;; Libraries:
+;;;
+
+(define-public go-k8s-io-component-base
+  (package
+    (name "go-k8s-io-component-base")
+    (version "0.34.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/kubernetes/component-base")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "090ghb66zh4mln9fvp89vfq0g4pysm5y4lrp5n6801491mngyndm"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "-skip" "Tracing")
+      #:import-path "k8s.io/component-base"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-blang-semver-v4
+           go-github-com-go-logr-logr
+           go-github-com-go-logr-zapr
+           go-github-com-google-go-cmp
+           go-github-com-moby-term
+           go-github-com-prometheus-client-golang
+           go-github-com-prometheus-client-model
+           go-github-com-prometheus-common
+           go-github-com-prometheus-procfs
+           go-github-com-spf13-cobra
+           go-github-com-spf13-pflag
+           go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp
+           go-go-opentelemetry-io-otel
+           go-go-opentelemetry-io-otel-exporters-otlp-otlptrace
+           go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracegrpc
+           go-go-opentelemetry-io-otel-sdk
+           go-go-opentelemetry-io-otel-trace
+           go-go-uber-org-zap
+           go-go-yaml-in-yaml-v2
+           go-golang-org-x-sys
+           go-golang-org-x-text
+           go-k8s-io-apimachinery
+           go-k8s-io-client-go
+           go-k8s-io-klog-v2
+           go-k8s-io-utils
+           go-sigs-k8s-io-json))
+    (home-page "https://github.com/kubernetes/component-base")
+    (synopsis "Kubernetes core components Golang source code")
+    (description
+     "This package contains shared code for Kubernetes core components.")
+    (license license:asl2.0)))
+
+
+;;;
+;;; Executables:
+;;;
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above in alphabetic order:
+;;; guix import --insert=gnu/packages/python-xyz.scm pypi <package-name>.
+;;;
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -929,7 +929,7 @@ and manipulation.")
 (define-public libskk
  (package
    (name "libskk")
-    (version "1.0.5")
+    (version "1.1.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -938,15 +938,10 @@ and manipulation.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"))
-              (patches
-               (search-patches
-                "libskk-fix-invalid-escape.patch"))))
+                "0x2fswxybc5ii821ydmm7bjn8cyr35zi3mdld2zmaqc7863hzhqq"))))
    (build-system gnu-build-system)
    (arguments
     (list #:parallel-tests? #f        ;Concurrency issues in tests.
-           ;; relax gcc 14 strictness
-           #:configure-flags #~(list "CFLAGS=-g2 -O2 -Wno-error=int-conversion")
           #:phases
           #~(modify-phases %standard-phases
               (add-after 'install 'symlink-skk-jisyo
@@ -961,7 +956,8 @@ and manipulation.")
                         libtool
                         pkg-config
                         vala))
-    (inputs (list libgee json-glib libxkbcommon skk-jisyo))
+    (inputs (list json-glib libxkbcommon skk-jisyo))
+    (propagated-inputs (list glib libgee)) ;required by libskk.pc
    (home-page "https://github.com/ueno/libskk")
    (synopsis "Dealing with Japanese kana-to-kanji conversion")
    (description
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -26,6 +26,7 @@
  #:use-module (guix gexp)
  #:use-module (guix licenses)
  #:use-module (gnu packages)
+  #:use-module (gnu packages base)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages perl-compression)
@@ -98,6 +99,7 @@ text editors.")
            ;; dependencies which might never ever be used.
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((file (search-input-file inputs "/bin/file"))
+                    (locale (search-input-file inputs "/bin/locale"))
                    (tput (search-input-file inputs "/bin/tput")))
                (substitute* "sxw2txt"
                  (("^use warnings;" line)
@@ -107,13 +109,14 @@ text editors.")
                (substitute* "lesscomplete"
                  (("file -") (string-append file " -")))
                (substitute* "lesspipe.sh"
-                  (("tput colors")
-                   (string-append tput " colors"))
+                  (("\\<tput\\>") tput)
+                  (("\\<locale\\>") locale)
                  (("file -")
                   (string-append file " -")))))))))
    (inputs
     (list file
           ncurses                      ; for tput
+           glibc                        ; for locale
           perl-archive-zip))
    (native-inputs (list perl))
    (home-page "https://github.com/wofr06/lesspipe")
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -125,14 +125,14 @@
  ;; ex:
  ;; tar xf /gnu/store/...-firefox-123.4.source.tar.xz -O \
  ;;     firefox-123.4/browser/locales/l10n-changesets.json | grep revision
-  (let ((commit "d1394212aed0ce0063c0f818aa236e7d4f955ac9"))
+  (let ((commit "0245ffb160688061f0e0c67ea488bcdfdacbeca4"))
    (origin
      (method git-fetch)
      (uri (git-reference
            (url "https://github.com/mozilla-l10n/firefox-l10n.git")
            (commit commit)))
      (file-name (git-file-name "firefox-l10n" commit))
-      (sha256 (base32 "16s515xf0i7a7acv0m1bbgflbdx9a87b1dcg7q3yswym8x1bhvaj")))))
+      (sha256 (base32 "0y8xdxql04yys0wj685v4yp3kmx1ivnndg6z11vam8vszh0j7ak6")))))

 (define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n)
  (let* ((ff-src (firefox-source-origin
@@ -244,17 +244,17 @@
 ;; It's used for cache validation and therefore can lead to strange bugs.
 ;; ex: date '+%Y%m%d%H%M%S'
 ;; or: (format-time-string "%Y%m%d%H%M%S")
-(define %librewolf-build-id "20260326135749")
+(define %librewolf-build-id "20260409162101")

 (define-public librewolf
  (package
    (name "librewolf")
-    (version "149.0-1")
+    (version "149.0.2-2")
    (source
     (make-librewolf-source
      #:version version
-      #:firefox-hash "12jb930qhqhpzjpn5smms7g4n6y40zvxcrg8w42696wxk7pgsqdq"
-      #:librewolf-hash "0igv0fr0vl2nf5rlgnidfz2a3gh55bsqwcray0jg7x2kl6qnkzwm"
+      #:firefox-hash "1kkhg3lgyakinn5ankxrlxbf39wi61mqbhwrj1l4q5l7y0n1m4va"
+      #:librewolf-hash "1bai8g2kc9snck2f724al29q6r57vkj3d7v58rf0mgzpqzvwnw5f"
      #:l10n firefox-l10n))
    (build-system gnu-build-system)
    (arguments
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -81,7 +81,7 @@
 ;;; Copyright © 2024 Gabriel Wicki <gabriel@erlikon.ch>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 ;;; Copyright © 2025 Mathieu Laparie <mlaparie@disr.it>
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
@@ -104,9 +104,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages linux)
-  #:use-module (gnu packages)
  #:use-module (gnu packages acl)
-  #:use-module (gnu packages adns)
  #:use-module (gnu packages admin)
  #:use-module (gnu packages algebra)
  #:use-module (gnu packages apparmor)
@@ -120,19 +118,20 @@
  #:use-module (gnu packages boost)
  #:use-module (gnu packages calendar)
  #:use-module (gnu packages check)
+  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpio)
  #:use-module (gnu packages cpp)
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages cryptsetup)
-  #:use-module (gnu packages compression)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages databases)
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages dbm)
  #:use-module (gnu packages disk)
+  #:use-module (gnu packages dlang)
+  #:use-module (gnu packages dns)
  #:use-module (gnu packages docbook)
  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages dlang)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages file)
  #:use-module (gnu packages flex)
@@ -147,6 +146,7 @@
  #:use-module (gnu packages golang)
  #:use-module (gnu packages gperf)
  #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages groff)
  #:use-module (gnu packages gstreamer)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages guile)
@@ -154,8 +154,8 @@
  #:use-module (gnu packages haskell-xyz)
  #:use-module (gnu packages image)
  #:use-module (gnu packages kde-frameworks)
-  #:use-module (gnu packages libedit)
  #:use-module (gnu packages kde-graphics)
+  #:use-module (gnu packages libedit)
  #:use-module (gnu packages libevent)
  #:use-module (gnu packages libunwind)
  #:use-module (gnu packages libusb)
@@ -172,8 +172,8 @@
  #:use-module (gnu packages nss)
  #:use-module (gnu packages onc-rpc)
  #:use-module (gnu packages oneapi)
-  #:use-module (gnu packages perl)
  #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages polkit)
  #:use-module (gnu packages popt)
@@ -192,9 +192,12 @@
  #:use-module (gnu packages rust-sources)
  #:use-module (gnu packages samba)
  #:use-module (gnu packages sdl)
+  #:use-module (gnu packages selinux)
  #:use-module (gnu packages serialization)
  #:use-module (gnu packages slang)
+  #:use-module (gnu packages sphinx)
  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages swig)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages textutils)
  #:use-module (gnu packages tls)
@@ -203,39 +206,36 @@
  #:use-module (gnu packages vim)
  #:use-module (gnu packages vulkan)
  #:use-module (gnu packages web)
+  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xiph)
  #:use-module (gnu packages xml)
-  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages groff)
-  #:use-module (gnu packages selinux)
-  #:use-module (gnu packages sphinx)
-  #:use-module (gnu packages swig)
-  #:use-module (guix platform)
+  #:use-module (gnu packages)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
+  #:use-module (guix build-system linux-module)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
-  #:use-module (guix build-system linux-module)
+  #:use-module (guix deprecation)    ;for libcap/next
  #:use-module (guix download)
+  #:use-module (guix gexp)
  #:use-module (guix git-download)
  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix gexp)
-  #:use-module (guix store)
  #:use-module (guix monads)
+  #:use-module (guix packages)
+  #:use-module (guix platform)
+  #:use-module (guix store)
  #:use-module (guix utils)
-  #:use-module (guix deprecation)    ;for libcap/next
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 regex)
  #:use-module (srfi srfi-1)
  #:use-module (srfi srfi-2)
  #:use-module (srfi srfi-26)
-  #:use-module (ice-9 match)
-  #:use-module (ice-9 regex)
  #:export (customize-linux
            make-defconfig))

@@ -531,7 +531,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; The current "stable" kernels. That is, the most recently released major
 ;; versions that are still supported upstream.

-(define-public linux-libre-6.19-version "6.19.11")
+(define-public linux-libre-6.19-version "6.19.12")
 (define-public linux-libre-6.19-gnu-revision "gnu")
 (define deblob-scripts-6.19
  (linux-libre-deblob-scripts
@@ -541,12 +541,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
   (base32 "05jpciyypvmy6byaxjl49b1fvzxcnlhknf0xabrdj5152iznrzkh")))
 (define-public linux-libre-6.19-pristine-source
  (let ((version linux-libre-6.19-version)
-        (hash (base32 "16ymkc5r3hw05z7l7ih3qw406qlszz1l7b4g5yz0hv15ddxrs0r0")))
+        (hash (base32 "1md8b270pdyk9d8cq0qyr8qmymcijmj3gc39nn394wpr0l94yp6f")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.19)))

-(define-public linux-libre-6.18-version "6.18.21")
+(define-public linux-libre-6.18-version "6.18.22")
 (define-public linux-libre-6.18-gnu-revision "gnu")
 (define deblob-scripts-6.18
  (linux-libre-deblob-scripts
@@ -556,7 +556,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
   (base32 "0qlih8w8wg4v5cwbmd34rbhb6mjgbx69i9rx3s2vxw7h42q9l0ai")))
 (define-public linux-libre-6.18-pristine-source
  (let ((version linux-libre-6.18-version)
-        (hash (base32 "0ks735y6jq4yy3jaicjsj4dn4n3kk2skf9dqh9dyifipn57j2f0w")))
+        (hash (base32 "0nazlm6j5blyd4qgl0z6xc3qk00vz3cfvx5mqv18awv5ygx94g52")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.18)))
@@ -565,7 +565,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; Here are the support timelines:
 ;; <https://www.kernel.org/category/releases.html>

-(define-public linux-libre-6.12-version "6.12.80")
+(define-public linux-libre-6.12-version "6.12.81")
 (define-public linux-libre-6.12-gnu-revision "gnu")
 (define deblob-scripts-6.12
  (linux-libre-deblob-scripts
@@ -575,12 +575,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
   (base32 "1x48hpmvajz7v5wn1vdd7l5r14mq4ngzh5npz3pj81z4f1g61i0a")))
 (define-public linux-libre-6.12-pristine-source
  (let ((version linux-libre-6.12-version)
-        (hash (base32 "0lrylj87bb8ky29pbplpncrfhmgqqbq3d49iqgdwv7p7jvc929f9")))
+        (hash (base32 "0iw84bqdbh9dlaqd1bqgldg50riw2b5is7ipqnbp0sll8cv9rc62")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.12)))

-(define-public linux-libre-6.6-version "6.6.130")
+(define-public linux-libre-6.6-version "6.6.134")
 (define-public linux-libre-6.6-gnu-revision "gnu")
 (define deblob-scripts-6.6
  (linux-libre-deblob-scripts
@@ -590,12 +590,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
   (base32 "0xp9b2vkrb0g0rn4i33b59rhp4sgh1dbwzk28vwz7kwac6l5rcpi")))
 (define-public linux-libre-6.6-pristine-source
  (let ((version linux-libre-6.6-version)
-        (hash (base32 "139480lyi3if8pd2j3yld5a01lk7113kbcn2kxpzyk29p5kslq14")))
+        (hash (base32 "1grp1wqgzjsk6xyl0nvd2hxlxjj0wgz04x544zkz8srp6rxnjy33")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.6)))

-(define-public linux-libre-6.1-version "6.1.167")
+(define-public linux-libre-6.1-version "6.1.168")
 (define-public linux-libre-6.1-gnu-revision "gnu")
 (define deblob-scripts-6.1
  (linux-libre-deblob-scripts
@@ -605,7 +605,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
   (base32 "1w5pfws6l39dpc3lzazs1n6r4m96f6rdf6vb2scy5fhmrd933ldc")))
 (define-public linux-libre-6.1-pristine-source
  (let ((version linux-libre-6.1-version)
-        (hash (base32 "1jwqwp2fg3wdsh9w663rbnbv1rvsvksv1pj4bzns8swp0wy0a618")))
+        (hash (base32 "0vkp75sfnjvfqxjh6gqcx24h2m6qj6xkwlw6b118cja43vjnz1g0")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.1)))
@@ -945,7 +945,11 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
    ;; Disable the EFI pstore storage backend to avoid causing
    ;; unrecoverable failures on some EFI systems:
    ;; https://lists.gnu.org/archive/html/help-guix/2025-01/msg00173.html
-    ("CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE" . #t)))
+    ("CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE" . #t)
+    ;; Provide modules for wireguard and netfilter support
+    ("CONFIG_WIREGUARD" . m)
+    ("CONFIG_IP_NF_FILTER" . m)
+    ("CONFIG_NETFILTER_XT_MATCH_ADDRTYPE" . m)))

 (define (config->string options)
  (string-join (map (match-lambda
@@ -1290,8 +1294,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                     #:extra-version "arm-generic"
                     #:extra-options
                     (append
-                      `(;; needed to fix the RTC on rockchip platforms
-                        ("CONFIG_RTC_DRV_RK808" . #t))
                      (default-extra-linux-options linux-libre-5.10-version))))

 (define-public linux-libre-arm-omap2plus
@@ -1302,6 +1304,31 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                     #:defconfig "omap2plus_defconfig"
                     #:extra-version "arm-omap2plus"))

+(define pinebook-extra-modules
+  `(;; Pinebook display, battery, charger and usb
+    ("CONFIG_DRM_ANALOGIX_ANX6345" . m)
+    ("CONFIG_CHARGER_AXP20X" . m)
+    ("CONFIG_INPUT_AXP20X_PEK" . m)
+    ("CONFIG_CHARGER_AXP20X" . m)
+    ("CONFIG_BATTERY_AXP20X" . m)
+    ("CONFIG_PINCTRL_AXP209" . m)
+    ("CONFIG_AXP20X_POWER" . m)
+    ("CONFIG_AXP20X_ADC" . m)
+    ;; Pinebook PRO battery and sound support
+    ("CONFIG_BATTERY_CW2015" . m)
+    ("CONFIG_CHARGER_GPIO" . m)
+    ("CONFIG_SND_SOC_ES8316" . m)))
+
+(define arm64-generic-extra-modules
+  (append
+   pinebook-extra-modules
+   `(;; Provide support for ath9k wireless
+     ("CONFIG_ATH9K_HTC" . m)
+     ;; Support Orange Pi R1 Plus LTS ethernet PHY.
+     ("CONFIG_MOTORCOMM_PHY" . m)
+     ;; needed to fix the RTC on rockchip platforms
+     ("CONFIG_RTC_DRV_RK808" . #t))))
+
 (define-public linux-libre-arm64-generic
  (make-linux-libre* linux-libre-version
                     linux-libre-gnu-revision
@@ -1311,25 +1338,7 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                     #:extra-version "arm64-generic"
                     #:extra-options
                     (append
-                      `(;; Provide support for ath9k wireless
-                        ("CONFIG_ATH9K_HTC" . m)
-                        ;; Support Orange Pi R1 Plus LTS ethernet PHY.
-                        ("CONFIG_MOTORCOMM_PHY" . m)
-                        ;; needed to fix the RTC on rockchip platforms
-                        ("CONFIG_RTC_DRV_RK808" . #t)
-                        ;; Pinebook display, battery, charger and usb
-                        ("CONFIG_DRM_ANALOGIX_ANX6345" . m)
-                        ("CONFIG_CHARGER_AXP20X" . m)
-                        ("CONFIG_INPUT_AXP20X_PEK" . m)
-                        ("CONFIG_CHARGER_AXP20X" . m)
-                        ("CONFIG_BATTERY_AXP20X" . m)
-                        ("CONFIG_PINCTRL_AXP209" . m)
-                        ("CONFIG_AXP20X_POWER" . m)
-                        ("CONFIG_AXP20X_ADC" . m)
-                        ;; Pinebook PRO battery and sound support
-                        ("CONFIG_BATTERY_CW2015" . m)
-                        ("CONFIG_CHARGER_GPIO" . m)
-                        ("CONFIG_SND_SOC_ES8316" . m))
+                      arm64-generic-extra-modules
                      (default-extra-linux-options linux-libre-version))))

 (define-public linux-libre-lts-arm64-generic
@@ -1347,25 +1356,7 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                         #:extra-version "arm64-generic"
                         #:extra-options
                         (append
-                          `( ;; Provide support for ath9k wireless
-                            ("CONFIG_ATH9K_HTC" . m)
-                            ;; Support Orange Pi R1 Plus LTS ethernet PHY.
-                            ("CONFIG_MOTORCOMM_PHY" . m)
-                            ;; needed to fix the RTC on rockchip platforms
-                            ("CONFIG_RTC_DRV_RK808" . #t)
-                            ;; Pinebook display, battery, charger and usb
-                            ("CONFIG_DRM_ANALOGIX_ANX6345" . m)
-                            ("CONFIG_CHARGER_AXP20X" . m)
-                            ("CONFIG_INPUT_AXP20X_PEK" . m)
-                            ("CONFIG_CHARGER_AXP20X" . m)
-                            ("CONFIG_BATTERY_AXP20X" . m)
-                            ("CONFIG_PINCTRL_AXP209" . m)
-                            ("CONFIG_AXP20X_POWER" . m)
-                            ("CONFIG_AXP20X_ADC" . m)
-                            ;; Pinebook PRO battery and sound support
-                            ("CONFIG_BATTERY_CW2015" . m)
-                            ("CONFIG_CHARGER_GPIO" . m)
-                            ("CONFIG_SND_SOC_ES8316" . m))
+                          arm64-generic-extra-modules
                          (default-extra-linux-options linux-libre-lts-version)))))

 (define-public linux-libre-arm64-generic-5.10
@@ -1377,21 +1368,7 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                     #:extra-version "arm64-generic"
                     #:extra-options
                     (append
-                      `(;; needed to fix the RTC on rockchip platforms
-                        ("CONFIG_RTC_DRV_RK808" . #t)
-                        ;; Pinebook display, battery, charger and usb
-                        ("CONFIG_DRM_ANALOGIX_ANX6345" . m)
-                        ("CONFIG_CHARGER_AXP20X" . m)
-                        ("CONFIG_INPUT_AXP20X_PEK" . m)
-                        ("CONFIG_CHARGER_AXP20X" . m)
-                        ("CONFIG_BATTERY_AXP20X" . m)
-                        ("CONFIG_PINCTRL_AXP209" . m)
-                        ("CONFIG_AXP20X_POWER" . m)
-                        ("CONFIG_AXP20X_ADC" . m)
-                        ;; Pinebook PRO battery and sound support
-                        ("CONFIG_BATTERY_CW2015" . m)
-                        ("CONFIG_CHARGER_GPIO" . m)
-                        ("CONFIG_SND_SOC_ES8316" . m))
+                      arm64-generic-extra-modules
                      (default-extra-linux-options linux-libre-5.10-version))))

 (define-public linux-libre-arm64-honeycomb
@@ -1453,9 +1430,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                        ;; Fixes https://codeberg.org/guix/guix/issues/101
                        ("CONFIG_KEY_DH_OPERATIONS" . #true)

-                        ;; For connecting to ci.guix.gnu.org over VPN.
-                        ("CONFIG_WIREGUARD" . m)
-
                        ;; restool support
                        ("CONFIG_FSL_MC_UAPI_SUPPORT" . #t)
                        ("CONFIG_FSL_MC_BUS" . #t)
@@ -1774,8 +1748,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                                           ("CONFIG_USB_ETH_RNDIS" . m)
                                           ("CONFIG_USB_ETH_EEM" . m)
                                           ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
                                           ;; Provide support for ath9k wireless
                                           ("CONFIG_ATH9K" . m)
                                           ("CONFIG_ATH9K_HTC" . m))
@@ -2088,8 +2060,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
                                           ("CONFIG_USB_ETH_RNDIS" . m)
                                           ("CONFIG_USB_ETH_EEM" . m)
                                           ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
                                           ;; Provide support for ath9k wireless
                                           ("CONFIG_ATH9K" . m)
                                           ("CONFIG_ATH9K_HTC" . m))
@@ -2423,8 +2393,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
                                           ("CONFIG_USB_ETH_RNDIS" . m)
                                           ("CONFIG_USB_ETH_EEM" . m)
                                           ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
                                           ;; Provide support for ath9k wireless
                                           ("CONFIG_ATH9K" . m)
                                           ("CONFIG_ATH9K_HTC" . m))
@@ -5032,7 +5000,6 @@ configuration and monitoring interfaces.")
               (with-directory-excursion "./python" (python-inst ,python))
               #t))))))))

-(define-public libnl-python2 (libnl-python-package "python2"))
 (define-public libnl-python3 (libnl-python-package "python3"))

 (define-public iw
@@ -5241,14 +5208,20 @@ or kill them altogether.")
               (base32
                "0b1jp5gp2gv40gv6cvmv86rcr4l0mdh050qbvnxl0xcwya45qffx"))))
    (build-system meson-build-system)
+    (outputs (list "out" "debug" "static"))
    (inputs
     (list bash-minimal util-linux))
    (arguments
     `(#:configure-flags
       ,#~(list
           (string-append "-Dudevrulesdir=" #$output "/udev/rules.d")
-           "-Duseroot=false")
+           "-Duseroot=false"
+           ;; Build static libraries.
+           "--default-library=both")
       #:tests? #f
+       #:modules ((guix build meson-build-system)
+                  (guix build utils)
+                  (ice-9 ftw))
       #:phases
       ,#~(modify-phases %standard-phases
            (add-after 'unpack 'set-file-names
@@ -5286,7 +5259,20 @@ or kill them altogether.")
                          (string-append #$output "/sbin"))
                  (setenv "UDEV_RULES_PATH"
                          (string-append #$output
-                                         "/lib/udev/rules.d"))))))))
+                                         "/lib/udev/rules.d")))))
+            (add-after 'install 'install-static-libraries
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let ((out (assoc-ref outputs "out"))
+                      (static (assoc-ref outputs "static")))
+                  (mkdir-p (string-append static "/lib"))
+                  (for-each
+                   (lambda (static-library)
+                     (rename-file
+                      (string-append out "/lib/" static-library)
+                      (string-append static "/lib/" static-library)))
+                   (scandir (string-append out "/lib")
+                            (lambda (file-name)
+                              (string-suffix? ".a" file-name))))))))))
    (supported-systems (remove target-hurd? %supported-systems))
    (home-page "https://github.com/libfuse/libfuse")
    (synopsis "Support file systems implemented in user space")
@@ -5357,23 +5343,6 @@ user-space processes.")
               (("-DFUSERMOUNT_DIR=[[:graph:]]+")
                "-DFUSERMOUNT_DIR=\\\"/var/empty\\\"")))))))))

-(define-public fuse-for-appimage
-  (package
-    (inherit fuse)
-    (name "fuse")
-    (version "3.16.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/libfuse/libfuse/releases/"
-                           "download/fuse-" version "/fuse-" version ".tar.gz"))
-       (sha256
-        (base32 "11yfl2w2a445hllyzlakq97n32g06972vxpmh7lpbclnj9fhb5zp"))))
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags original-flags #~(list))
-        #~(append #$original-flags '("--default-library=static")))))))
-
 (define-public unionfs-fuse
  (package
    (name "unionfs-fuse")
@@ -7713,7 +7682,15 @@ and copy/paste text in the console and in xterm.")
                        "/etc/security/limits.d")
         ;; Guix does not use systemd.
         "-Dwith-systemd-user-unit=false"
-         "-Dwith-systemd-group=false")))
+         "-Dwith-systemd-group=false")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-references
+            (lambda _
+              (substitute* '("lib/gamemode_client.h"
+                             "data/gamemoderun")
+                (("libgamemode(auto)?\\.so\\.0" lib)
+                 (string-append #$output "/lib/" lib))))))))
    (native-inputs
     (list pkg-config))
    (inputs
@@ -8430,7 +8407,7 @@ from the ntfs-3g package.  It is meant to be used in initrds.")
 (define-public rdma-core
  (package
    (name "rdma-core")
-    (version "60.0")
+    (version "62.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/linux-rdma/rdma-core"
@@ -8438,7 +8415,7 @@ from the ntfs-3g package.  It is meant to be used in initrds.")
                                  version ".tar.gz"))
              (sha256
               (base32
-                "1pi8jf1pibfhh3ps2kvj2y8y6yahpw7jjyp0mpxmvama9qp8j6wv"))))
+                "1802afy4q80zl7qkxlyq71ll5fsksva43f8xfd6vlqj1c47dc2n0"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f                      ;no tests
@@ -10364,7 +10341,7 @@ comparing system environments.")
 (define-public cassini-headers
  (package
    (name "cassini-headers")
-    (version "12.0.1")
+    (version "14.0.0")
    (home-page "https://github.com/HewlettPackard/shs-cassini-headers")
    (source (origin
              (method git-fetch)
@@ -10374,7 +10351,7 @@ comparing system environments.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0fvhk42pssw67zba4zq1b73d1m9ysc4g8sfibjmmhc0fwr92iamp"))))
+                "074r1snc682f1b6vgswyz55n8zjf5rhqnsl31xsswih7q9q38jda"))))
    (build-system copy-build-system)
    (arguments
     (list #:install-plan
@@ -10393,7 +10370,7 @@ software uses @file{cxi_prov_hw.h} from this package.")
 (define-public cxi-driver
  (package
    (name "cxi-driver")
-    (version "13.0.0")
+    (version "14.0.0")
    (home-page "https://github.com/HewlettPackard/shs-cxi-driver")
    (source
     (origin
@@ -10404,7 +10381,7 @@ software uses @file{cxi_prov_hw.h} from this package.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1md6ammah7ywk5k9gsxix945w5498hpdfwzr603aiirlz2x4m4wh"))))
+         "07dhdm1az9hvy48iq8bn0wypwyml59yr5aqqyf1yhwrf1basry9g"))))
    ;; TODO: Actually build the Linux driver.
    (build-system copy-build-system)
    (arguments
@@ -10442,7 +10419,7 @@ Currently the Linux driver itself is missing from this package.")
 (define-public libcxi
  (package
    (name "libcxi")
-    (version "13.0.0")
+    (version "14.0.0")
    (home-page "https://github.com/HewlettPackard/shs-libcxi")
    (source
     (origin
@@ -10451,7 +10428,7 @@ Currently the Linux driver itself is missing from this package.")
                           (commit (string-append "release/shs-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1m8mds1h8plhfn2ja9br31xaiy82ky69685cp1rznanl18inaiff"))))
+        (base32 "03czzz6h9jbmfikd85mx93bn84icnia08h69afw40flmpqidp5kh"))))
    (build-system gnu-build-system)
    (arguments
     (list #:configure-flags
@@ -10495,16 +10472,20 @@ known as Slingshot.")
 (define-public libfabric
  (package
    (name "libfabric")
-    (version "2.3.1")
+    (version "2.5.0")
    (source
     (origin
-       (method url-fetch)
-       (uri
-        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
-                       version "/libfabric-" version ".tar.bz2"))
-       (sha256
-        (base32 "0npkfkkhyir31r2p1zsfi7yrvcam60fp8ps4s2csjc2drqbrz4rf"))))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ofiwg/libfabric")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256 (base32 "14yhvywbz98yajffq5pmpphhpdr0g8m8a5579dfy56fpxar441an"))))
    (build-system gnu-build-system)
+    (native-inputs
+     (list autoconf
+           automake
+           libtool))
    (inputs
     (let ((if-supported                          ;XXX: modified from openmpi
            (lambda (package . extra)
@@ -10561,15 +10542,16 @@ libraries, which are often integrated directly into libfabric.")
 (define-public libfabric-1                        ;needed by Open MPI 4.x
  (package
    (inherit libfabric)
+    (name "libfabric")
    (version "1.22.0")
    (source
     (origin
-       (method url-fetch)
-       (uri
-        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
-                       version "/libfabric-" version ".tar.bz2"))
-       (sha256
-        (base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8"))))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ofiwg/libfabric")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256 (base32 "1scwkfdnlg20hld03pdq83jq1q3nmvj1gravpn02pacqq18bv9xk"))))
    (inputs
     (modify-inputs inputs
       (append cxi-driver-for-libfabric-1)))))
@@ -11623,7 +11605,7 @@ tools for managing PipeWire.")
 (define-public ell
  (package
    (name "ell")
-    (version "0.79")
+    (version "0.83")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -11632,7 +11614,7 @@ tools for managing PipeWire.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0l8pbgnza58ivknzl3nd6y46mfminhnb3iwq82msi6g282wv7np4"))
+                "1ywq84jgvf7f86srqwpq31w2kzdp875fx039x5g4lx486plgf526"))
              (modules '((guix build utils)))
              (snippet
               #~(begin
@@ -12269,7 +12251,7 @@ that avoids the usage of older system-wide @file{/sys} interface.")
 (define-public libtraceevent
  (package
    (name "libtraceevent")
-    (version "1.7.3")
+    (version "1.9.0")
    (source
     (origin
       (method git-fetch)
@@ -12278,7 +12260,7 @@ that avoids the usage of older system-wide @file{/sys} interface.")
             (commit (string-append name "-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "06mw2f0xnk6dy9w2z0n4dz7lnm02qfsmnmj2h24453qxlw57x0d6"))
+        (base32 "10fklw4znjhm8mlg6hwlipdyk7v3053lnrc5bpqifnsc8gwqbaz0"))
       (modules '((guix build utils)))
       (snippet
        #~(begin
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -12982,8 +12982,8 @@ score.  When evaluated, the musical score is rendered to an image.")
  (sbcl-package->ecl-package sbcl-cmn))

 (define-public sbcl-coalton
-  (let ((commit "939342495f55991812c2c2767322c5e51e755216")
-        (revision "4"))
+  (let ((commit "bf475c8c53e02a2e0cb29deab4d101d25743bfca")
+        (revision "5"))
    (package
      (name "sbcl-coalton")
      (version (git-version "0.0.1" revision commit))
@@ -12995,7 +12995,7 @@ score.  When evaluated, the musical score is rendered to an image.")
               (commit commit)))
         (file-name (git-file-name "cl-coalton" version))
         (sha256
-          (base32 "08qzj3v4fvn9h87whyqg650rpap8lva7jr94d1akv6m2z62l5q68"))))
+          (base32 "0zrp2s82n2mxx7knbnbsdj64zar21nnnf8iwzrqzs4g3v6xpyz9z"))))
      (build-system asdf-build-system/sbcl)
      (native-inputs
       (list sbcl-fiasco))
@@ -27700,49 +27700,6 @@ adaptations.")
 (define-public ecl-radiance
  (sbcl-package->ecl-package sbcl-radiance))

-(define-public sbcl-radiance-contribs
-  (let ((commit "710b3e1f9971e48368d52eea0b407f2e8f510981")
-        (revision "1"))
-    (package
-      (name "sbcl-radiance-contribs")
-      (version (git-version "1.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://codeberg.org/shirakumo/radiance-contribs")
-               (commit commit)))
-         (file-name (git-file-name "radiance-contribs" version))
-         (sha256
-          (base32 "08ivnd7a6vfciqna680qpx6zj6vw9xcbrzq29iz3x7x9sp1pqgq3"))))
-      (build-system asdf-build-system/sbcl)
-      (arguments
-       ;; TODO: Include more contribs.
-       `(#:asd-systems '("r-clip"
-                         "i-log4cl"
-                         "i-sqlite"
-                         "r-data-model"
-                         "r-simple-rate"
-                         "r-welcome")))
-      (inputs
-       (list sbcl-radiance
-             sbcl-cffi
-             sbcl-clip
-             sbcl-cl-sqlite
-             sbcl-log4cl))
-      (home-page "https://shirakumo.github.io/radiance/")
-      (synopsis "Standard implementations and drivers for the radiance interfaces")
-      (description
-       "This is a collection of useful helper modules and standard
-implementations for Radiance interfaces.")
-      (license license:zlib))))
-
-(define-public cl-radiance-contribs
-  (sbcl-package->cl-source-package sbcl-radiance-contribs))
-
-(define-public ecl-radiance-contribs
-  (sbcl-package->ecl-package sbcl-radiance-contribs))
-
 (define-public sbcl-random-sample
  (let ((commit "46b70374ed796b84ea003e83c1db97b0caf97e22")
        (revision "0"))
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
 ;;; Copyright © 2024 David Pflug <david@pflug.io>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2026 Igorj Gorjaĉev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -912,7 +913,7 @@ assembler, PEG) is less than 1MB.")
 (define-public jpm
  (package
    (name "jpm")
-    (version "1.1.0")
+    (version "1.2.0")
    (source
     (origin
       (method git-fetch)
@@ -921,7 +922,7 @@ assembler, PEG) is less than 1MB.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05rdxigmiy7vf93s16a8n2029lq33073jccz1rjl4iisxj6piw4l"))))
+        (base32 "06ywq1ajvqx3lfpldwbakc21hxhb313r0196xnmrrbb6k1f8hsfx"))))
    (build-system copy-build-system)
    (arguments
     (list
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -82,6 +82,7 @@
  #:use-module (gnu packages readline)
  #:use-module (gnu packages rsync)
  #:use-module (gnu packages ssh)
+  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages version-control)
  #:use-module (gnu packages vim)
@@ -1308,6 +1309,85 @@ for syntax highlighting or a linting tool.")
    (native-inputs (list pandoc))
    (inputs (list luajit))))

+(define (make-lua-scintillua name lua lua-lpeg lua-filesystem)
+  (package
+    (name name)
+    (version "6.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/orbitalquark/scintillua")
+             (commit (string-append "scintillua_" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "121ilpy91wyprqp3la4xzbb60i2yp1xpnvjlahzgzg0vck48njm7"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(let* ((lua-api-version #$(version-major+minor (package-version lua)))
+               (lua-cpath (string-append "/lib/lua/" lua-api-version))
+               (lua-path (string-append "/share/lua/" lua-api-version))
+               (scintillua (string-append #$output lua-path "/scintillua"))
+               (lexers (string-append scintillua "/lexers")))
+          (modify-phases %standard-phases
+            (delete 'configure)
+            (delete 'build)
+            (delete 'check)             ;move after install
+            (replace 'install
+              (lambda _
+                (mkdir-p scintillua)
+                (copy-recursively "lexers" lexers)
+                (substitute* (string-append lexers "/lexer.lua")
+                  (("package\\.path")
+                   (string-append "('" lexers "/?.lua;' .. package.path)")))
+                (with-output-to-file (string-append scintillua "/init.lua")
+                  (lambda ()
+                    (display
+                     "return require'scintillua.lexers.lexer'\n")))))
+            (add-after 'install 'set-lua-path
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((input-dirs (map cdr (alist-delete "source" inputs))))
+                  (setenv "GUIX_LUA_CPATH"
+                          (string-join
+                           (map (lambda (prefix)
+                                  (string-append prefix lua-cpath))
+                                input-dirs)
+                           ";"))
+                  (setenv "GUIX_LUA_PATH"
+                          (string-join
+                           (map (lambda (prefix)
+                                  (string-append prefix lua-path))
+                                (cons #$output input-dirs))
+                           ";")))))
+            (add-after 'set-lua-path 'check
+              (lambda _
+                (substitute* "tests.lua"
+                  (("^package\\.path = .*") "")
+                  (("require\\('lexer'\\)") "require'scintillua'")
+                  (("'lexers'") (string-append "'" lexers "'"))
+                  (("test_lua51" all)
+                   (string-append "skip_" all)))
+                (invoke "lua" "tests.lua")))))))
+      (native-inputs (list lua))
+      (propagated-inputs (list lua-lpeg lua-filesystem))
+      (home-page "https://orbitalquark.github.io/scintillua/")
+      (synopsis "Collection of LPeg lexer for source code")
+      (description
+       "This Lua library provides LPeg lexers for source code syntax
+highlighting.  It can either be used by itself or as a drop-in replacement
+for Scintilla lexers.")
+      (license license:expat)))
+
+(define-public lua-scintillua
+  (make-lua-scintillua "lua-scintillua" lua
+                       lua-lpeg lua-filesystem))
+
+(define-public lua5.4-scintillua
+  (make-lua-scintillua "lua5.4-scintillua" lua-5.4
+                       lua5.4-lpeg lua5.4-filesystem))
+
 (define-public lutok
  (package
    (name "lutok")
@@ -1898,3 +1978,119 @@ way, following established lisp conventions.")
 language.")
    (home-page "https://git.sr.ht/~xerool/fennel-ls")
    (license license:expat)))
+
+(define (make-lua-lunitx name lua)
+  (package
+    (name name)
+    (version "0.8.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     ;; Upstream repository name is "lunit", but it provides
+                     ;; both lunit and lunitx modules.
+                     (url "https://github.com/dcurrie/lunit")
+                     (commit version)))
+              (file-name (git-file-name "lua-lunitx" version))
+              (sha256
+               (base32
+                "0y9szbd2g8xk63s8781bjmw8sv3s5m6rnv47kh1sk21ml3mxi69y"))))
+    (build-system trivial-build-system)
+    (arguments
+      (list
+       #:modules '((guix build utils))
+       #:builder
+       #~(begin
+            (use-modules (guix build utils))
+            (let* ((lua (string-append #$lua "/bin/lua"))
+                   (lua-version #$(version-major+minor (package-version lua)))
+                   (lua-dir (string-append #$output "/share/lua/" lua-version)))
+              (when #$(not (%current-target-system))
+                (with-directory-excursion (string-append #$source "/lua")
+                  (invoke lua "../test/selftest.lua")))
+              (mkdir-p lua-dir)
+              (copy-recursively (string-append #$source "/lua") lua-dir)))))
+    (native-inputs (list lua))
+    (home-page "https://github.com/dcurrie/lunit")
+    (synopsis "Unit testing framework for Lua")
+    (description "Lunit is a unit testing framework for Lua.  It includes
+lunitx extensions adding Lua 5.2 compatibility via @code{lunit.module} and
+the @code{lunitx} module for running tests automatically at program exit.")
+    (license license:expat)))
+
+(define-public lua-lunitx
+  (make-lua-lunitx "lua-lunitx" lua))
+
+(define-public lua5.1-lunitx
+  (make-lua-lunitx "lua5.1-lunitx" lua-5.1))
+
+(define-public lua5.2-lunitx
+  (make-lua-lunitx "lua5.2-lunitx" lua-5.2))
+
+(define-public lua5.4-lunitx
+  (make-lua-lunitx "lua5.4-lunitx" lua-5.4))
+
+(define (make-lua-lsqlite3 name lua lua-lunitx)
+  (package
+    (name name)
+    (version "0.9.6")
+    (source (origin
+              (method url-fetch)
+              (uri "https://lua.sqlite.org/home/zip/lsqlite3_v096.zip")
+              (file-name (string-append "lsqlite3-v" version ".zip"))
+              (sha256
+               (base32
+                "10md6bfvbzflrhz4n75jr1ppmz86mwsip85llny23w2ld9iygipc"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? (not (%current-target-system))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)
+          (replace 'build
+            (lambda _
+              (invoke #$(cc-for-target) "-fPIC" "-shared" "-O2"
+                      "-o" "lsqlite3.so"
+                      "lsqlite3.c"
+                      "-llua" "-lsqlite3")))
+          (replace 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (lua-version
+                      #$(version-major+minor (package-version lua)))
+                     (cmod-dir (string-append out "/lib/lua/" lua-version)))
+                (install-file "lsqlite3.so" cmod-dir))))
+          (delete 'check)
+          (add-after 'install 'check
+            (lambda* (#:key tests? outputs #:allow-other-keys)
+              (when tests?
+                ;; Built only for the upstream test suite (test-dyld.lua).
+                (invoke #$(cc-for-target) "-fPIC" "-shared" "-O2"
+                        "-o" "extras/libsqlitefunctions.so"
+                        "extras/extension-functions.c"
+                        "-lsqlite3")
+                ;; Only test the dynamic lsqlite3 module; lsqlite3complete
+                ;; (SQLite amalgamation) is not built by this package.
+                (invoke "lua" "test/tests-sqlite3.lua" "lsqlite3")
+                (invoke "lua" "test/test.lua")
+                (invoke "lua" "test/test-dyld.lua")))))))
+    (native-inputs (list unzip lua-lunitx))
+    (inputs (list lua sqlite))
+    (home-page "https://lua.sqlite.org/")
+    (synopsis "SQLite3 binding for Lua")
+    (description "LuaSQLite3 is a thin wrapper around the public domain
+SQLite3 database engine.  It provides a complete binding to the SQLite3 C API
+from within Lua programs.")
+    (license license:expat)))
+
+(define-public lua-lsqlite3
+  (make-lua-lsqlite3 "lua-lsqlite3" lua lua-lunitx))
+
+(define-public lua5.1-lsqlite3
+  (make-lua-lsqlite3 "lua5.1-lsqlite3" lua-5.1 lua5.1-lunitx))
+
+(define-public lua5.2-lsqlite3
+  (make-lua-lsqlite3 "lua5.2-lsqlite3" lua-5.2 lua5.2-lunitx))
+
+(define-public lua5.4-lsqlite3
+  (make-lua-lsqlite3 "lua5.4-lsqlite3" lua-5.4 lua5.4-lunitx))
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -51,24 +51,6 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages machine-learning)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix packages)
-  #:use-module (guix svn-download)
-  #:use-module (guix utils)
-  #:use-module (guix build-system cargo)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system ocaml)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system r)
-  #:use-module (guix build-system trivial)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages adns)
  #:use-module (gnu packages algebra)
  #:use-module (gnu packages assembly)
  #:use-module (gnu packages audio)
@@ -89,6 +71,7 @@
  #:use-module (gnu packages databases)
  #:use-module (gnu packages dejagnu)
  #:use-module (gnu packages digest)
+  #:use-module (gnu packages dns)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gcc)
@@ -154,6 +137,23 @@
  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system ocaml)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system r)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix svn-download)
+  #:use-module (guix utils)
  #:use-module (ice-9 match))

 (define-public dlpack
@@ -4666,7 +4666,7 @@ different backends")
 (define-public koboldcpp
  (package
    (name "koboldcpp")
-    (version "1.110")
+    (version "1.111.2")
    (source
     (origin
       (method git-fetch)
@@ -4682,7 +4682,7 @@ different backends")
            (delete-file-recursively "lib")
            (for-each delete-file (find-files "." "\\.(dll|exe|bat)$"))))
       (sha256
-        (base32 "1lfdfsk227qgk44sq10qa93cl5s221djnpj82wg6b38dg7yy0b62"))))
+        (base32 "0mlq0p14p5vhc0pknkjidcw885mr0c92881lp629n44qxdf7dx8i"))))
    (build-system gnu-build-system)
    (arguments
     (list
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -68,6 +68,7 @@
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2026 Sergey Trofimov <sarg@sarg.org.ru>
 ;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
+;;; Copyright © 2026 Herman Rimm <herman@rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4744,7 +4745,7 @@ on RFC 3501 and original @code{imaplib} module.")
 (define-public rspamd
  (package
    (name "rspamd")
-    (version "3.12.1")
+    (version "3.14.3")
    (source
     (origin
       (method git-fetch)
@@ -4752,7 +4753,7 @@ on RFC 3501 and original @code{imaplib} module.")
             (url "https://github.com/rspamd/rspamd")
             (commit version)))
       (sha256
-        (base32 "0li75dqqy0irrvv2jddmll2adf15cywif982ijj034hldg9162bc"))
+        (base32 "1yh3933ak7qzzys6yzixrs8pmmsh16ny23im958h8rqg0xrq3mcy"))
       (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -4783,11 +4784,11 @@ on RFC 3501 and original @code{imaplib} module.")
    (native-inputs
     (list pkg-config))
    (synopsis "Spam filtering system")
-    (description "Rspamd is an advanced spam filtering system that
-allows evaluation of messages by a number of rules including regular
-expressions, statistical analysis and custom services such as URL
-black lists.  Each message is analysed by Rspamd and given a spam
-score.")
+    (description
+     "Rspamd is a spam filter that evaluates email messages by a number
+of rules including: regular expressions, statistical analysis, and URL
+blacklists.  Rspamd gives each message a spam score, e.g., for further
+processing by an MTA.")
    (home-page "https://www.rspamd.com/")
    (license license:asl2.0)))

@@ -5259,6 +5260,6 @@ features:
    (home-page "https://github.com/emersion/hydroxide")
    (synopsis "ProtonMail CardDAV, IMAP and SMTP bridge")
    (description
-     "This package implements a functionality to translate standard
-protocols (SMTP, IMAP, CardDAV) into ProtonMail API requests.")
+     "A third-party, open-source ProtonMail bridge.  It is designed to run on a
+server.  It supports CardDAV, IMAP and SMTP.")
    (license license:expat)))
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -134,7 +134,7 @@ specific format when needed.")
                  (delete 'configure)) ; no configure script
       #:test-target "test"))
    (native-inputs
-     `(("python" ,python-2)
+     `(("python" ,python-minimal-wrapper)
       ("tidy" ,tidy-html)))
    (synopsis "Markdown processing library")
    (description "Hoedown is a standards compliant, fast, secure markdown
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -458,6 +458,7 @@ programming languages.")
             (url "https://github.com/cvc5/cvc5/")
             (commit (string-append "cvc5-" version))))
       (file-name (git-file-name name version))
+       (patches (search-patches "cvc5-reproducible-build.patch"))
       (sha256
        (base32 "0ynz7di4dyyiiydgmf0z9dc2jl7nm44xi0amch29rcgznwr4wy5m"))))
    (build-system cmake-build-system)
@@ -486,8 +487,9 @@ programming languages.")
                 ""))))
          ;; The 'check phase requires test programs build using 'build-tests'.
          (add-before 'check 'build-tests
-            (lambda _
-              (invoke "cmake" "--build" "." "--target" "build-tests"))))))
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "cmake" "--build" "." "--target" "build-tests")))))))
    (inputs (list cadical-2.1
                  cln
                  cryptominisat
@@ -8804,7 +8806,7 @@ and comparisons are supported.")
         "1fwlgbcdxz30dzsqw3y1b6ic1rhzfadghj7cq7yxsj14npgnwzga"))))
    (build-system cmake-build-system)
    (native-inputs
-     (list pkg-config python-2)) ;for tests; syntax incompatible with Python 3
+     (list pkg-config python-minimal-wrapper))
    (inputs
     (list openblas suitesparse))
    (arguments
@@ -9977,6 +9979,17 @@ also included.")
           #:imported-modules %copy-build-system-modules
           #:phases
           #~(modify-phases %standard-phases
+               ;; By default, cadical defines the DATE macro to have a $(date)
+               ;; value.  This makes the build not reproducible.  If the macro
+               ;; is not defined it uses __DATE__ and __TIME__, which we patch
+               ;; to return a fixed date.  Thus, achieving a reproducible build.
+               ;;
+               ;; An upstream patch for respecting SOURCE_DATE_EPOCH is pending.
+               ;; See also <https://github.com/arminbiere/cadical/pull/164>.
+               (add-after 'unpack 'no-build-date
+                 (lambda _
+                   (substitute* "scripts/make-build-header.sh"
+                     (("\\[ x\"\\$DATE\" = x\" \" \\]") "true"))))
               (replace 'configure
                 (lambda* (#:key configure-flags #:allow-other-keys)
                   (apply invoke "./configure" configure-flags)))
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2690,23 +2690,6 @@ validating international phone numbers.")
   (home-page "https://github.com/google/libphonenumber")
   (license license:asl2.0)))

-(define-public libphonenumber-8.11
-  (package/inherit libphonenumber
-    (name (package-name libphonenumber))
-    (version "8.11.5")
-    (source (origin
-              (inherit (package-source libphonenumber))
-              (uri (git-reference
-                    (url "https://github.com/google/libphonenumber")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1y4ivhy3kwgggrr3g521zaf97334aan0yqpzzryss80k326q5rhf"))))
-    (inputs
-     (modify-inputs inputs
-       (delete "abseil-cpp" "icedtea")))))
-
 (define-public chatty
  (package
    (name "chatty")
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -531,6 +531,47 @@ MPRIS 2 support.")
    (home-page "https://github.com/eonpatapon/mpDris2")
    (license license:gpl3+)))

+(define-public mpdris2-rs
+  (package
+    (name "mpdris2-rs")
+    (version "1.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/szclsya/mpdris2-rs")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "023m4g1kgr2q2vllaij7nlxd5gp3vklvbhf5drymgqz3pcmslb52"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:install-source? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-systemd-unit
+            (lambda _
+              (let ((unit-dir (in-vicinity #$output "lib/systemd/user/")))
+                (substitute* "misc/mpdris2-rs.service"
+                  (("/usr/local/bin/mpdris2-rs")
+                   (in-vicinity #$output "bin/mpdris2-rs")))
+                (install-file "misc/mpdris2-rs.service" unit-dir)))))))
+    (inputs (cargo-inputs 'mpdris2-rs))
+    (home-page "https://github.com/szclsya/mpdris2-rs")
+    (synopsis "Exposing MPRIS V2.2 D-Bus interface for mpd")
+    (description
+     "A lightweight implementation of MPD to D-Bus bridge, which exposes MPD
+player and playlist information onto MPRIS2 interface so other programs can use
+this generic interface to retrieve MPD's playback state.
+
+Distinctively, mpdris2-rs uses MPD protocol's native
+@command{readpicture}/@command{albumart} methods to fetch album arts.  This
+means mpdris2-rs won't need any access to your local filesystem (apart from
+your @env{XDG_RUNTIME_DIR} for temporarily storing fetched albumarts) and can
+provide album arts even with remote MPD servers and Internet radios.")
+    (license license:gpl3)))
+
 (define-public cantata
  (package
    (name "cantata")
--- a/Show More
+++ b/Show More