gnu: Add libglycin.

We split the glycin loaders from libglycin to avoid dependency circles between gdk-pixbuf and glycin: glycin-loaders depends transitively on gdk-pixbuf. And gdk-pixbuf must depend on glycin at some point, since the transition plan is that it starts using it as a backend instead of its builtin loaders. With this commit, gdk-pixbuf can depend on libglycin; avoiding the extra dependencies brought by the loaders. This split is also recommended in Glycin’s README. * gnu/packages/gnome.scm (libglycin): New variable. (glycin-loaders): Define as inherited package of libglycin. (loupe, nautilus)[inputs]: Add libglycin. Change-Id: I424b2227882b9ca1cbd9c5130ac7239c22d59e56
gnu: rust-glycin-3: Update to 3.1.0.
2026-07-07 10:54:07 +02:00 · 2026-05-29 11:56:43 +02:00 · 2026-05-29 11:56:41 +02:00 · 2026-05-20 20:54:36 +02:00 · 2026-05-20 20:54:35 +02:00 · 2026-05-20 20:54:35 +02:00
213 changed files with 73216 additions and 15975 deletions
@@ -16,6 +16,8 @@
  ( ;; primary: "D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F"
   "01FD 85F4 1A7B 7F82 0583  06A5 935E BE07 36DC 857E"
   (name "avp"))
+  ("5D54 CF25 57B2 38E8 8DC1  80A2 2D22 3241 0AB7 4043"
+   (name "baleine"))
  ( ;; primary: "34FF 38BC D151 25A6 E340  A0B5 3453 2F9F AFCA 8B8E"
   "A3A4 B419 0074 087C A7DE  5698 BC45 CA67 E2F8 D007"
   (name "bavier"))
@@ -264,6 +264,7 @@ gnu/installer(\.scm$|/)                            @guix/installer
 gnu/packages/clojure\.scm                          @guix/java
 gnu/packages/java(-.+|)\.scm$                      @guix/java
 gnu/packages/maven(-.+|)\.scm$                     @guix/java
+gnu/packages/netbeans\.scm                         @guix/java
 guix/build/ant-build-system\.scm                   @guix/java
 guix/build/clojure-build-system\.scm               @guix/java
 guix/build/clojure-utils\.scm                      @guix/java
@@ -274,6 +275,7 @@ guix/build-system/ant\.scm                         @guix/java
 guix/build-system/clojure\.scm                     @guix/java
 guix/build-system/maven\.scm                       @guix/java

+gnu/packages/javascript\.scm                       @guix/javascript
 gnu/packages/node-xyz\.scm                         @guix/javascript
 gnu/packages/node\.scm                             @guix/javascript
 guix/build-system/node\.scm                        @guix/javascript
@@ -457,6 +457,8 @@ AUX_FILES =						\
  gnu/packages/aux-files/findclass.php			\
  gnu/packages/aux-files/guix.vim			\
  gnu/packages/aux-files/guix-nvim.vim			\
+  gnu/packages/aux-files/linux-libre/7.0-arm64.conf	\
+  gnu/packages/aux-files/linux-libre/7.0-x86_64.conf	\
  gnu/packages/aux-files/linux-libre/6.19-arm64.conf	\
  gnu/packages/aux-files/linux-libre/6.19-i686.conf	\
  gnu/packages/aux-files/linux-libre/6.19-x86_64.conf	\
@@ -3256,8 +3256,8 @@ your Linode Summary section.) Now you can run the "install guix from

@example
 sudo apt-get install gpg
-wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -
-wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
+wget https://codeberg.org/efraim.gpg -qO - | gpg --import -
+wget https://guix.gnu.org/guix-install.sh
 chmod +x guix-install.sh
 ./guix-install.sh
 guix pull
@@ -3436,7 +3436,7 @@ Now you can run the "install guix from @pxref{Binary Installation,,,
 guix, GNU Guix}" steps:

@example
-wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
+wget https://guix.gnu.org/guix-install.sh
 chmod +x guix-install.sh
 ./guix-install.sh
 guix pull
@@ -4491,7 +4491,7 @@ network.  Assuming your interface is named @samp{enp2s0}, the following
 command can be used to do so:

@example sh
-# nmcli con add type bridge-slave ifname enp2s0 master br0
+# nmcli con add type bridge-slave autoconnect yes ifname enp2s0 master br0
@end example

@quotation Important
@@ -4527,8 +4527,8 @@ bridge interface, as the default is to deny all.  Add the following to
 your list of services to do so:

@example lisp
-(extra-special-file "/etc/qemu/host.conf"
-                    (plain-file "host.conf" "allow br0\n"))
+(extra-special-file "/etc/qemu/bridge.conf"
+                    (plain-file "bridge.conf" "allow br0\n"))
@end example

@subsection Invoking QEMU with the right command line options
@@ -4546,7 +4546,7 @@ machine making use of the bridge would cause networking issues.
@example sh
 $ qemu-system-x86_64 [...] \
    -device virtio-net-pci,netdev=user0,mac=XX:XX:XX:XX:XX:XX \
-    -netdev bridge,id=user0,br=br0 \
+    -netdev bridge,helper=/run/privileged/bin/qemu-bridge-helper,id=user0,br=br0 \
    [...]
@end example

@@ -10,8 +10,8 @@
@include version.texi

@c Identifier of the OpenPGP key used to sign tarballs and such.
-@set OPENPGP-SIGNING-KEY-ID 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
-@set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=15145
+@set OPENPGP-SIGNING-KEY-ID A28BF40C3E551372662D14F741AAE7DCCA3D8351
+@set OPENPGP-SIGNING-KEY-URL https://codeberg.org/efraim.gpg

@c Base URL for downloads.
@set BASE-URL https://ftpmirror.gnu.org/gnu/guix
@@ -2658,12 +2658,13 @@ bootloaders.

 Once you are done partitioning the target hard disk drive, you have to
 create a file system on the relevant partition(s)@footnote{Currently
-Guix System supports only ext4, btrfs, bcachefs, JFS, F2FS, and XFS
-file systems.  In particular, code that reads file system UUIDs and
-labels works only for these file system types.  For bcachefs, also add
-the @code{bcachefs-linux-module} to your @code{operating-system}'s
-@code{initrd-modules}.}.  For the ESP, if you have one and assuming it is
-@file{/dev/sda1}, run:
+Guix System can mount only ext4, btrfs, JFS, F2FS, and XFS file systems
+at boot time.  In particular, code that reads file system UUIDs and
+labels works only for these file system types.  The code for bcachefs is
+in place, but support for loading out-of-tree kernel modules in the
+initrd is not.}.
+
+For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:

@example
 mkfs.fat -F32 /dev/sda1
@@ -4921,6 +4922,17 @@ information.
 In addition, @command{guix pull} supports all the common build options
 (@pxref{Common Build Options}).

+Every time the user invokes a Guix command, Guix detects if the current
+installation has exceeded a certain duration (7 days by default) and
+alerts the user to update with @command{guix pull} if necessary.
+The duration can be configured with the following environment variable:
+
+@defvr {Environment Variable} GUIX_DISTRO_AGE_WARNING
+This environment variable, if set, should be a string representing a
+duration. If the current Guix installation exceeds the duration, Guix
+will raise a warning for outdated installation.
+@end defvr
+
@node Invoking guix time-machine
@section Invoking @command{guix time-machine}

@@ -6590,6 +6602,21 @@ directory within the container.  If this is undesirable,
 be automatically shared and will change to the user's home directory
 within the container instead.  See also @option{--user}.

+@item --cwd=@var{directory}
+For containers, change to @var{directory} inside the container instead
+of the default location.  The default location is the current working
+directory when @option{--no-cwd} is not used, or the user's home
+directory when @option{--no-cwd} is used.  When @var{directory} is a
+relative file name, it is interpreted relative to the current working
+directory on the host.  Note that @option{--cwd} does not automatically
+share @var{directory}---you must ensure it is accessible via the default
+current directory sharing or explicit @option{--share}/@option{--expose}
+options.  For example:
+
+@example
+guix shell --container --cwd=/tmp --share=/tmp coreutils
+@end example
+
@item --writable-root
 When using @option{--container}, this option makes the root file system
 writable (it is read-only by default).
@@ -7091,6 +7118,17 @@ directory within the container.  If this is undesirable,
 be automatically shared and will change to the user's home directory
 within the container instead.  See also @option{--user}.

+@item --cwd=@var{directory}
+For containers, change to @var{directory} inside the container instead
+of the default location.  The default location is the current working
+directory when @option{--no-cwd} is not used, or the user's home
+directory when @option{--no-cwd} is used.  When @var{directory} is a
+relative file name, it is interpreted relative to the current working
+directory on the host.  Note that @option{--cwd} does not automatically
+share @var{directory}---you must ensure it is accessible via the default
+current directory sharing or explicit @option{--share}/@option{--expose}
+options.
+
@item --expose=@var{source}[=@var{target}]
@itemx --share=@var{source}[=@var{target}]
 For containers, @option{--expose} (resp. @option{--share}) exposes the
@@ -14857,7 +14895,7 @@ provided through NuGet's v3 API at @code{api.nuget.org} and includes
 most relevant information, including package dependencies.
 There are some caveats, however.  The metadata does not always include
 repository information, in which case the importer attempts to extract
-it from the symbol package (@file{.snupkg}) if available. 
+it from the symbol package (@file{.snupkg}) if available.
 Additionally, dependencies are grouped by target framework in NuGet,
 but the importer flattens all dependency groups into a single list.

@@ -19215,7 +19253,7 @@ 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
+@xref{grub-luks-root-device-key, Automatic LUKS Master Key Passing}, for
 details.

@end defvar
@@ -20678,6 +20716,9 @@ The syslog configuration file to use.
@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more
 information on the configuration file syntax.

+@item @code{pid-file} (default: @code{"/var/run/syslog.pid"})
+The pid file for @command{syslogd}.
+
@item @code{extra-options} (default: @code{'()})
 List of extra command-line options for @command{syslog}.

@@ -45250,6 +45291,12 @@ Extra command line options for @code{guix-data-service}.
@item @code{extra-process-jobs-options} (default: @var{'()})
 Extra command line options for @code{guix-data-service-process-jobs}.

+@item @code{extra-environment-variables} (default: @var{'()})
+Extra environment variables for @code{guix-data-service}.
+
+@item @code{extra-process-jobs-environment-variables} (default: @var{'()})
+Extra environment variables for @code{guix-data-service-process-jobs}.
+
@item @code{git-repositories} (default: @var{#f})
 List of git-repository information to insert into the database.

@@ -48959,8 +49006,28 @@ 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
+@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.

+For any use case not involving secrets, you should use regular initrd
+(@pxref{operating-system Reference, @code{initrd}}) instead.
+
+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.
+
+Currently only supported by GRUB.
+@end table
+
+@end deftp
+
+@anchor{grub-luks-root-device-key}
+@unnumberedsubsec Automatic LUKS Master Key Passing
+
+@cindex LUKS, root file system encryption
+@cindex passphrase, for LUKS-encrypted root
 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.
@@ -49001,22 +49068,7 @@ 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.
-
-For any use case not involving secrets, you should use regular initrd
-(@pxref{operating-system Reference, @code{initrd}}) instead.
-
-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.
-
-Currently only supported by GRUB.
-@end table
-
-@end deftp
+@unnumberedsubsec Additional Boot Entries

@cindex dual boot
@cindex boot menu
@@ -49145,9 +49197,13 @@ example of chainloading a different GNU/Linux system.
@end table
@end deftp

+@unnumberedsubsec Themes
+
@cindex HDPI
@cindex HiDPI
@cindex resolution
+@cindex themes, for GRUB
+@cindex bootloader themes
@c FIXME: Write documentation once it's stable.
 For now only GRUB has theme support.  GRUB themes are created using
 the @code{grub-theme} form, which is not fully documented yet.
@@ -49167,8 +49223,8 @@ Return the default GRUB theme used by the operating system if no
@code{theme} field is specified in @code{bootloader-configuration}
 record.

-It comes with a fancy background image displaying the GNU and Guix
-logos.
+It comes with a fancy background image displaying the Guix
+logo.
@end deffn

 For example, to override the default resolution, you may use something
@@ -49542,7 +49598,7 @@ how to generate an image that uses the @code{grub-efi-bootloader}
 bootloader and boot it with QEMU:

@example
-image=$(guix system image --image-type=qcow2 \
+image=$(guix system image --image-type=qcow2-gpt \
        gnu/system/examples/lightweight-desktop.tmpl)
 cp $image /tmp/my-image.qcow2
 chmod +w /tmp/my-image.qcow2
@@ -30,7 +30,7 @@ COOKBOOK_LANGUAGES = de es fr it ko pt_BR ru sk sv ta zh_CN

 # Arg1: A list of languages codes.
 # Arg2: The file name stem.
-lang_to_texinfo = $(foreach lang,$(1),%D%/$(2).$(lang).texi)
+lang_to_texinfo = $(foreach lang,$(1),$(srcdir)/%D%/$(2).$(lang).texi)

 # Automake does not understand GNU Make non-standard extensions,
 # unfortunately, so we cannot use the above patsubst-based function here.
@@ -104,7 +104,7 @@ MAINTAINERCLEANFILES  = $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO)
 # reference is not translated, which means it references a section that does not
 # exist.
 define xref_command
-$(top_srcdir)/pre-inst-env $(GUILE) --no-auto-compile	\
+$(top_builddir)/pre-inst-env $(GUILE) --no-auto-compile	\
  "$(top_srcdir)/build-aux/convert-xref.scm"		\
  $@.tmp $<
 endef
@@ -116,21 +116,21 @@ dummy_pot = $(shell mktemp --suffix=.pot)
 $(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po $(srcdir)/%D%/contributing.%.texi guix/build/po.go
 	-$(AM_V_PO4A)$(PO4A) --no-update			\
 	    --variable localized="$@.tmp"			\
-	    --variable master="%D%/guix.texi"			\
+	    --variable master="$(srcdir)/%D%/guix.texi"		\
 	    --variable po="$<"					\
 	    --variable pot=$(dummy_pot)			\
-	    po/doc/po4a.cfg
+	    $(srcdir)/po/doc/po4a.cfg
 	-sed -i "s|guix\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp"
 	-$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command)
 	-mv "$@.tmp" "$@"

 $(srcdir)/%D%/guix-cookbook.%.texi: po/doc/guix-cookbook.%.po guix/build/po.go
-	-$(AM_V_PO4A)$(PO4A) --no-update			\
-	    --variable localized="$@.tmp"			\
-	    --variable master="%D%/guix-cookbook.texi"		\
-	    --variable po="$<"					\
+	-$(AM_V_PO4A)$(PO4A) --no-update				\
+	    --variable localized="$@.tmp"				\
+	    --variable master="$(srcdir)/%D%/guix-cookbook.texi"	\
+	    --variable po="$<"						\
 	    --variable pot=$(dummy_pot)			\
-	    po/doc/po4a.cfg
+	    $(srcdir)/po/doc/po4a.cfg
 	-sed -i "s|guix-cookbook\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp"
 	-$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command)
 	-mv "$@.tmp" "$@"
@@ -138,10 +138,10 @@ $(srcdir)/%D%/guix-cookbook.%.texi: po/doc/guix-cookbook.%.po guix/build/po.go
 $(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po guix/build/po.go
 	-$(AM_V_PO4A)$(PO4A) --no-update			\
 	    --variable localized="$@.tmp"			\
-	    --variable master="%D%/contributing.texi"		\
+	    --variable master="$(srcdir)/%D%/contributing.texi"		\
 	    --variable po="$<"					\
 	    --variable pot=$(dummy_pot)			\
-	    po/doc/po4a.cfg
+	    $(srcdir)/po/doc/po4a.cfg
 	-$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command)
 	-mv "$@.tmp" "$@"

@@ -828,6 +828,7 @@ and the maven-build-system."
              (make-regexp* "^gnu/packages/java(-.+|)\\.scm$")
              ;; Match maven.scm and maven-*.scm
              (make-regexp* "^gnu/packages/maven(-.+|)\\.scm$")
+              "gnu/packages/netbeans.scm"
              "guix/build/ant-build-system.scm"
              "guix/build/clojure-build-system.scm"
              "guix/build/clojure-utils.scm"
@@ -844,7 +845,8 @@ and the maven-build-system."
        #:name "JavaScript team"
        #:description
        "JavaScript/Node.js packages, the node build system."
-        #:scope (list "gnu/packages/node-xyz.scm"
+        #:scope (list "gnu/packages/javascript.scm"
+                      "gnu/packages/node-xyz.scm"
                      "gnu/packages/node.scm"
                      "guix/build-system/node.scm"
                      "guix/build/node-build-system.scm"
@@ -1637,7 +1639,7 @@ the \"texlive\" importer."
 (define-member (person "Thanos Apollo"
                       "public@thanosapollo.org"
                       "thanosapollo")
-  vcs)
+  vcs emacs)

 (define-member (person "Ashish SHUKLA"
                       "ashish.is@lostca.se"
@@ -1659,6 +1661,11 @@ the \"texlive\" importer."
                       "tok")
  electronics)

+(define-member (person "gemmaro"
+                       "gemmaro.dev@gmail.com"
+                       "gemmaro")
+  ruby)
+

 (define (find-team name)
  (or (hash-ref %teams (string->symbol name))
@@ -1226,10 +1226,12 @@ file name or an nfs-root containing ':/')."

  (match spec
    ((? string?)
-     (if (string-prefix? "/dev/" spec)
+     (if (string-match "^/dev/[a-zA-Z0-9]+$" spec)
         ;; Nothing to do, but wait until SPEC shows up.
         (resolve device-exists? spec identity)
-         spec)) ; do not resolve NFS / CIFS / tmpfs devices
+         ;; Do not resolve NFS / CIFS / tmpfs devices
+         ;; or bcachefs multi-device specifications.
+         spec))
    ((? file-system-label?)
     ;; Resolve the label.
     (resolve find-partition-by-label
@@ -445,10 +445,14 @@ load path must be adjusted as needed."
          ;; Behave like an init process: create a sub-process that calls
          ;; THUNK, and wait for child processes.  Furthermore, forward
          ;; RELAYED-SIGNALS to the child process.
-          (match (primitive-fork)
-            (0
+          ;; We presently use `safe-clone` here due to a bug in the interaction
+          ;; between Guix and `primitive-fork` in Guile 3.0.11:
+          ;; https://codeberg.org/guix/guix/issues/7690#issuecomment-12744123
+          (safe-clone
+            SIGCHLD
+            (lambda ()
             (call-with-clean-exit thunk))
-            (pid
+            (lambda (pid)
             (install-signal-handlers pid)
             (let loop ()
               (match (wait-child-process)
@@ -57,7 +57,7 @@
 # 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-2026 Zheng Junjie <z572@z572.online>
 # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
 # Copyright © 2023 Andy Tai <atai@atai.org>
 # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
@@ -502,6 +502,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/myrddin.scm			\
  %D%/packages/ncdu.scm				\
  %D%/packages/ncurses.scm			\
+  %D%/packages/netbeans.scm			\
  %D%/packages/netpbm.scm			\
  %D%/packages/nettle.scm			\
  %D%/packages/networking.scm			\
@@ -1093,6 +1094,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/catdoc-CVE-2017-11110.patch		\
  %D%/packages/patches/chez-irregex-import-cond-expand.patch	\
  %D%/packages/patches/chez-scheme-bin-sh.patch			\
+  %D%/packages/patches/cianna-remove-error-for-missing-cuda.patch		\
  %D%/packages/patches/circos-remove-findbin.patch		\
  %D%/packages/patches/cdparanoia-fpic.patch			\
  %D%/packages/patches/cdrkit-libre-cross-compile.patch	\
@@ -1178,6 +1180,7 @@ dist_patch_DATA =						\
  %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/cvc5-symfpu-compatibility.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	\
@@ -1240,7 +1243,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-treelib-remove-python2-compat.patch	\
  %D%/packages/patches/elm-offline-package-registry.patch	\
  %D%/packages/patches/elm-reactor-static-files.patch		\
-  %D%/packages/patches/emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch	\
+  %D%/packages/patches/emacs-agent-shell-fix-tests.patch        \
  %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
  %D%/packages/patches/emacs-disable-jit-compilation.patch			\
  %D%/packages/patches/emacs-doc-toc-shell-commands.patch	\
@@ -1585,8 +1588,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/gtk2-theme-paths.patch			\
  %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch	\
  %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
+  %D%/packages/patches/gtk3-treeview-test-fix.patch             \
  %D%/packages/patches/gtk-doc-respect-xml-catalog.patch	\
-  %D%/packages/patches/gtk-doc-mkhtml-test-fix.patch	\
+  %D%/packages/patches/gtk-doc-mkhtml-test-fix.patch	        \
+  %D%/packages/patches/gtk4-demo-reproducible.patch             \
+  %D%/packages/patches/gtk4-needs-udmabuf.patch                 \
  %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch    	\
  %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
  %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
@@ -1675,6 +1681,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/java-commons-collections-fix-java8.patch \
  %D%/packages/patches/java-guava-remove-annotation-deps.patch \
  %D%/packages/patches/java-jeromq-fix-tests.patch		\
+  %D%/packages/patches/java-jtidy-remove-xerces-dependency.patch	\
  %D%/packages/patches/java-openjfx-build-jdk_version.patch     \
  %D%/packages/patches/java-powermock-fix-java-files.patch		\
  %D%/packages/patches/java-simple-xml-fix-tests.patch		\
@@ -1683,6 +1690,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/java-xerces-build_dont_unzip.patch	\
  %D%/packages/patches/java-xerces-xjavac_taskdef.patch	\
  %D%/packages/patches/jbr-17-xcursor-no-dynamic.patch	\
+  %D%/packages/patches/jbr-25-wayland-drag-icon.patch	\
+  %D%/packages/patches/jbr-25-wayland-intra-jvm-dnd.patch	\
  %D%/packages/patches/jdk-currency-time-bomb.patch		\
  %D%/packages/patches/jdk-currency-time-bomb2.patch		\
  %D%/packages/patches/jfsutils-add-sysmacros.patch		\
@@ -1713,7 +1722,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
  %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch        \
  %D%/packages/patches/libretranslate-use-flasgger.patch	\
-  %D%/packages/patches/librewolf-150.0-encoding_rs-rust-fix.patch       \
  %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch       \
  %D%/packages/patches/librewolf-compare-paths.patch		\
  %D%/packages/patches/librewolf-neuter-locale-download.patch	\
@@ -1908,6 +1916,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/mcrypt-CVE-2012-4527.patch			\
  %D%/packages/patches/mono-msbuild-15.7.179-fix-build.patch	\
  %D%/packages/patches/mono-msbuild-15.7.179-fix-resources.patch	\
+  %D%/packages/patches/mozjs-xp-win.patch                       \
  %D%/packages/patches/libmemcached-build-with-gcc7.patch	\
  %D%/packages/patches/libmhash-hmac-fix-uaf.patch		\
  %D%/packages/patches/libmodbus-disable-networking-test.patch \
@@ -1920,6 +1929,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/mediasdk-gcc-14.patch			\
  %D%/packages/patches/memtest86+-build-reproducibly.patch	\
  %D%/packages/patches/mercurial-hg-extension-path.patch	\
+  %D%/packages/patches/meson-keep-rpath-vicinity.patch		\
+  %D%/packages/patches/meson-gir-fallback-path.patch	        \
  %D%/packages/patches/mhash-keygen-test-segfault.patch		\
  %D%/packages/patches/mia-fix-boost-headers.patch		\
  %D%/packages/patches/mia-gcc11.patch				\
@@ -1975,6 +1986,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/netcdf-date-time.patch			\
  %D%/packages/patches/netdde-build-fix.patch			\
  %D%/packages/patches/netdde-csum.patch			\
+  %D%/packages/patches/java-apache-xml-commons-resolver-1.2-netbeans.patch \
+  %D%/packages/patches/java-simplevalidation-1.14.1.patch	\
+  %D%/packages/patches/netbeans-25-nativeexecution-paths.patch \
+  %D%/packages/patches/netbeans-25-terminal-no-login-shell.patch \
+  %D%/packages/patches/netbeans-25-source-only-build.patch	\
  %D%/packages/patches/netpbm-CVE-2017-2586.patch		\
  %D%/packages/patches/netpbm-CVE-2017-2587.patch		\
  %D%/packages/patches/netsurf-message-timestamp.patch		\
@@ -2069,6 +2085,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/open-zwave-hidapi.patch			\
  %D%/packages/patches/opusfile-CVE-2022-47021.patch		\
  %D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
+  %D%/packages/patches/orca-fix-gst-init-check-call.patch \
  %D%/packages/patches/orpheus-cast-errors-and-includes.patch	\
  %D%/packages/patches/ots-no-include-missing-file.patch	\
  %D%/packages/patches/owncloud-disable-updatecheck.patch	\
@@ -2171,6 +2188,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/perl-www-curl-remove-symbol.patch	\
  %D%/packages/patches/perl-xml-libxml-fix-function-prototypes.patch	\
  %D%/packages/patches/phoronix-test-suite-fsdg.patch		\
+  %D%/packages/patches/php-01-fix-expired-certificate.patch	\
+  %D%/packages/patches/php-02-fix-sni-tests.patch		\
  %D%/packages/patches/picprog-non-intel-support.patch		\
  %D%/packages/patches/pidgin-add-search-path.patch		\
  %D%/packages/patches/pinball-system-ltdl.patch		\
@@ -2274,8 +2293,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
  %D%/packages/patches/qtscript-disable-tests.patch		\
  %D%/packages/patches/quagga-reproducible-build.patch          \
-  %D%/packages/patches/quickjs-ng-64-bits-precision-on-i686.patch	\
-  %D%/packages/patches/quickjs-ng-fix-atomics.pause-on-32-bit.patch	\
  %D%/packages/patches/quilt-grep-compat.patch 			\
  %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch 	\
  %D%/packages/patches/qtwayland-update-wayland-xml.patch	\
@@ -2349,8 +2366,16 @@ dist_patch_DATA =						\
  %D%/packages/patches/renpy-fix-integer-slots.patch			\
  %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch	\
  %D%/packages/patches/rdkit-unbundle-external-dependencies.patch	\
+  %D%/packages/patches/r-biostrings-r4.6.0-compat.patch		\
+  %D%/packages/patches/r-h5mread-0001-h5mread-1.3.2-Get-rid-of-non-API-calls-to-R.patch \
  %D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch	\
+  %D%/packages/patches/r-mscoreutils-0001-fix-non-API-call-to-R-SETLENGTH-by-using-lengthgets.patch \
+  %D%/packages/patches/r-rsamtools-r-4.6.0-compat.patch		\
+  %D%/packages/patches/r-snpstats-0001-fixed-non-API-except-for-IS_S4_OBJECT.patch \
+  %D%/packages/patches/r-snpstats-0002-fixed-IS_S4_OBJECT.patch \
  %D%/packages/patches/r-sapa-lapack.patch			\
+  %D%/packages/patches/r-shortread-0001-ShortRead-1.69.3-Get-rid-of-non-API-calls-to-R.patch \
+  %D%/packages/patches/r-sparsearray-r-4.6.0-compat.patch	\
  %D%/packages/patches/ripperx-missing-file.patch		\
  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
  %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch	\
@@ -2400,6 +2425,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/rust-codex-0.120.0-connectors-cache-test-race.patch	\
  %D%/packages/patches/rust-codex-0.120.0-remove-libwebrtc.patch	\
  %D%/packages/patches/rust-codex-0.120.0-test-timeout.patch	\
+  %D%/packages/patches/rust-codex-0.124.0-code-mode-stub-toolname.patch	\
+  %D%/packages/patches/rust-codex-0.124.0-remove-patch-sections.patch	\
+  %D%/packages/patches/rust-librocksdb-sys-unbundled-sources.patch	\
  %D%/packages/patches/rust-ring-0.17-ring-core.patch		\
  %D%/packages/patches/rw-igraph-0.10.patch			\
  %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch	\
@@ -2595,9 +2623,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/wcstools-extend-makefiles.patch	\
  %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch	\
  %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch	\
+  %D%/packages/patches/webrtc-audio-processing-abseil-cpp.patch	\
  %D%/packages/patches/webrtc-audio-processing-big-endian.patch	\
-  %D%/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch \
-  %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch	\
+  %D%/packages/patches/webrtc-audio-processing-gcc-14.patch	\
  %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch	\
  %D%/packages/patches/wmctrl-64-fix.patch			\
  %D%/packages/patches/wmfire-dont-inline-draw-fire.patch	\
@@ -202,7 +202,7 @@ Have you run 'guix archive --generate-key'?")
  (build-locally? hetzner-configuration-build-locally? ; boolean
                  (default #t))
  (delete? hetzner-configuration-delete? ; boolean
-           (default #f))
+           (default #t))
  (labels hetzner-configuration-labels ; list of strings
          (default '()))
  (location hetzner-configuration-location ; #f | string
@@ -395,9 +395,7 @@ Available locations:~%~%~a~%~%For more details, see: ~a")
                                       (type ,root-fs-type))
                                     %base-file-systems))))
       (services
-        ;; guix 1.4.0 does not have dhcpcd-service-type,
-        ;; so we use dhcp-client-service-type here.
-        (cons* (service dhcp-client-service-type)
+        (cons* (service dhcpcd-service-type)
               (service openssh-service-type
                        (openssh-configuration
                         (openssh openssh-sans-x)
@@ -592,6 +590,14 @@ mkdir -p /gnu/store
 mount --bind /mnt/tmp/gnu/store /gnu/store

 wget -O /tmp/guix-install.sh https://guix.gnu.org/guix-install.sh
+
+# Modify the install script to point the systemd unit of the /gnu/store
+# mountpoint to the same /mnt/tmp/gnu/store which was introduced above.
+store_fix=\"sed -i 's#Where=/gnu/store#Where=/mnt/tmp/gnu/store#'
+ ~~root/.config/guix/current/lib/systemd/system/gnu-store.mount\"
+sed -i \"s@install_unit gnu-store.mount\"\\
+\"@$(printf \"%q \" $store_fix)\\ninstall_unit gnu-store.mount@\" /tmp/guix-install.sh
+
 chmod +x /tmp/guix-install.sh
 set +o pipefail # avoid hangup on 'yes' killing this script
 yes '' | /tmp/guix-install.sh
@@ -185,7 +185,7 @@ terminals.")
    (native-inputs
     (append
       (list clisp
-             python-cython
+             python-cython-0 ;; See https://bugzilla.redhat.com/show_bug.cgi?id=2231865
             doxygen
             gettext-minimal)
       ;; icedtea doesn't build reliably on all architectures.
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2015-2018, 2020-2023 Eric Bavier <bavier@posteo.net>
@@ -1158,7 +1158,7 @@ on memory usage on GNU/Linux systems.")
 (define-public htop
  (package
    (name "htop")
-    (version "3.5.0")
+    (version "3.5.1")
    (source
     (origin
       (method git-fetch)
@@ -1166,7 +1166,7 @@ on memory usage on GNU/Linux systems.")
             (url "https://github.com/htop-dev/htop")
             (commit version)))
       (sha256
-        (base32 "1r07ri0dl9xz0jn1hc2g8q3l0q4clvnxs05yagpzsz0zigp4flj5"))
+        (base32 "187gyj081n6qsidll5wdri3jkr4m2i4m461z3xv03y342f5yj3lv"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -3751,59 +3751,68 @@ summarizes network bandwidth by process and remote host.")
 (define-public munge
  (package
    (name "munge")
-    (version "0.5.14")
+    (version "0.5.18")
    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/dun/munge/releases/"
-                                  "download/munge-" version "/munge-"
-                                  version ".tar.xz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/dun/munge")
+                     (commit (string-append "munge-" version))))
+              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0h06sghb4rqvv1ywyd6mzsmbcgh712v6ygrff0gzm440y4ca41k6"))
+                "1b7gm680dlvmgvj9vxy7n0cqmnv1rl9n4563vasxdxx54f78j30s"))
              (modules '((guix build utils)))
              (snippet
-               '(begin
-                  ;; Don't insist on write access to /var.
-                  (substitute* "src/etc/Makefile.in"
-                    (("\\$\\(INSTALL\\)(.*)localstatedir" _ middle)
-                     (string-append "-$(INSTALL)" middle "localstatedir"))
-                    (("\\$\\(MKDIR_P\\) .*(local|run)statedir.*")
-                     ""))
-                  #t))))
+               ;; Don't insist on write access to /var.
+               #~(substitute* "src/etc/Makefile.am"
+                   (("\\$\\(MKDIR_P\\) .*(local|run)statedir.*" all)
+                    (string-append ": " all))))))
    (inputs
     (list openssl libgcrypt))
+    (native-inputs
+     (list autoconf
+           automake
+           libtool
+           procps))                               ;for tests
    (build-system gnu-build-system)
    (arguments
-     `(#:configure-flags
-       (list "--localstatedir=/var"
-             (string-append "--with-pkgconfigdir="
-                            (assoc-ref %outputs "out") "/lib/pkgconfig")
-             (string-append "--with-libgcrypt-prefix="
-                            (assoc-ref %build-inputs "libgcrypt"))
-             ,@(if (%current-target-system)
-                 ;; Assume yes on pipes when cross compiling.
-                 `("ac_cv_file__dev_spx=yes"
-                   "x_ac_cv_check_fifo_recvfd=yes")
-                 '()))
-       #:phases
-       (modify-phases %standard-phases
-         ;; XXX Many test series fail.  Some might be fixable, others do no-no
-         ;; things like invoking ‘sudo’.
-         (add-after 'unpack 'skip-failing-tests
-           (lambda _
-             (for-each (lambda (test)
-                         (substitute* "t/Makefile.in"
-                           (((string-append test "\\.t ")) "")))
-                       (list "0100-munged-lock"
-                             "0010-basic"
-                             "0011-munged-cmdline"
-                             "0012-munge-cmdline"
-                             "0013-unmunge-cmdline"
-                             "0101-munged-security-socket"
-                             "0102-munged-security-keyfile"
-                             "0103-munged-security-logfile"
-                             "0110-munged-origin-addr"))
-             #t)))))
+     (list #:configure-flags
+           #~(list "--localstatedir=/var"
+                   "--disable-static"
+                   #$@(if (%current-target-system)
+                          ;; Assume yes on pipes when cross compiling.
+                          `("ac_cv_file__dev_spx=yes"
+                            "x_ac_cv_check_fifo_recvfd=yes")
+                          '())
+
+                   ;; The '.pc' file is not installed when omitting this flag.
+                   (string-append "--with-pkgconfigdir="
+                                  #$output "/lib/pkgconfig"))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'bootstrap 'pre-bootstrap
+                 (lambda _
+                   (for-each patch-shebang (find-files "build-aux"))))
+               (add-after 'unpack 'skip-failing-tests
+                 (lambda _
+                   ;; Pass '--force' to 'munged'; without it, it fails with "Socket
+                   ;; is inaccessible" due to the build directory not being
+                   ;; world-readable.
+                   (substitute* "tests/sharness.d/03-munged.sh"
+                     (("--group-update-time=-1" all)
+                      (string-append all " --force")))
+
+                   ;; The tests below invoke 'sudo' or have special expectations
+                   ;; about network interfaces.
+                   (for-each (lambda (test)
+                               (substitute* "tests/Makefile.am"
+                                 (((string-append test "\\.t "))
+                                  "")))
+                             (list "0100-munged-lock"
+                                   "0101-munged-security-socket"
+                                   "0102-munged-security-keyfile"
+                                   "0103-munged-security-logfile"
+                                   "0110-munged-origin-addr")))))))
    (home-page "https://dun.github.io/munge/")
    (synopsis "Cluster computing authentication service")
    (description
@@ -7043,7 +7052,7 @@ network, which causes enabled computers to power on.")
 (define-public witr
  (package
    (name "witr")
-    (version "0.1.7")
+    (version "0.3.1")
    (source
     (origin
       (method git-fetch)
@@ -7052,7 +7061,7 @@ network, which causes enabled computers to power on.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "18xx01lxd5j019gy9jmpms3awv4snlr028w01bfkyfid6hlwxbq2"))))
+        (base32 "03v9n4mdvqm0knqjl4s64321i5clqpmlrlkkdb87glzb9p28sg00"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -458,7 +458,7 @@ precision.")
    (inputs
     ;; TODO: Unbundle "libmicropython.a".
     (list ao
-           fltk-1.3
+           fltk
           glpk
           gmp
           gsl
@@ -238,12 +238,12 @@ contains the graphical user interface for synfig.")
             (when tests?
               (invoke "./tests")))))))
    (native-inputs
-     (list gettext-minimal
-           `(,glib "bin")
-           nasm
-           perl
-           pkg-config
-           python-wrapper))
+     (cons* gettext-minimal
+            `(,glib "bin")
+            perl
+            pkg-config
+            python-wrapper
+            (maybe-nasm)))
    (inputs
     (list cairo
           curl
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016, 2020, 2021, 2025 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2020, 2021, 2025, 2026 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
 ;;; Copyright © 2019, 2022, 2024 Andy Tai <atai@atai.org>
@@ -43,6 +43,7 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix gexp)
+  #:use-module (guix utils)
  #:use-module (gnu packages)
  #:use-module (gnu packages admin)
  #:use-module (gnu packages autotools)
@@ -248,6 +249,16 @@ complex.  It supports all currently known x86 architectural extensions, and
 has strong support for macros.")
    (license license:bsd-2)))

+(define* (maybe-nasm #:optional
+                     (system (or (%current-target-system)
+                                 (%current-system))))
+  ;; For some packages nasm is only needed when compiling to/for x86/x86_64.
+  (if (target-x86? system)
+      (list nasm)
+      '()))
+
+(export maybe-nasm)
+
 (define-public yasm
  (package
    (name "yasm")
@@ -11,7 +11,7 @@
 ;;; Copyright © 2016–2023 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2020, 2024 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2018 okapi <okapi@firemail.cc>
-;;; Copyright © 2018, 2020, 2022-2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2018, 2020, 2022-2026 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2018 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2018, 2019, 2022 Marius Bakke <marius@gnu.org>
@@ -51,7 +51,7 @@
 ;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
 ;;; Copyright © 2024 Roman Scherer <roman@burningswell.com>
 ;;; Copyright © 2024 Sughosha <sughosha@disroot.org>
-;;; Copyright © 2025 Junker <dk@junkeria.club>
+;;; Copyright © 2025, 2026 Junker <dk@junkeria.club>
 ;;; Copyright © 2025 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright © 2025 Kjartan Oli Agustsson <kjartanoli@outlook.com>
@@ -127,6 +127,7 @@
  #:use-module (gnu packages linphone)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages logging)
  #:use-module (gnu packages machine-learning)
  #:use-module (gnu packages man)
  #:use-module (gnu packages maths)
@@ -194,6 +195,45 @@
  #:use-module (srfi srfi-26)
  #:use-module (ice-9 match))

+(define-public adplug
+  (package
+    (name "adplug")
+    (version "2.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/adplug/adplug")
+                    (commit (string-append "adplug-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0l31ya42g3q7ry2m0y5djgjb9ax8ciy8jn86252vdjkjswwqgscd"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "-DBUILD_SHARED_LIBS=ON")
+           #:modules
+           '((guix build cmake-build-system)
+             (guix build utils)
+             (srfi srfi-26))                 ;for cute
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-headers
+                 (lambda _
+                   (for-each (cute install-file <>
+                                  (string-append #$output "/include/adplug"))
+                             (find-files "../source/src" "\\.h$")))))))
+    (propagated-inputs
+     (list libbinio))
+    (home-page "https://adplug.github.io/")
+    (synopsis "AdLib sound player library")
+    (description
+     "AdPlug is a hardware independent AdLib sound player library, mainly
+written in C++.  AdPlug plays sound data, originally created for the AdLib
+(OPL2/3) audio board, on top of an OPL2/3 emulator or by using the real
+hardware.  No OPL2/3 chips are required for playback.")
+    (license license:lgpl2.1+)))
+
 (define-public opensles
  (package
    (name "opensles")
@@ -363,7 +403,7 @@ displays a histogram of the roundtrip time jitter.")
 (define-public webrtc-audio-processing
  (package
    (name "webrtc-audio-processing")
-    (version "1.3")
+    (version "2.1")
    (source
     (origin
       (method url-fetch)
@@ -371,30 +411,14 @@ displays a histogram of the roundtrip time jitter.")
        (string-append "http://freedesktop.org/software/pulseaudio/"
                       name "/" name "-" version ".tar.gz"))
       (sha256
-        (base32 "0xfvq5lxg612vfzk3zk6896zcb4cgrrb7fq76w9h40magz0jymcm"))))
+        (base32 "0lrjzhshwj1rkh4fxh7sq2dkkfimlyjs2ha7s3ribsh2dnc6ps1m"))
+       (patches (search-patches "webrtc-audio-processing-abseil-cpp.patch"
+                                "webrtc-audio-processing-gcc-14.patch"))))
    (build-system meson-build-system)
    (arguments
     (list #:configure-flags (if (target-x86-32?)
                                 #~(list "-Dc_args=-DPFFFT_SIMD_DISABLE")
-                                 #~'())
-           #:phases
-           (if (or (target-x86-32?) (target-powerpc?))
-               #~(modify-phases %standard-phases
-                   (add-after 'unpack 'apply-patches
-                     (lambda _
-                       (define (patch file)
-                         (invoke "patch" "-p1" "--force" "-i" file))
-
-                       ;; https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
-                       ;; TODO: Move to the 'patches' field of the origin on
-                       ;; the next rebuild.
-                       (patch #$(local-file
-                                 (search-patch
-                                  "webrtc-audio-processing-byte-order-pointer-size.patch")))
-                       (patch #$(local-file
-                                 (search-patch
-                                  "webrtc-audio-processing-x86-no-sse.patch"))))))
-               #~%standard-phases)))
+                                 #~'())))
    (native-inputs (list pkg-config))
    (inputs (list abseil-cpp))
    (synopsis "WebRTC's Audio Processing Library")
@@ -1210,7 +1234,7 @@ PulseAudio clients, featuring:
 (define-public ardour
  (package
    (name "ardour")
-    (version "9.1")
+    (version "9.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1227,7 +1251,7 @@ PulseAudio clients, featuring:
 namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
              (sha256
               (base32
-                "00bramm8dq0ihr376n7l9rg0mjzxmzw6lxvsbsdlrdsimfwsy16p"))
+                "14s6cq3x7l7b682ah9k8cdr6plfirlgm882dc2nm51lxwl91zcfd"))
              (file-name (git-file-name name version))))
    (build-system waf-build-system)
    (arguments
@@ -4465,6 +4489,33 @@ This includes device enumeration and initialization, file loading, and
 streaming.")
    (license license:expat)))

+(define-public wp-notifyd
+  (package
+    (name "wp-notifyd")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/LDAP/wp-notifyd")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1nkndz0li15maf0dc9x631p0dr8085wzz5358552wljv7chywrza"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:tests? #f)) ;there are no tests
+    (inputs (list libnotify
+                  wireplumber-minimal
+                  pipewire
+                  spdlog))
+    (native-inputs (list pkg-config))
+    (home-page "https://github.com/LDAP/wp-notifyd")
+    (synopsis "Notification daemon for Wireplumber")
+    (description "@command{wp-notifyd} is a lightweight notification daemon for
+@dfn{WirePlumber} (the session and policy manager for PipeWire).")
+    (license license:expat)))
+
 (define-public pa-notify
  (package
    (name "pa-notify")
@@ -4869,6 +4920,42 @@ using Guix System.")
    ;; GNU Library (not Lesser) General Public License.
    (license license:lgpl2.0+)))

+(define-public hiir
+  (let ((commit "4a9a1e67fa6f8ce7688e1c0c8a2b017cecd206a3")
+        (revision "0"))
+    (package
+      (name "hiir")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/LostRobotMusic/hiir")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1wzlg0di768mzcik6fij4pd6dnpmbw8q236h478c057d10qfp44g"))))
+      (build-system copy-build-system)
+      (arguments
+       (list
+        #:install-plan
+        #~`(("." "/include/hiir"))))
+      (home-page "https://github.com/LostRobotMusic/hiir")
+      (synopsis "Header-only version of Laurent de Soras's HIIR 1.40 library")
+      (description
+       "This package provides a header-only version of the
+@uref{http://ldesoras.free.fr/prod.html#src_hiir, HIIR library by Laurent De
+Soras}, updated to version 1.40.  HIIR is a C++ library for changing the
+sampling rate of a signal by a factor two, in both directions (upsampling and
+downsampling), obtaining two signals with a π/2 phase difference (Hilbert
+transform).  It is made of a two-path polyphase IIR filter, implemented with
+FPU, 3DNow!, SSE, SSE2, AVX, AVX-512 and NEON instruction sets.
+
+This package contains the same as the original library, except with the
+contents of one source file moved into a header file (and set as inline) to
+make the library header-only, and with the test folder removed.")
+      (license license:wtfpl2))))
+
 (define-public redumper
  (package
    (name "redumper")
@@ -7265,6 +7352,7 @@ as is the case with audio plugins.")
                                       (find-files "bin")))))))))
    (inputs
     (list alsa-lib
+           bash-minimal
           ffmpeg
           fluidsynth
           file
@@ -7322,8 +7410,8 @@ default and preferred audio driver but also supports native drivers like ALSA.")

 ;;; This package variant tracks the latest in-development 2.6 release.
 (define-public carla-2.6
-  (let ((commit "aa400535b31c67f4b6c1b28e6e20e4d4f82111a3")
-        (revision "0"))
+  (let ((commit "294a80145e39c0755ab9073d90fd8b9524fbfc84")
+        (revision "1"))
    (package
      (inherit carla)
      (name "carla")
@@ -7337,7 +7425,12 @@ default and preferred audio driver but also supports native drivers like ALSA.")
           (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0cnj2sgr60f5h6wdfmihc214wf3n74686sipl3iyzmylqrcyhbjn")))))))
+          (base32 "053yfwf9l9vqvq95c354by6nm8ym0wgkv3fr1434x5w9n1344z0z"))))
+      (inputs
+       (modify-inputs (package-inputs carla)
+         (replace "python-pyqt" python-pyqt-6)
+         (replace "qtbase" qtbase)
+         (replace "qtwayland" qtwayland))))))

 ;; This source is a fork of vst3sdk with the documentation and VSTGUI
 ;; submodules removed and a dummy `meson.build` file that just lists all
@@ -37,8 +37,6 @@
  #:use-module (gnu packages elf)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages readline)
-  #:use-module (gnu packages ruby-check)
-  #:use-module (gnu packages ruby-xyz)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages libffi)
@@ -55,7 +53,6 @@
  #:use-module (guix store)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system ruby)
  #:use-module (guix build-system trivial)
  #:autoload   (guix gnupg) (gnupg-verify*)
  #:autoload   (guix base32) (bytevector->nix-base32-string)
@@ -516,46 +513,6 @@ function interface (FFI) directly in your shell.  In other words, it allows
 you to call routines in shared libraries from within Bash.")
    (license license:expat)))

-(define-public bashly
-  (package
-    (name "bashly")
-    (version "1.3.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (rubygems-uri "bashly" version))
-       (sha256
-        (base32 "17msjzca5ifx8biimdjps655w51yc82d5ys9hwn749bi2f3n8mcz"))))
-    (build-system ruby-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "rspec" "-c" "spec")))))))
-    (native-inputs (list ruby-rspec))
-    (propagated-inputs (list ruby-colsole
-                             ruby-completely
-                             ruby-filewatcher
-                             ruby-gtx
-                             ruby-logger
-                             ruby-lp
-                             ruby-mister-bin
-                             ruby-ostruct
-                             ruby-requires
-                             ruby-tty-markdown))
-    (synopsis
-     "Create feature-rich Bash scrips using simple YAML configuration")
-    (description
-     "Bashly is a CLI for generating feature-rich Bash command line
-tools.  Bashly lets you focus on your specific code, without worrying about
-command line argument parsing, usage texts, error messages and other functions
-that are usually handled by a framework in other programming languages.")
-    (home-page "https://bashly.dev/")
-    (license license:expat)))
-
 (define-public blesh
  (package
    (name "blesh")
@@ -14,6 +14,7 @@
 ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2026 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2023 Advanced Micro Devices, Inc.
 ;;;
 ;;; This file is part of GNU Guix.
@@ -41,6 +42,7 @@
  #:use-module (guix amd-gpu)
  #:use-module (guix search-paths)
  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system qt)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
@@ -730,7 +732,7 @@ and options.  With careful benchmarking, different hardware can be compared.")
 (define-public kdiskmark
  (package
    (name "kdiskmark")
-    (version "3.1.4")
+    (version "3.2.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -739,14 +741,13 @@ and options.  With careful benchmarking, different hardware can be compared.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1x8vd6swmf0i7f6m6wl2154n6plx8jkmcqfq6zxbdy255f1da74c"))))
-    (build-system cmake-build-system)
+                "161yyy4fcy5bnzhbcd7p90nlcslcsfp7n3m3bz9bygch7bdjw46g"))))
+    (build-system qt-build-system)
    (arguments
     (list
+      #:qtbase qtbase
      #:configure-flags
-      ;; Drop runtime dependency on KDE's KFAuth.
-      #~(list "-DPERFORM_PAGECACHE_CLEARING_USING_KF5AUTH=no"
-              (string-append "-DPOLKITQT-1_INSTALL_DIR=" #$output))
+      #~(list (string-append "-DPOLKITQT-1_INSTALL_DIR=" #$output))
      #:tests? #f                       ;no test suite
      #:phases
      #~(modify-phases %standard-phases
@@ -759,10 +760,10 @@ and options.  With careful benchmarking, different hardware can be compared.")
            (lambda _
              (rmdir "src/singleapplication")
              (symlink #$(package-source
-                          (this-package-input "single-application-qt5"))
+                          (this-package-input "single-application"))
                       "src/singleapplication"))))))
-    (native-inputs (list extra-cmake-modules qttools-5))
-    (inputs (list fio polkit-qt qtbase-5 single-application-qt5))
+    (native-inputs (list extra-cmake-modules qttools))
+    (inputs (list fio polkit-qt6 single-application qtwayland))
    (home-page "https://github.com/JonMagon/KDiskMark")
    (synopsis "Simple disk benchmark tool")
    (description "KDiskMark is an HDD and SSD benchmark tool.  KDiskMark
@@ -913,7 +913,7 @@ suite native in R.")
 (define-public r-bpcells
  (package
    (name "r-bpcells")
-    (version "0.3.0")
+    (version "0.3.1")
    (source
     (origin
       (method git-fetch)
@@ -922,7 +922,7 @@ suite native in R.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))
+        (base32 "0yqgcajq83g25mznwcngaw7pi6vcqxqdnynpgb95yci57k3wrp6j"))
       (modules '((guix build utils)))
       (snippet
        '(delete-file-recursively "r/src/vendor/highway"))))
@@ -931,13 +931,15 @@ suite native in R.")
    (arguments
     (list
      #:phases
-      '(modify-phases %standard-phases
+      `(modify-phases %standard-phases
         (add-after 'unpack 'chdir
-           (lambda _
-             (substitute* "r/configure"
-               (("tools/hwy-test.cpp" m)
-                (string-append m " $HWY_LIBS $HWY_CFLAGS")))
-             (chdir "r"))))))
+           (lambda _ (chdir "r")))
+         ,@(if (target-x86-32?)
+               '((add-after 'chdir 'require-sse2
+                   ;; This avoids falling back to the scalar backend in
+                   ;; highway, which fails to build.
+                   (lambda _ (setenv "CFLAGS" "-msse2"))))
+               '()))))
    (propagated-inputs
     (list r-dplyr
           r-ggplot2
@@ -7649,78 +7651,6 @@ reads at a typical sensitivity of 90-99% relative to BLAST depending on the
 data and settings.")
    (license license:gpl3+)))

-(define-public discrover
-  (package
-    (name "discrover")
-    (version "1.6.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/maaskola/discrover")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "173fwi2vb6a5kp406hm3jj6j7v4whww796f2qcygp4rpvamh307y"))))
-    (build-system cmake-build-system)
-    (arguments
-     `(#:tests? #f                      ; there are no tests
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'set-force-source-date
-           ;; for reproducible dates, texlive needs this to respect
-           ;; SOURCE_DATE_EPOCH
-           (lambda _
-             (setenv "FORCE_SOURCE_DATE" "1")))
-         (add-before 'build 'use-writable-texmfvar
-           ;; Use writable TEXMFVAR to generate fonts.
-           (lambda _
-             (setenv "TEXMFVAR" "/tmp")))
-         (add-after 'unpack 'fix-latex-errors
-           (lambda _
-             (with-fluids ((%default-port-encoding #f))
-               (substitute* "doc/references.bib"
-                 (("\\{S\\}illanp[^,]+,")
-                  "{S}illanp{\\\"a}{\\\"a},")))
-             ;; XXX: I just can't get pdflatex to not complain about these
-             ;; characters.  They end up in the manual via the generated
-             ;; discrover-cli-help.txt.
-             (substitute* "src/hmm/cli.cpp"
-               (("µ") "mu")
-               (("η") "eta")
-               (("≤") "<="))
-             ;; This seems to be a syntax error.
-             (substitute* "doc/discrover-manual.tex"
-               (("theverbbox\\[t\\]") "theverbbox"))))
-         (add-after 'unpack 'add-missing-includes
-           (lambda _
-             (substitute* "src/executioninformation.hpp"
-               (("#define EXECUTIONINFORMATION_HPP" line)
-                (string-append line "\n#include <random>")))
-             (substitute* "src/plasma/fasta.hpp"
-               (("#define FASTA_HPP" line)
-                (string-append line "\n#include <random>"))))))))
-    (inputs
-     (list boost cairo rmath-standalone))
-    (native-inputs
-     (list (texlive-local-tree
-            (list texlive-doi
-                  texlive-etoolbox
-                  texlive-examplep
-                  texlive-forloop
-                  texlive-listofitems
-                  texlive-natbib
-                  texlive-pgf           ;tikz
-                  texlive-readarray
-                  texlive-verbatimbox))
-           imagemagick))
-    (home-page "https://dorina.mdc-berlin.de/public/rajewsky/discrover/")
-    (synopsis "Discover discriminative nucleotide sequence motifs")
-    (description "Discrover is a motif discovery method to find binding sites
-of nucleic acid binding proteins.")
-    (license license:gpl3+)))
-
 (define-public eddylab-squid
  (package
    (name "eddylab-squid")
@@ -328,15 +328,15 @@ with the @uref{https://keepassxc.org, KeePassXC} password manager.")
 (define noscript
  (package
    (name "noscript")
-    (version "13.2.2")
+    (version "13.6.18.1984")
    (source (origin
              (method url-fetch/zipbomb)
              (uri (string-append
-                    "https://noscript.net/download/releases/noscript-" version
-                    ".xpi"))
+                    "https://archive.torproject.org/tor-package-archive/torbrowser/noscript/noscript-"
+                    version ".xpi"))
              (sha256
               (base32
-                "0w2w0a76dk01bkh83mqwgs9ky02rjqk15z5sxg4a6mw0hpr81bpm"))))
+                "0assv8v89hhg302q81vvv7ln3q8k9m6rzjkbprv2j05ghb23kkvm"))))
    (build-system copy-build-system)
    (properties '((addon-id . "{73a6fe31-595d-460b-a920-fcc0f8843232}")))
    (arguments
@@ -427,7 +427,10 @@ files and generates build instructions for the Ninja build system.")
                                  version ".tar.gz"))
              (sha256
               (base32
-                "13a9pj7d2mxgv5gbd78di4pb4w722vjis0vmk38m1vdm95v2f9yd"))))
+                "13a9pj7d2mxgv5gbd78di4pb4w722vjis0vmk38m1vdm95v2f9yd"))
+              (patches
+               (search-patches "meson-gir-fallback-path.patch"
+                               "meson-keep-rpath-vicinity.patch"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1327,25 +1327,6 @@ for the @acronym{AWS,Amazon Web Services} SDK.")
    (home-page "https://github.com/awslabs/aws-c-sdkutils")
    (license license:asl2.0)))

-(define-public pcl
-  (package
-    (name "pcl")
-    (version "1.12")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-              "http://www.xmailserver.org/pcl-" version ".tar.gz"))
-       (sha256
-        (base32
-         "06ly65rq4iyj2p4704i215c8y4rgspwl8sxfaifmf4ahfr30bcz7"))))
-    (build-system gnu-build-system)
-    (home-page "http://www.xmailserver.org/libpcl.html")
-    (synopsis "Portable Coroutine Library")
-    (description "The @acronym{PCL, Portable Coroutine Library} implements the
-low level functionality for coroutines.")
-    (license license:gpl2+)))
-
 (define-public aws-c-http
  (package
    (name "aws-c-http")
@@ -43,6 +43,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system meson)
  #:use-module (guix gexp)
  #:use-module (guix utils)
  #:use-module (gnu packages)
@@ -1000,18 +1001,17 @@ Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
 (define-public libudfread
  (package
    (name "libudfread")
-    (version "1.1.2")
+    (version "1.2.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
                    "https://download.videolan.org/pub/videolan/libudfread/"
-                    name "-" version ".tar.bz2"))
+                    name "-" version ".tar.xz"))
              (sha256
               (base32
-                "05c943ymw94nzjxf7v102916frqk7icgw4gb244wx23jn8cnz56m"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list automake autoconf libtool pkg-config))
+                "03q5b1wm90vygx4rf4mzzrf0yhvhbvp72nyhv63pgz7v9jypqixv"))))
+    (build-system meson-build-system)
+    (native-inputs (list pkg-config))
    (home-page "https://code.videolan.org/videolan/libudfread")
    (synopsis "C library to read UDF file systems")
    (description "@code{libudfread} is a C library for reading
@@ -400,7 +400,7 @@
  ;; run the Blink performance tests, just remove everything to save ~70MiB.
  '("third_party/blink/perf_tests"))

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

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

 (define %debian-origin
  (origin
@@ -425,7 +425,7 @@
                                ((_ version) version))))
    (sha256
     (base32
-      "0gqarll08i7rcs1amapciv263xvzglc8p44ikavq3xd12yyvcd98"))))
+      "04lqbclkvn9nsksgjpjilh78a8y17mwwq4pmhr6h8gvpp2y3bhhc"))))

 (define (origin-file origin file)
  (computed-file
@@ -570,7 +570,7 @@
                                  %chromium-version "-lite.tar.xz"))
              (sha256
               (base32
-                "1salvlw5sykx3zmsbp7cgmf7y8yy6jlgb4b4zswzsbjrprk4jnap"))
+                "1m22whg5n9lw9gqhalm95jwfm45lqp4a7cs3mn3f4n8w0rvr0r5j"))
              (modules '((guix build utils)))
              (snippet (force ungoogled-chromium-snippet))))
    (build-system gnu-build-system)
@@ -596,6 +596,7 @@
              "use_custom_libcxx=false" ; support for this is deprecated and to be removed.
              "optimize_webui=false"
              "webnn_use_tflite=false"
+              "build_tflite_with_xnnpack=false"
              "safe_browsing_use_unrar=false"
              "chrome_pgo_phase=0"
              "use_sysroot=false"
@@ -688,7 +689,7 @@
              "use_gnome_keyring=false" ;deprecated by libsecret
              "use_pulseaudio=true"
              "link_pulseaudio=true"
-              "icu_use_data_file=false"
+              "icu_use_data_file=true"

              ;; VA-API acceleration is currently only supported on x86_64-linux.
              #$@(if (string-prefix? "x86_64" (or (%current-target-system)
@@ -696,6 +697,13 @@
                     '("use_vaapi=true")
                     '())

+              #$@(if (string-prefix? "aarch64" (or (%current-target-system)
+                                                   (%current-system)))
+                     '("use_v4l2_codec=true"
+                       "use_vaapi=false"
+                       "use_av1_hw_decoder=true")
+                     '())
+
              ;; Do not artificially restrict formats supported by system ffmpeg.
              "proprietary_codecs=true"
              "ffmpeg_branding=\"Chrome\""
@@ -769,12 +777,7 @@
                   (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
+          (add-after 'patch-stuff '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
@@ -892,6 +895,7 @@
                                       "resources.pak"
                                       "v8_context_snapshot.bin"
                                       "chrome_crashpad_handler"
+                                       "icudtl.dat"

                                       ;; Swiftshader ICD.
                                       "libvk_swiftshader.so"
@@ -914,9 +918,11 @@

                (substitute* '("chrome/app/resources/manpage.1.in"
                               "chrome/installer/linux/common/desktop.template")
-                  (("@@MENUNAME@@") "Chromium")
-                  (("@@PACKAGE@@") "chromium")
-                  (("/usr/bin/@@USR_BIN_SYMLINK_NAME@@") exe))
+                  (("@@MENUNAME") "Chromium")
+                  (("@@PACKAGE") "chromium")
+                  (("/usr/bin/@@usr_bin_symlink_name") exe)
+                  (("@@uri_scheme") "x-scheme-handler/chromium")
+                  (("@@extra_desktop_entries") ""))

                (mkdir-p man)
                (copy-file "chrome/app/resources/manpage.1.in"
@@ -18,10 +18,10 @@

 ;;; This module is separate from (gnu packages rust-apps) to avoid a
 ;;; circular module dependency: (gnu packages rust-sources), which
-;;; defines rust-codex-0.120.0, transitively loads (gnu packages
+;;; defines rust-codex-0.124.0, transitively loads (gnu packages
 ;;; rust-apps) through its #:use-module chain.  If the codex package
 ;;; lived in rust-apps.scm, loading rust-sources would trigger loading
-;;; rust-apps before rust-codex-0.120.0 is defined, causing an unbound
+;;; rust-apps before rust-codex-0.124.0 is defined, causing an unbound
 ;;; variable error.

 (define-module (gnu packages codex)
@@ -54,14 +54,14 @@
 (define-public codex
  (package
    (name "codex")
-    (version (package-version rust-codex-0.120.0))
+    (version (package-version rust-codex-0.124.0))
    (source
     (origin
-       (inherit (package-source rust-codex-0.120.0))
+       (inherit (package-source rust-codex-0.124.0))
       (patches (search-patches
                 "codex-acp-0.11.1-disable-code-mode.patch"
-                 "rust-codex-0.117.0-remove-patch-sections.patch"
-                 "rust-codex-0.120.0-connectors-cache-test-race.patch"
+                 "rust-codex-0.124.0-code-mode-stub-toolname.patch"
+                 "rust-codex-0.124.0-remove-patch-sections.patch"
                 "rust-codex-0.120.0-remove-libwebrtc.patch"
                 "rust-codex-0.98.0-test-shebangs.patch"
                 "rust-codex-0.120.0-test-timeout.patch"))))
@@ -69,7 +69,12 @@
    (arguments
     (list
      #:install-source? #f
-      #:cargo-install-paths '(list "cli" "exec" "exec-server"
+      ;; exec-server is library-only in 0.124 (no [[bin]] in
+      ;; exec-server/Cargo.toml); cargo install --path exec-server fails
+      ;; with "no packages found with binaries or examples".  Drop it
+      ;; from the install paths -- the library is consumed via the
+      ;; workspace by other binaries here, not installed standalone.
+      #:cargo-install-paths '(list "cli" "exec"
                                   "linux-sandbox" "mcp-server"
                                   "app-server" "tui")
      ;; schema_fixtures_match_generated (upstream fixture is stale:
@@ -317,7 +322,164 @@
                                ;; (chatgpt.com, api.github.com) wait
                                ;; for TCP timeout instead of failing
                                ;; instantly at TLS, eating the budget.
-                                "--skip" "mcp_server_status_list_tools_and_auth_only_skips_slow_inventory_calls")
+                                "--skip" "mcp_server_status_list_tools_and_auth_only_skips_slow_inventory_calls"
+                                ;;; BEGIN Stack overflow in 'current_thread'
+                                ;;; tokio runtime.  The sibling tests in
+                                ;;; tracing_tests.rs use the local helper
+                                ;;; run_current_thread_test_with_stack
+                                ;;; (4 MiB) but this one uses bare
+                                ;;; #[tokio::test] on the 2 MiB default
+                                ;;; test-thread stack, and TurnStart's
+                                ;;; future graph exceeds it.  With
+                                ;;; RUST_MIN_STACK raised the overflow is
+                                ;;; gone but the test then deterministically
+                                ;;; times out waiting for a span tagged
+                                ;;; codex.op = "user_input" on the remote
+                                ;;; trace that upstream never emits on that
+                                ;;; trace in our environment.
+                                "--skip" "turn_start_jsonrpc_span_parents_core_turn_spans"
+                                ;;; END tracing test stack/timeout
+                                ;;; BEGIN The upstream loader resolves the
+                                ;;; MCP OAuth credentials store mode by
+                                ;;; calling
+                                ;;; resolve_mcp_oauth_credentials_store_mode
+                                ;;; with env!("CARGO_PKG_VERSION") -- which
+                                ;;; in the released 0.124.0 tarball is
+                                ;;; "0.124.0".  These fixture tests
+                                ;;; construct the expected Config by
+                                ;;; passing the LOCAL_DEV_BUILD_VERSION
+                                ;;; constant ("0.0.0") to the same
+                                ;;; resolver, and the resolver only returns
+                                ;;; File for "0.0.0" -- Auto otherwise.
+                                ;;; Upstream CI builds from a checkout
+                                ;;; still carrying version = "0.0.0" so the
+                                ;;; tests pass there; they cannot pass
+                                ;;; against a released tag.
+                                "--skip" "test_precedence_fixture_with_gpt3_profile"
+                                "--skip" "test_precedence_fixture_with_gpt5_profile"
+                                "--skip" "test_precedence_fixture_with_o3_profile"
+                                "--skip" "test_precedence_fixture_with_zdr_profile"
+                                ;;; END LOCAL_DEV_BUILD_VERSION fixture mismatch
+                                ;;; BEGIN Verifies that Codex's user-shell
+                                ;;; spawn produces a child where
+                                ;;; CODEX_SANDBOX_NETWORK_DISABLED is unset
+                                ;;; (asserts stdout == "not-set").  We
+                                ;;; deliberately set that env var at the
+                                ;;; check phase to trigger upstream's
+                                ;;; skip_if_no_network! guards; the var then
+                                ;;; leaks into the spawned shell and the
+                                ;;; assertion fails.  The guix skip is a
+                                ;;; direct cost of the network-gate fix --
+                                ;;; trading one broken test for two that
+                                ;;; now skip cleanly.
+                                "--skip" "user_shell_command_does_not_set_network_sandbox_env_var"
+                                ;;; END CODEX_SANDBOX_NETWORK_DISABLED leak
+                                ;;; BEGIN The exec-server/tests/file_system
+                                ;;; integration tests invoke the real
+                                ;;; system bwrap, which tries to execvp the
+                                ;;; test binary at the cargo target path
+                                ;;; under the build dir.  Same root cause
+                                ;;; as the existing
+                                ;;; sandbox_reenables_writable_subpaths_under_unreadable_parents
+                                ;;; skip: guix builds live under /tmp but
+                                ;;; bwrap's mount namespace excludes /tmp,
+                                ;;; making the binary invisible inside the
+                                ;;; namespace.
+                                "--skip" "file_system_copy_preserves_symlink_source"
+                                "--skip" "file_system_copy_rejects_symlink_escape_destination"
+                                "--skip" "file_system_copy_rejects_symlink_escape_source"
+                                "--skip" "file_system_create_directory_rejects_symlink_escape"
+                                "--skip" "file_system_read_directory_rejects_symlink_escape"
+                                "--skip" "file_system_remove_rejects_symlink_escape"
+                                "--skip" "file_system_remove_removes_symlink_not_target"
+                                "--skip" "file_system_sandboxed_read_allows_readable_root"
+                                "--skip" "file_system_sandboxed_read_rejects_symlink_escape"
+                                "--skip" "file_system_sandboxed_read_rejects_symlink_parent_dotdot_escape"
+                                "--skip" "file_system_sandboxed_write_allows_additional_write_root"
+                                "--skip" "file_system_sandboxed_write_rejects_symlink_escape"
+                                "--skip" "file_system_sandboxed_write_rejects_unwritable_path"
+                                ;;; END bwrap-cant-see-/tmp file_system tests
+                                ;;; BEGIN Landlock is unavailable on Guix,
+                                ;;; so the sandbox cannot deny network
+                                ;;; syscalls.  These tests expect
+                                ;;; SandboxErr::Denied for the nc, ping,
+                                ;;; ssh, getent, and dev_tcp_redirection
+                                ;;; commands but those commands instead
+                                ;;; block on connect() until the test's 2s
+                                ;;; timeout fires (Timeout, exit 124).
+                                ;;; Same root cause as the Landlock skips
+                                ;;; at the top of this list; new test names
+                                ;;; in 0.124.
+                                "--skip" "sandbox_blocks_nc"
+                                "--skip" "sandbox_blocks_ping"
+                                "--skip" "sandbox_blocks_dev_tcp_redirection"
+                                "--skip" "sandbox_blocks_getent"
+                                "--skip" "sandbox_blocks_ssh"
+                                ;;; END Landlock network block
+                                ;;; BEGIN Requires github.com network access.
+                                ;;; With no "extraKnownMarketplaces" entry
+                                ;;; in settings.json,
+                                ;;; collect_marketplace_import_sources
+                                ;;; inserts a fallback entry for the
+                                ;;; "claude-plugins-official" marketplace
+                                ;;; pointing at the github shorthand
+                                ;;; "anthropics/claude-plugins-official".
+                                ;;; add_marketplace -> parse_marketplace_source
+                                ;;; expands that to a github.com/.git URL
+                                ;;; and clone_git_source runs 'git clone'.
+                                ;;; The Guix build sandbox has no network,
+                                ;;; so the clone fails and the marketplace
+                                ;;; lands in failed_marketplaces.  No mock
+                                ;;; cloner is injected via
+                                ;;; ExternalAgentConfigService::new_for_test,
+                                ;;; so there is no in-tree way to satisfy
+                                ;;; the test offline.
+                                "--skip" "import_plugins_infers_claude_official_marketplace_when_missing_from_settings"
+                                ;;; END github.com network access
+                                ;;; BEGIN Async race between the rollout
+                                ;;; writer task and a direct SQLite read.
+                                ;;; The test calls
+                                ;;; update_memory_settings_with_app_server,
+                                ;;; which routes through the in-memory
+                                ;;; thread path on the app-server's
+                                ;;; ThreadMemoryModeSet handler ->
+                                ;;; Session::set_thread_memory_mode ->
+                                ;;; persist_thread_memory_mode_update,
+                                ;;; which writes a RolloutItem::SessionMeta
+                                ;;; with the new mode to the rollout file
+                                ;;; via recorder.record_items + flush.  The
+                                ;;; rollout writer task then asynchronously
+                                ;;; calls sync_thread_state_after_write,
+                                ;;; which calls state_db::apply_rollout_items
+                                ;;; to mirror the SessionMeta into SQLite.
+                                ;;; flush() only awaits the rollout-file
+                                ;;; write, not the subsequent SQLite sync.
+                                ;;; The test opens a fresh StateRuntime and
+                                ;;; reads get_thread_memory_mode
+                                ;;; immediately, so it observes the creation
+                                ;;; default of "enabled" written by
+                                ;;; upsert_thread_with_creation_memory_mode
+                                ;;; instead of the new "disabled".  Upstream
+                                ;;; CI wins this race; we lose.
+                                "--skip" "update_memory_settings_updates_current_thread_memory_mode"
+                                ;;; END memory-mode rollout/sqlite race
+                                ;;; BEGIN The Stopwatch::new constructor in
+                                ;;; codex_shell_escalation anchors
+                                ;;; T0 = Instant::now() at construction;
+                                ;;; the spawned cancellation task fires at
+                                ;;; T0 + limit.  The test captures
+                                ;;; start = Instant::now() at T1 > T0 (after
+                                ;;; cancellation_token() returns) and
+                                ;;; asserts start.elapsed() >= limit,
+                                ;;; i.e. (T0 + limit) - T1 >= limit, which
+                                ;;; is always false by the offset T1 - T0.
+                                ;;; The test only passes when scheduler
+                                ;;; jitter on the sleep wakeup happens to
+                                ;;; exceed that offset.  Upstream wins the
+                                ;;; race; we don't always.
+                                "--skip" "cancellation_receiver_fires_after_limit"
+                                ;;; END Stopwatch construction/start offset race
+                                )
      #:cargo-package-crates
      ''(;;; Tier 0: No internal deps.
         "codex-ansi-escape"
@@ -358,22 +520,31 @@
         "codex-debug-client"
         "codex-analytics"
         "codex-rollout"
+         "codex-rollout-trace"
         "codex-terminal-detection"
         "codex-utils-approval-presets"
         "codex-utils-cli"
+         "codex-uds"
+         "codex-install-context"
+         "codex-device-key"
         ;;; Tier 2.
         "codex-app-server-protocol"
         "codex-rmcp-client"
         "codex-otel"
+         "codex-thread-store"
         "codex-state"
         "codex-features"
+         "codex-model-provider"
         "codex-config"
+         "codex-agent-identity"
+         "codex-aws-auth"
         "codex-hooks"
-         "codex-instructions"
         "codex-code-mode"
         "codex-feedback"
         "codex-skills"
+         "codex-test-binary-support"
         "codex-core"
+         "codex-core-plugins"
         "codex-utils-sandbox-summary"
         "codex-linux-sandbox"
         "codex-sandboxing"
@@ -425,7 +596,7 @@
              ;; Update them to match the actual package version.
              (let ((snap-files (find-files "." "\\.snap$")))
                (substitute* snap-files
-                  (("\\(v0\\.0\\.0\\)   ") "(v0.120.0) ")))))
+                  (("\\(v0\\.0\\.0\\)   ") "(v0.124.0) ")))))
          (add-after 'chdir-to-workspace 'patch-git-deps-to-vendor
            (lambda _
              ;; Replace git dependencies with version references so cargo
@@ -436,32 +607,55 @@
                (("runfiles = \\{ git = [^}]+\\}")
                 "runfiles = \"0.1.0\""))
              ;; Remove workspace members that have unbuildable deps
-              ;; (libwebrtc requires git fetch, v8-poc requires V8).
+              ;; (v8-poc requires V8).  code-mode stays a workspace member
+              ;; so its codex-protocol resolves to the same local copy as
+              ;; the rest of the build; disabling its default features
+              ;; (below) avoids pulling in V8.
              (substitute* "Cargo.toml"
-                (("\"v8-poc\",") "")
-                (("\"code-mode\",") ""))
-              ;; Disable V8 runtime in codex-code-mode: remove path
-              ;; so cargo resolves it from the vendor (where it has
-              ;; optional = true on v8) and disable default features.
+                (("\"v8-poc\",") ""))
+              ;; Disable V8 runtime in codex-code-mode by turning off
+              ;; default features.  Keep path= so code-mode is resolved
+              ;; from the local source tree and shares codex-protocol
+              ;; (and other workspace crates) with the rest of the build;
+              ;; resolving it from the vendor instead introduces a
+              ;; duplicate codex-protocol and causes E0308 type
+              ;; mismatches in codex-tools.
              (substitute* "Cargo.toml"
                (("codex-code-mode = \\{ path = \"code-mode\" \\}")
-                 "codex-code-mode = { version = \"0.120.0\", default-features = false }"))))
+                 "codex-code-mode = { path = \"code-mode\", default-features = false }"))
+              ;; cargo build at workspace root ignores per-dep
+              ;; default-features=false and builds code-mode with its
+              ;; own default features, which include v8-runtime and
+              ;; would pull in V8.  Make the default feature empty.
+              (substitute* "code-mode/Cargo.toml"
+                (("^default = \\[\"v8-runtime\"\\]") "default = []"))))
          (add-after 'patch-git-deps-to-vendor 'add-version-to-workspace-deps
            (lambda _
              ;; cargo package requires all dependencies to have versions.
-              ;; cargo package requires all dependencies to have versions.
-              ;; Add version = "0.120.0" to internal path dependencies.
+              ;; Add version = "0.124.0" to internal path dependencies.
              (let ((cargo-files (find-files "." "^Cargo\\.toml$")))
                (substitute* cargo-files
                  ;; Handle inline deps: name = { path = "..." }
                  (("(codex-[a-z0-9-]+) = \\{ path = " all name)
-                   (string-append name " = { version = \"0.120.0\", path = "))
+                   (string-append name " = { version = \"0.124.0\", path = "))
                  ;; Handle inline deps with package: name = { package = "...", path = "..." }
                  (("(codex-[a-z0-9-]+) = \\{ package = " all name)
-                   (string-append name " = { version = \"0.120.0\", package = "))
+                   (string-append name " = { version = \"0.124.0\", package = "))
                  ;; Handle section deps: [dependencies.X] with path = "..."
                  (("^(path = \"\\.\\./[^\"]*\")" all path-line)
-                   (string-append path-line "\nversion = \"0.120.0\""))))))
+                   (string-append path-line "\nversion = \"0.124.0\""))))))
+          (add-after 'chdir-to-workspace 'use-gnu-store-in-sandbox
+            (lambda _
+              ;; LINUX_PLATFORM_DEFAULT_READ_ROOTS in linux-sandbox/src/
+              ;; bwrap.rs is the read-only baseline that codex's bwrap
+              ;; sandbox bind-mounts so commands can read /usr/bin/ls,
+              ;; libc, etc.  Upstream lists "/nix/store" for NixOS;
+              ;; Guix's equivalent is "/gnu/store".  Without this swap,
+              ;; the codex sandbox cannot locate any binaries on a Guix
+              ;; system because every "system" path resolves into
+              ;; /gnu/store/<hash>-pkg/bin/...
+              (substitute* "linux-sandbox/src/bwrap.rs"
+                (("\"/nix/store\"") "\"/gnu/store\""))))
          (add-after 'chdir-to-workspace 'patch-hardcoded-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((bash-bin (string-append
@@ -561,10 +755,12 @@
                ;; double quotes.
                (substitute*
                  (list "core/src/plugins/startup_sync_tests.rs"
+                        "core/src/tools/runtimes/shell/unix_escalation_tests.rs"
                        "core/tests/suite/client.rs"
                        "core/tests/suite/js_repl.rs"
                        "core/tests/suite/skill_approval.rs"
                        "core/tests/suite/user_notification.rs"
+                        "exec-server/tests/file_system.rs"
                        "login/src/auth/auth_tests.rs"
                        "models-manager/src/manager_tests.rs"
                        "sandboxing/src/bwrap_tests.rs")
@@ -613,7 +809,17 @@
              ;; ~/... and 30 snapshot tests fail.
              (setenv "HOME" "/tmp/guix-home")
              (mkdir-p "/tmp/guix-home")
-              (setenv "USER" "nixbld"))))))
+              (setenv "USER" "nixbld")
+              ;; Default libtest thread stack is 2 MiB, which is not
+              ;; enough for tokio current_thread tests that drive
+              ;; codex-core's full turn pipeline.  Upstream gates such
+              ;; tests through run_current_thread_test_with_stack (4 MiB)
+              ;; in app-server/src/message_processor/tracing_tests.rs;
+              ;; raise the global default so future additions that
+              ;; forget the wrapper still pass.
+              (setenv "RUST_MIN_STACK" "8388608")
+              ;; Disable network access.
+              (setenv "CODEX_SANDBOX_NETWORK_DISABLED" "1"))))))
    (native-inputs `(("bubblewrap" ,bubblewrap) ;tests need bwrap on PATH
                     ("clang" ,clang)
                     ("cmake-minimal" ,cmake-minimal)
@@ -628,6 +834,8 @@
    (inputs (cons* bash-minimal coreutils git-minimal sed
                   libcap oniguruma openssl sqlite zlib `(,zstd "lib")
                   (cargo-inputs 'codex)))
+    (properties '((timeout . 108000) ; 30  hours
+                  (max-silent-time . 54000))) ; 15 hours
    (home-page "https://github.com/openai/codex")
    (synopsis "AI-assisted coding CLI and TUI")
    (description
@@ -2375,7 +2375,9 @@ non-Windows systems without running the actual installer using wine.")
     (sha256
      (base32 "17k679glx05v23n8kxbg9vmbf89i2252g5xj6w3dkz19asmh1zd6"))))
   (build-system gnu-build-system)
-   (native-inputs (list autoconf automake libtool nasm))
+   (native-inputs
+    (cons* autoconf automake libtool
+           (maybe-nasm)))
   (home-page "https://github.com/intel/isa-l")
   (synopsis "Intelligent storage acceleration library")
   (description "ISA-L is a collection of optimized low-level functions
@@ -52,6 +52,7 @@
 ;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
 ;;; Copyright © 2025 Murilo <murilo@disroot.org>
 ;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -133,6 +134,7 @@
  #:use-module (gnu packages sdl)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages tex)
+  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages web)
  #:use-module (gnu packages webkit)
  #:use-module (gnu packages xdisorg)
@@ -1671,6 +1673,38 @@ maintained anymore.")
 concurrent queue for C++11.")
    (license license:bsd-2)))

+(define-public ringbuffer
+  (package
+    (name "ringbuffer")
+    (version "0.9.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/JohannesLorenz/ringbuffer")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1c57hj6zyvcjpcbwrq8c1hj5brk1bnh69ayd88ny1p0gx031sjpk"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "-DCMAKE_CXX_FLAGS=-Wno-error=array-bounds"
+                   (string-append "-DINSTALL_LIB_DIR=" #$output "/lib"))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-export-header
+                 (lambda _
+                   (install-file "src/lib/ringbuffer_export.h"
+                                 (string-append #$output
+                                                "/include/ringbuffer")))))))
+    (home-page "https://github.com/JohannesLorenz/ringbuffer")
+    (synopsis "Lock-free multi-reader ringbuffer")
+    (description
+     "@code{ringbuffer} is a library containing a ringbuffer.  It is lock-free
+(using atomics only), and allows multiple readers, but only one writer.")
+    (license license:gpl3+)))
+
 (define-public spscqueue
  (package
    (name "spscqueue")
@@ -3192,8 +3226,7 @@ pointers, containers, compiler building blocks, etc.")
    (native-inputs
     (list build))
    (inputs
-     `(("libcutl" ,libcutl)
-       ("libxerces-c" ,xerces-c)))
+     (list libcutl xerces-c))
    (synopsis "XSD Front-end")
    (description "@code{libxsd-frontend} is a compiler frontend for the W3C
 XML Schema definition language.  It includes a parser, semantic graph types
@@ -3668,6 +3701,39 @@ computing Fast Fourier transformations.  It supports multidimensional arrays,
 different floating point sizes and complex transformations.")
      (license license:bsd-3))))

+(define-public libbinio
+  ;; The latest tagged version does not support CMake build.  This commit has
+  ;; builds with CMake and has updated CMake version support.
+  (let ((commit "e88dad086265e179ab6aef7f479e19f3917c7a98")
+        (revision "0"))
+    (package
+      (name "libbinio")
+      (version (git-version "1.5" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/adplug/libbinio")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0rb33jl6gpxb88zymzl996m43b7r6wyw4lq0ib3626kna3baqnha"))))
+      (native-inputs
+       (list autoconf automake libtool texinfo))
+      (build-system cmake-build-system)
+      (arguments
+       (list #:tests? #f ;no tests
+             #:configure-flags
+             #~(list "-DBUILD_SHARED_LIBS=ON")))
+      (home-page "http://adplug.github.io/libbinio/")
+      (synopsis "Binary I/O stream class library")
+      (description
+       "This binary I/O stream class library presents a platform-independent
+way to access binary data streams in C++.  The library is hardware independent
+in the form that it transparently converts between the different forms of
+machine-internal binary data representation.")
+      (license license:lgpl2.1+))))
+
 (define-public priocpp
  ;; Latest release is from 2022-08-14.
  (let ((commit "ea15402adcd0d9191dc29ca6f7e4dd0bff67b9b5")
@@ -4494,6 +4560,47 @@ meta data function.")
    ;; or the CECILL-C license:
    (license (list license:lgpl3 license:cecill-c))))

+(define-public tcbrindle-span
+  (let ((commit "836dc6a0efd9849cb194e88e4aa2387436bb079b")
+        (revision "0"))
+    (package
+      (name "tcbrindle-span")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/tcbrindle/span")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1v3x1mj4if8jrr7cmrcbhv8n8ygla0liqb0dic6g6ji7px2pr6jf"))
+         (modules '((guix build utils)))
+         ;; Unbundle catch.
+         (snippet
+          '(with-directory-excursion "test"
+             (delete-file "catch.hpp")
+             (substitute* (find-files "." "\\.cpp$")
+               (("\"catch\\.hpp\"") "<catch.hpp>"))))))
+      (build-system cmake-build-system)
+      (native-inputs (list catch-framework))
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (replace 'install
+              (lambda _
+                (mkdir-p (string-append #$output))
+                (copy-recursively "../source/include"
+                                  (string-append #$output "/include")))))))
+      (home-page "https://github.com/tcbrindle/span")
+      (synopsis "Implementation of C++20's @code{std::span} for older compilers")
+      (description
+       "This package provides a single-header implementation of C++20's
+@code{std::span}, conforming to the C++20 committee draft.  It is compatible
+with C++11, but will use newer language features if they are available.")
+    (license license:boost1.0))))
+
 (define-public tsl-hopscotch-map
  (package
    (name "tsl-hopscotch-map")
@@ -71,6 +71,7 @@
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
 ;;; Copyright © 2026 Peter Polidoro <peter@polidoro.io>
 ;;; Copyright © 2026 Josep Bigorra <jjbigorra@gmail.com>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4159,8 +4160,8 @@ programmatically or as a standalone CLI application.")
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (inputs
-     `(("libcrypto" ,openssl)
-       ("libtcl8.6" ,tcl))) ; required for running the tests
+     (list openssl
+           tcl))                        ;for tests
    (native-inputs
     (list tcl))
    (arguments
@@ -266,14 +266,14 @@ tmpfs/ramfs filesystems.")
 (define-public parted
  (package
    (name "parted")
-    (version "3.6")
+    (version "3.7")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/parted/parted-"
                                  version ".tar.xz"))
              (sha256
               (base32
-                "04p6b4rygrfd1jrskwrx3bn2icajg1mvbfhyc0c9l3ya7kixnhrv"))))
+                "0yzga4cjq3yplqs47dl9714vwc3v3v8nxrj80rdc5wx4c5syb380"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -296,6 +296,7 @@ tmpfs/ramfs filesystems.")
       (,util-linux "lib")))
    (native-inputs
     (list gettext-minimal
+           pkg-config

           ;; For the tests.
           e2fsprogs
@@ -51,7 +51,7 @@
 (define-public boinc-client
  (package
    (name "boinc-client")
-    (version "8.2.9")
+    (version "8.2.12")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -62,7 +62,7 @@
              (file-name (git-file-name "boinc" version))
              (sha256
               (base32
-                "0ik9423ii6kal29jdn907pxy8w86zpi8n158qx1gcsh8lsaif1v5"))))
+                "0531n0yij1gh06xy6plwivbpmhqfq15jizg3rdgri40nz41rzbgr"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -201,13 +201,13 @@ your project into different processes.")
 (define-public python-django
  (package
    (name "python-django")
-    (version "5.2.11")
+    (version "5.2.13")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "django" version))
       (sha256
-        (base32 "1lq2dynfw6jmvzrzgfrlij2qnxcksaxgnrfr0pj3bvmrv0m2jbbz"))))
+        (base32 "1i1vlffzhwbzp6r6y8ycvwklc45diy4c6i897z379l48a7dqj5d3"))))
    (build-system pyproject-build-system)
    (arguments
     '(#:test-flags
@@ -298,22 +298,6 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
                      ;; This CVE is fixed in 4.1.9.
                      "CVE-2023-31047"))))))

-(define-public python-django-4
-  (package
-    (inherit python-django)
-    (name "python-django-4")
-    (version "4.2.28")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "django" version))
-        (sha256
-         (base32 "1znc2q1m9p2kxz1rkfkh2hg2sx6i3aqv72zsraad7bci364cvfd4"))))
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:phases phases)
-        #~(modify-phases #$phases (delete 'delete-sitecustomize)))))))
-
 (define-public python-django-cache-url
  (package
    (name "python-django-cache-url")
@@ -10,6 +10,7 @@
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022 Esther Flashner <esther@flashner.co.il>
 ;;; Copyright © 2025-2026 Jonas Meeuws <jonas.meeuws@gmail.com>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -320,11 +321,11 @@ integration tests...\n")
                                 "|core.thread.osthread-debug-shared")))
                           (#t `("")))))))))))))
    (native-inputs
-     (append (delete "llvm"
-                     (alist-replace "ldc" (list ldc-bootstrap)
-                                    (package-native-inputs ldc-bootstrap)))
-         `(("clang" ,clang-17)          ;propagates llvm and clang-runtime
-           ("python-lit" ,python-lit))))
+     (modify-inputs native-inputs
+       (delete "llvm")
+       (replace "ldc" ldc-bootstrap)
+       (append clang-17                 ;propagates llvm and clang-runtime
+               python-lit)))
    (properties
     (alist-delete 'hidden? (package-properties ldc-bootstrap)))))

@@ -115,6 +115,7 @@
       (uri (git-reference
              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
              (commit (string-append "adns-" version))))
+       (file-name (git-file-name name version))
       (sha256
        (base32
         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
@@ -148,13 +148,13 @@ system.")
 (define-public r-duckdb
  (package
    (name "r-duckdb")
-    (version "1.5.1")
+    (version "1.5.2")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "duckdb" version))
       (sha256
-        (base32 "177621m08whqqk4yhj3zrr08l3d9hhlqh3gm9jzhi5cplg47cksq"))
+        (base32 "1dldlfwvc33czvlxfmwaj4p9y6sjjj5iqy98yda47a8kclrqmyam"))
       ;; This package bundles the duckdb sources and builds a custom variant
       ;; of duckdb.  I'd be happy to link it with our duckdb library instead,
       ;; but it does not seem possible to do that.
@@ -2331,7 +2331,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
 (define-public nvc
  (package
    (name "nvc")
-    (version "1.19.3")
+    (version "1.20.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2340,7 +2340,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1zizz2dafm53lzpjayy6vig5pz5ri9cszdivg0jzzh8s3ggkpy1i"))))
+                "1b38x2ch468s4p6mrq6c8s0d95vb84p6w4v8in79l4w7sfy8jnr0"))))
    (build-system gnu-build-system)
    (arguments
     (list #:out-of-source? #t
@@ -3461,7 +3461,7 @@ form of AXI, AXI lite, and AXI stream modules.")
 (define-public python-edalize
  (package
    (name "python-edalize")
-    (version "0.6.6")
+    (version "0.6.8")
    (source
     (origin
       (method git-fetch)
@@ -3470,7 +3470,7 @@ form of AXI, AXI lite, and AXI stream modules.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "115nc15n2cx4x9irjim07zkg0287418djqd6ja7rm8jrnyldvln9"))))
+        (base32 "04m2lhkclw9fj92k43c06j003qnq9i1yhy2131fvcnkkr0d9438m"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -4516,7 +4516,7 @@ unique design feature of Trilinos is its focus on packages.")
 (define-public verilator
  (package
    (name "verilator")
-    (version "5.046")
+    (version "5.048")
    (source
     (origin
       (method git-fetch)
@@ -4525,7 +4525,7 @@ unique design feature of Trilinos is its focus on packages.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1gr1qhxvl4856hnmnx46dqd2qp0jhdh959zm2qfmxzzh19np7xkm"))))
+        (base32 "16c1x66kqmc5ldqjij81kypj471fibfihcqn6kz4wbxvnn0smyn6"))))
    (native-inputs
     (list autoconf
           automake
@@ -62,7 +62,7 @@ as bold, underscore or italic.")
 (define-public emacs-buttercup
  (package
    (name "emacs-buttercup")
-    (version "1.38")
+    (version "1.40")
    (source
     (origin
       (method git-fetch)
@@ -72,9 +72,7 @@ as bold, underscore or italic.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "09n8skr5wi8bs7x81d5bi6z89dd8s1zi9a5f4r2qadaz69slncxq"))
-       (patches
-        (search-patches "emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch"))))
+         "1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -28,6 +28,7 @@
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com>
 ;;; Copyright © 2025 John Kehayias <john@guixotic.coop>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -869,7 +870,7 @@ Started in 2014 as a GSOC project, Guile-Emacs was resurrected in 2024.")
         "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"))))
    (build-system gnu-build-system)
    (native-inputs
-     `(("gettext" ,gettext-minimal)))
+     (list gettext-minimal))
    (arguments
     `(#:configure-flags
       (list (string-append "--with-charmaps="
@@ -1264,7 +1264,8 @@ Enjoy all of your favorite Atari 2600 games on your PC thanks to Stella!")
        (base32 "1xf15b6c3i0vv92b420a92pfvfaxhji56ivin8pn5r7fajkqyfb7"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list pkg-config nasm which))
+     (cons* pkg-config which
+            (maybe-nasm)))
    (inputs
     (list freetype
           glu
@@ -1289,8 +1290,6 @@ Enjoy all of your favorite Atari 2600 games on your PC thanks to Stella!")
                      (list "all" (string-append "PREFIX=" out)))
       ;; There are no tests.
       #:tests? #f))
-    ;; As per the Makefile (in projects/unix/Makefile):
-    (supported-systems '("i686-linux" "x86_64-linux"))
    (home-page "https://www.mupen64plus.org/")
    (synopsis "Nintendo 64 emulator core library")
    (description
@@ -2164,7 +2163,9 @@ as RetroArch.")
              (lambda _
                (install-file "mupen64plus_next_libretro.so"
                              (string-append #$output "/lib/libretro/")))))))
-      (native-inputs (list nasm pkg-config))
+      (native-inputs
+       (cons* pkg-config
+              (maybe-nasm)))
      (inputs (list mesa libpng minizip unzip xxhash zlib))
      (home-page "https://github.com/libretro/mupen64plus-libretro-nx")
      (synopsis "Improved Mupen64Plus libretro core")
@@ -2,7 +2,7 @@
 ;;; Copyright © 2017 Dave Love <fx@gnu.org>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2023, 2026 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -226,15 +226,19 @@ testing InfiniBand networks.")

                           (string-append "--with-rdmacm="
                                          #$(this-package-input "rdma-core"))
-                           (string-append "--with-rocm="
-                                          #$(this-package-input "rocr-runtime")))
+
+                           #$@(if (this-package-input "rocr-runtime")
+                                  #~((string-append "--with-rocm="
+                                                    #$(this-package-input
+                                                       "rocr-runtime")))
+                                  #~()))

      ;; Be verbose so that compiler flags are displayed.
      #:make-flags #~'("V=1")))
    (native-inputs
     (list autoconf automake libtool pkg-config))
    (inputs
-     (list numactl rdma-core rocr-runtime))
+     (list numactl rdma-core))
    (synopsis "Optimized communication layer for message passing in HPC")
    (description
     "Unified Communication X (UCX) provides an optimized communication layer
@@ -250,3 +254,13 @@ memory mechanisms for efficient intra-node communication.")
    ;; and x86_64 as supported.
    (supported-systems '("x86_64-linux" "aarch64-linux" "powerpc64le-linux"
                         "riscv64-linux"))))
+
+;; Note: ROCm support is kept separate to avoid a significant increase in
+;; closure size: <https://codeberg.org/guix/guix/issues/7225>.
+(define-public ucx-rocm
+  (package/inherit ucx
+    (name "ucx-rocm")
+    (inputs (modify-inputs inputs
+              (append rocr-runtime)))
+    (synopsis "Optimized communication layer for message passing in HPC (with
+ROCm support)")))
@@ -20,6 +20,7 @@
 ;;; Copyright © 2025 45mg <45mg.writes@gmail.com>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1128,8 +1129,8 @@ transaction log.
     (inherit jfsutils)
     (name "jfsutils-static")
     (inputs
-      `(("util-linux:static" ,util-linux "static")
-        ,@(package-inputs jfsutils))))))
+      (modify-inputs inputs
+        (prepend (list util-linux "static")))))))

 (define-public jfs_fsck/static
  (package
@@ -1138,28 +1139,23 @@ transaction log.
    (source #f)
    (build-system trivial-build-system)
    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils)
-                      (ice-9 ftw)
-                      (srfi srfi-26))
-         (let* ((jfsutils (assoc-ref %build-inputs "jfsutils"))
-                (fsck     "jfs_fsck")
-                (out      (assoc-ref %outputs "out"))
-                (sbin     (string-append out "/sbin")))
-           (mkdir-p sbin)
-           (with-directory-excursion sbin
-             (install-file (string-append jfsutils "/sbin/" fsck)
-                           ".")
-             (remove-store-references fsck)
-             (chmod fsck #o555))
-           #t))))
+     (list
+      #:modules '((guix build utils))
+      #:builder
+      #~(begin
+          (use-modules (guix build utils))
+          (let* ((sbin (string-append #$output "/sbin"))
+                 (fsck (string-append sbin "/jfs_fsck")))
+            (install-file (search-input-file %build-inputs "sbin/jfs_fsck")
+                          sbin)
+            (remove-store-references fsck)
+            (chmod fsck #o555)))))
    (inputs
-     `(("jfsutils" ,jfsutils/static)))
+     (list jfsutils/static))
    (home-page (package-home-page jfsutils))
    (synopsis "Statically-linked jfs_fsck command from jfsutils")
-    (description "This package provides statically-linked jfs_fsck command taken
+    (description
+     "This package provides statically-linked jfs_fsck command taken
 from the jfsutils package.  It is meant to be used in initrds.")
    (license (package-license jfsutils))))

@@ -1159,10 +1159,10 @@ Executables included are:
      (native-inputs
       (append
         (list acpica
-               nasm
               perl
               python-3
               (list util-linux "lib"))
+         (maybe-nasm (string-append arch "-" arch))
         (if (not (string-prefix? arch (%current-system)))
             (if (string=? arch "armhf")
                 (list (cross-gcc "arm-linux-gnueabihf")
@@ -12,7 +12,7 @@
 ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2021-2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2021-2026 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2022 Eric Bavier <bavier@posteo.net>
 ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
@@ -1382,14 +1382,15 @@ Font Format (WOFF).")
  (hidden-package
   (package
     (name "fontconfig-minimal")
-     (version "2.16.0")
+     (version "2.17.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                     "https://www.freedesktop.org/software/"
-                     "fontconfig/release/fontconfig-" version ".tar.xz"))
+                     "https://gitlab.freedesktop.org/api/v4/projects/890"
+                     "/packages/generic/fontconfig/" version "/fontconfig-"
+                     version ".tar.xz"))
               (sha256 (base32
-                        "086jdsdxmc9ryr0n0dmgs0vfnkhkxxw5hsgpr888pfn9biaxqcva"))
+                        "0hd5dw15q0i7518w1zqjcvyhvmlcf3ycv6df0ny1zz7zyj9swp4z"))
               (patches (search-patches "fontconfig-cache-ignore-mtime.patch"))))
     (build-system gnu-build-system)
     ;; In Requires or Requires.private of fontconfig.pc.
@@ -43,6 +43,8 @@
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 wvlab <me@wvlab.xyz>
 ;;; Copyright © 2025 jgart <jgart@dismail.de>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
+;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -792,16 +794,16 @@ the freedesktop.org XDG Base Directory specification.")
 (define-public elogind
  (package
    (name "elogind")
-    (version "255.17")
+    (version "257.14")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                    (url "https://github.com/elogind/elogind")
-                    (commit (string-append "v" version))))
+                     (url "https://github.com/elogind/elogind")
+                     (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0cb6p559281dzh24is91v6d4v4kz45yhyizibi4sfql9nign865h"))))
+                "16cbkkia2wmcjwqxgzl714igi9sgpcl4sdvag388vlh941136bs9"))))
    (build-system meson-build-system)
    (arguments
     `(#:configure-flags
@@ -3053,10 +3055,10 @@ useful with system integration.")
         "0zs4z7l9b57jldwz0ban77f3c2zq43ambd0dssf5qg9i216f9lmj"))))
    (build-system gnu-build-system)
    (native-inputs
-     `(("dbus-test-runner" ,dbus-test-runner)
-       ("glib:bin" ,glib "bin")
-       ("pkg-config" ,pkg-config)
-       ("xvfb" ,xorg-server-for-tests)))
+     (list dbus-test-runner
+           (list glib "bin")
+           pkg-config
+           xorg-server-for-tests))
    (inputs
     (list gtk+ glib))
    (arguments
@@ -3300,6 +3302,7 @@ compatible with the well-known scripts of the same name.")
     (list gettext-minimal
           `(,glib "bin")
           gst-plugins-good             ;for wavparse plugin
+           (librsvg-for-system)         ;SVG loader needed for one test
           pkg-config
           python
           python-dbusmock
@@ -3417,50 +3420,50 @@ interfaces.")
 (define-public xdg-desktop-portal-wlr
  (package
    (name "xdg-desktop-portal-wlr")
-    (version "0.7.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/emersion/xdg-desktop-portal-wlr")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1mbq3czka9swwmfaasnaj89y2m254p3qa522ayclh688jdwh70hq"))
-              (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
+    (version "0.8.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/xdg-desktop-portal-wlr")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jj0a9s3h3i04qsxkhcpxjzbb17hs9ngdy7wkypja09233zdz10w"))
+       (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
    (build-system meson-build-system)
    (arguments
-     `(#:configure-flags
-       '("-Dsystemd=disabled"
-         "-Dsd-bus-provider=libelogind")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'hardcode-binaries
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((sh (search-input-file inputs "/bin/sh"))
-                   (grim (search-input-file inputs "/bin/grim"))
-                   (slurp (search-input-file inputs "/bin/slurp")))
-               (substitute* "src/screenshot/screenshot.c"
-                 (("grim") grim)
-                 (("slurp") slurp)
-                 (("execl\\(\"/bin/sh\", \"/bin/sh\"")
-                  (string-append "execl(\"" sh "\", \"" sh "\"")))
-               (substitute* "src/screencast/screencast.c"
-                 (("execvp\\(\"sh")
-                  (string-append "execvp(\"" sh))))))
-         (add-after 'install 'install-documentation
-           (lambda* (#:key outputs #:allow-other-keys)
-             (install-file "../source/README.md"
-                           (string-append (assoc-ref outputs "out")
-                                          "/share/doc/" ,name)))))))
-    (native-inputs
-     (list cmake-minimal pkg-config scdoc))
-    (inputs (list elogind
-                  bash-minimal
+     (list
+      #:configure-flags
+      #~(list "-Dsystemd=disabled"
+              "-Dsd-bus-provider=libelogind")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'hardcode-binaries
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((sh (search-input-file inputs "/bin/sh"))
+                    (grim (search-input-file inputs "/bin/grim"))
+                    (slurp (search-input-file inputs "/bin/slurp")))
+                (substitute* '("src/screencast/chooser.c"
+                               "src/screenshot/screenshot.c")
+                  (("grim") grim)
+                  (("slurp") slurp)
+                  (("/bin/sh") sh))
+                (substitute* "src/screencast/screencast.c"
+                  (("execvp\\(\"sh")
+                   (format #f "execvp(\"~a" sh))))))
+          (add-after 'install 'install-documentation
+            (lambda _
+              (install-file "../source/README.md"
+                            (string-append #$output "/share/doc/"
+                                           #$name)))))))
+    (native-inputs (list cmake-minimal pkg-config scdoc))
+    (inputs (list bash-minimal
+                  elogind
                  grim
                  iniparser
-                  mesa
                  libinih
+                  mesa
                  pipewire
                  slurp
                  wayland
@@ -3474,6 +3477,45 @@ remote-desktop @code{xdg-desktop-portal} interfaces for wlroots based
 compositors.")
    (license license:expat)))

+(define-public xdg-desktop-portal-termfilechooser
+  (package
+    (name "xdg-desktop-portal-termfilechooser")
+    (version "1.3.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/hunkyburrito/xdg-desktop-portal-termfilechooser")
+              (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+         (base32 "1wvmwl678fr5pxz7x248pm5v4jd3bycz8nqa2q87akys5b9d1xpd"))))
+    (build-system meson-build-system)
+    (arguments
+      (list #:phases
+            #~(modify-phases %standard-phases
+                (add-after 'install 'fix-paths
+                  (lambda* (#:key inputs #:allow-other-keys)
+                    (let ((sed (search-input-file inputs "/bin/sed")))
+                      (substitute* (find-files #$output "-wrapper\\.sh")
+                        ((" sed") (string-append " " sed)))))))))
+    (native-inputs
+      (list cmake-minimal
+            pkg-config
+            scdoc))
+    (inputs
+      (list basu
+            libinih
+            sed))
+    (home-page "https://github.com/hunkyburrito/xdg-desktop-portal-termfilechooser")
+    (synopsis "@code{xdg-desktop-portal} backend for choosing files with your
+favorite terminal file chooser")
+    (description
+     "This package provides a backend implementation for xdg-desktop-portal that
+allows using your preferred terminal file manager as file chooser in other
+applications.")
+    (license license:expat)))
+
 (define-public poweralertd
  (package
    (name "poweralertd")
@@ -227,6 +227,7 @@
  #:use-module (gnu packages shells)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages squirrel)
+  #:use-module (gnu packages stb)
  #:use-module (gnu packages swig)
  #:use-module (gnu packages tcl)
  #:use-module (gnu packages terminals)
@@ -552,14 +553,14 @@ use with @code{udev-service-type}.")
 (define-public armagetronad
  (package
    (name "armagetronad")
-    (version "0.2.9.2.3")
+    (version "0.2.9.3.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/armagetronad/stable/"
                                  version "/armagetronad-" version ".tbz"))
              (sha256
               (base32
-                "0a6rlp2lj5bp7pg1yf8brjyb3mw7nqp3amj19wvz3xni21bbc31k"))))
+                "1q1zlbhbcimr6bw0ms1pr8hz4q850ivi3hvxn3467jfgiq22f3cy"))))
    (build-system gnu-build-system)
    (arguments
     (list #:configure-flags
@@ -576,6 +577,7 @@ use with @code{udev-service-type}.")
                     (("^install_link .*BINDIR.*") "")))))))
    (native-inputs (list pkg-config))
    (inputs (list libxml2
+                  curl
                  (sdl-union (list sdl sdl-image sdl-mixer))
                  freeglut
                  libpng
@@ -1233,11 +1235,11 @@ original rogue game found on 4.2BSD.")
    (license license:bsd-3)))

 (define-public sgt-puzzles
-  (let ((commit "28032bd5a0d3dc409eb225b8bdb23fd0b18a28d7")
+  (let ((commit "06e37f1e334d85c7c779f79ef9e484ff2f708269")
        (revision "0"))
    (package
      (name "sgt-puzzles")
-      (version (git-version "20251120" revision commit))
+      (version (git-version "20260308" revision commit))
      (source
       (origin
         (method git-fetch)
@@ -1246,7 +1248,7 @@ original rogue game found on 4.2BSD.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0533fzzagmi7g7sw1fdgpzy6gjpif77gxf3avz1qnjsma5gq7f2l"))))
+          (base32 "141d57s1va2ng7nxjzdgmsqh5mdb0mpy3yiqaj4rplya8xlhm34h"))))
      (build-system cmake-build-system)
      (arguments
       (list
@@ -3407,7 +3409,8 @@ and defeat them with your bubbles!")
                                 "SamTSE/Sources/Engine/Engine.cpp")
                (("@OUTPUT_DIR@") #$output)))))))
    (inputs (list sdl2 libvorbis))
-    (native-inputs (list flex bison nasm imagemagick))
+    (native-inputs (cons* flex bison imagemagick
+                          (maybe-nasm)))
    (home-page "https://github.com/tx00100xt/SeriousSamClassic")
    (synopsis "SeriousSam engine and Serious Sam: TFE and TSE")
    (description
@@ -4128,7 +4131,7 @@ a C library, so they can easily be integrated into other programs.")
 (define-public taisei
  (package
    (name "taisei")
-    (version "1.4.2")
+    (version "1.4.4")
    (source
     (origin
       (method url-fetch)
@@ -4136,7 +4139,7 @@ a C library, so they can easily be integrated into other programs.")
                           "taisei/releases/download/v" version
                           "/taisei-" version ".tar.xz"))
       (sha256
-        (base32 "19sgm175clkvpcv0b9p4jkjpfxqw0kyl2i5p8w63kwzqcjp9m1jx"))))
+        (base32 "13b2ha8nsdzbydirvc7hw1q46jzhn6cx9b9spgk777swjlgx2vph"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -4145,7 +4148,8 @@ a C library, so they can easily be integrated into other programs.")
                                "-Dr_gles30=enabled"
                                "-Dshader_transpiler=enabled")))
    (native-inputs
-     (list pkg-config
+     (list cmake-minimal
+           pkg-config
           python
           python-docutils
           python-pygments
@@ -4153,24 +4157,29 @@ a C library, so they can easily be integrated into other programs.")
    (inputs
     (list cglm
           freetype
+           glslang
+           libdecor                     ; XXX: for sdl3
           libpng
           libwebp
           libzip
           mesa
           openssl
           opusfile
-           sdl2
-           sdl2-mixer
+           sdl3
           shaderc
           spirv-cross
+           spirv-tools                  ; for glslang
+           vulkan-loader                ; XXX: for sdl3?
           zlib
           (list zstd "lib")))
    (home-page "https://taisei-project.org/")
    (synopsis "Shoot'em up fangame and libre clone of Touhou Project")
    (description
-     "The player controls a character (one of three: Good, Bad, and Dead),
-dodges the missiles (lots of it cover the screen, but the character's hitbox
-is very small), and shoot at the adversaries that keep appear on the screen.")
+     "Taisei is a vertical shoot'em up game, in which the player controls
+one of three characters.  While moving through stages, a large number of
+enemies and even larger amounts of bullets appear that require careful
+maneuvers to dodge.  By shooting the enemies, players receive powerups
+for their characters, allowing them to shoot even more.")
    (license (list
              ;; game
              license:expat
@@ -4723,6 +4732,10 @@ for common mesh file formats, and collision detection.")
                      (url "https://github.com/thelaui/M.A.R.S.")
                      (commit commit)))
                (file-name (git-file-name name version))
+                (modules '((guix build utils)))
+                (snippet
+                 #~(begin
+                     (delete-file-recursively "ext_libs_for_windows")))
                (sha256
                 (base32
                  "0bdi4ja39rark742qvqixm8khai5k8qd84z5kzim9jcjdvvwyqj9"))))
@@ -4749,7 +4762,8 @@ for common mesh file formats, and collision detection.")
 attractive physics.  Players can battle each other or computer controlled
 enemies in different game modes such as space ball, death match, team death
 match, cannon keep, and grave-itation pit.")
-      (license license:gpl3+))))
+      (license (list license:gpl3+
+                     license:cc-by-sa3.0))))) ;/data/audio/music

 (define-public alienblaster
  (package
@@ -5335,54 +5349,124 @@ also available.")
       (sha256
        (base32 "05aj09rm50xb6910zx6imarj8k728x9bpvpa7ydwgb4sj1nypil8"))
       (modules '((guix build utils)))
-       (snippet '(begin
-                   (with-directory-excursion "thirdparty"
-                     (delete-file-recursively "glm")
-                     (substitute* "CMakeLists.txt"
-                       (("add_subdirectory\\(glm\\)")
-                        "find_package(glm REQUIRED)")))
-                   (with-directory-excursion "src"
-                     (substitute* "CMakeLists.txt"
-                       (("glm::glm")
-                        "glm")))))))
+       (snippet
+        '(begin
+          (with-directory-excursion "thirdparty"
+            ;; Delete third party ibraries, except these libraries:
+            ;; glad: header file is not available in the system glad package.
+            ;; imgui: configured with "srb2_imconfig.h".
+            ;; libwebm: Not available in Guix.
+            ;; renamenoise: Not available in Guix.
+            ;; tracy: header files are not available in the system tracy
+            ;; package.
+            (for-each delete-file-recursively
+                      '("discord-rpc"
+                        "glm"
+                        "nlohmann-json"
+                        "overlay-ports/libyuv"
+                        "tcbrindle_span"
+                        "vma"
+                        "volk"
+                        "vulkan-headers"
+                        "xmp-lite"))
+            ;; Unbundle stb.
+            (with-directory-excursion "stb"
+              (for-each delete-file
+                        '("include/stb_rect_pack.h"
+                          "stb_vorbis.c"))
+              (substitute* "stb_rect_pack.c"
+                (("\"include\\/stb_rect_pack\\.h\"") "<stb_rect_pack.h>"))
+              (substitute* "CMakeLists.txt"
+                (("include\\/stb_rect_pack\\.h ") "")))
+            ;; Find third party libraries from the system and do not add the
+            ;; deleted directories.
+            (substitute* "CMakeLists.txt"
+              (("add_subdirectory\\((glm|discord-rpc|xmp-lite|fmt|volk)\\)"
+                _ keep)
+               (string-append "find_package(" keep " REQUIRED)"))
+              (("xmp-lite") "libxmp")
+              ((".*nlohmann-json.*") "")
+              ((".*tcbrindle_span.*") "")
+              ((".*vulkan-headers.*") "")
+              ((".*vma.*") "")))
+          (with-directory-excursion "src"
+            ;; Link the system libraries instead of the unbundled ones.
+            (substitute* "CMakeLists.txt"
+              ((".*tcbrindle::span.*") "")
+              (("glm::glm") "glm")
+              (("xmp-lite::xmp-lite") "xmp")
+              (("fmt::fmt-header-only") "fmt")
+              ((".*nlohmann_json::nlohmann_json.*") "")))
+          ;; Rename the icon to match with the executable file.
+          (rename-file "srb2.png" "ringracers.png")))))
    (build-system cmake-build-system)
    (arguments
     (list
      #:tests? #f ;There are no tests.
      #:configure-flags
-      #~(list "-DCMAKE_C_FLAGS_RELWITHDEBINFO='-O3 -g -DNDEBUG'"
+      #~(list "-DSRB2_CONFIG_ENABLE_DISCORDRPC=OFF"
+              "-DCMAKE_C_FLAGS_RELWITHDEBINFO='-O3 -g -DNDEBUG'"
              "-DCMAKE_CXX_FLAGS_RELWITHDEBINFO='-O3 -g -DNDEBUG'")
      #:phases
      #~(modify-phases %standard-phases
-          (add-after 'install 'move-and-wrap-binary
-            ;; Install executable to $out/bin.
+          (add-after 'unpack 'copy-stb_vorbis.c
            (lambda* (#:key inputs #:allow-other-keys)
-              (with-directory-excursion #$output
-                (mkdir "bin")
-                (rename-file "ringracers" "bin/ringracers")
-                (wrap-program "bin/ringracers"
-                  `("RINGRACERSWADDIR" =
-                    (,(assoc-ref inputs "ring-racers-data"))))))))))
-    (native-inputs (list pkg-config))
-    (inputs (list glm
+              (install-file (search-input-file inputs "/stb_vorbis.c")
+                            "thirdparty/stb")))
+          (replace 'install
+            (lambda _
+              (install-file "bin/ringracers" (string-append #$output "/bin"))
+              (install-file "../source/ringracers.png"
+                            (string-append #$output "/share/pixmaps"))))
+          (add-after 'install 'wrap-program
+            (lambda* (#:key inputs #:allow-other-keys)
+              (wrap-program (string-append #$output "/bin/ringracers")
+                `("RINGRACERSWADDIR" =
+                  (,(assoc-ref inputs "ring-racers-data"))))))
+          (add-after 'wrap-program 'create-desktop-entry
+            (lambda _
+              (let* ((datadir (string-append #$output "/share"))
+                     (appdir (string-append datadir "/applications")))
+                (mkdir-p appdir)
+                (make-desktop-entry-file (string-append appdir
+                                                        "/ringracers.desktop")
+                  #:name "Dr. Robotnik's Ring Racers"
+                  #:comment "Technical kart racing game"
+                  #:icon "ringracers"
+                  #:exec (string-append #$output "/bin/ringracers")
+                  #:startup-notify #f
+                  #:categories '("Application" "Game"))))))))
+    (native-inputs
+     (list pkg-config
+           (package-source stb)))
+    (inputs (list bash-minimal
+                  curl
+                  fmt
+                  glm
                  libogg
                  libpng
                  libvorbis
                  libvpx
+                  libxmp
                  libyuv
+                  nlohmann-json
                  opus
                  ring-racers-data
                  sdl2
-                  zlib
-                  curl))
-    (home-page "https://kartkrew.org")
+                  stb-rect-pack
+                  tcbrindle-span
+                  vulkan-headers
+                  vulkan-memory-allocator
+                  vulkan-volk
+                  zlib))
+    (home-page "https://www.kartkrew.org/")
    (synopsis "Technical kart racing game")
    (description
-     "Dr. Robotnik's Ring Racers is a kart racing game drawing inspiration from
-``anti-gravity'' racers, fighting games, and traditional-style kart racing.
-Ring Racers is designed with an emphasis on player agency in the face of highly
-technical game-play challenges in both single-player and online multiplayer
-modes.")
+     "Dr.@: Robotnik's Ring Racers is a kart racing game drawing inspiration
+from \"anti-gravity\" racers, fighting games, and traditional-style kart
+racing.  Ring Racers is designed with an emphasis on player agency in the face
+of highly technical game-play challenges in both single-player and online
+multiplayer modes.")
    (license license:gpl2+)))

 (define-public unknown-horizons
@@ -5713,14 +5797,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define-public openttd-engine
  (package
    (name "openttd-engine")
-    (version "15.2")
+    (version "15.3")
    (source
     (origin (method url-fetch)
             (uri (string-append "https://cdn.openttd.org/openttd-releases/"
                                 version "/openttd-" version "-source.tar.xz"))
             (sha256
              (base32
-               "0xpzschcf562giqh3p8jj9gbi8chqrikdwgqqipabyn0nwbvd6nj"))))
+               "1rrvjxsr2dp9zr6b35ifiw41c0dwqqcaq90r0x18misrgpm1x8jy"))))
    (build-system cmake-build-system)
    (inputs
     (list allegro
@@ -5954,7 +6038,7 @@ Transport Tycoon Deluxe.")
  (package
    (inherit openttd)
    (name "openttd-jgrpp")
-    (version "0.71.1")
+    (version "0.72.0")
    (source
     (origin
       (method git-fetch)
@@ -5963,7 +6047,7 @@ Transport Tycoon Deluxe.")
             (commit (string-append "jgrpp-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1cy1ghc1mc61hdz8lykx2ggs5nld30jdgj8y4vdli2v1ffhy7xy9"))))
+        (base32 "0xbnnx03y8vhbgi6s7hsxhiqhsy6rhj7fypq6dfqh0z74m5bldkf"))))
    (inputs (modify-inputs inputs
              (append zstd harfbuzz)))
    (arguments
@@ -10141,7 +10225,7 @@ their own levels.")
 (define-public libmanette
  (package
    (name "libmanette")
-    (version "0.2.12")
+    (version "0.2.13")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/libmanette/"
@@ -10149,7 +10233,7 @@ their own levels.")
                                  "libmanette-" version ".tar.xz"))
              (sha256
               (base32
-                "1n513s8ksjbrwqq7k46f3550avx11gly3a85shsdrwc0f4k4kcs8"))))
+                "1bnqfxd9b5vff9256f8vxd404fkvbvc5gxva6qcjj2fyw3yw4z18"))))
    (build-system meson-build-system)
    (native-inputs
     (list `(,glib "bin") ; for glib-compile-resources
@@ -425,14 +425,29 @@ hierarchical hexagonal geospatial indexing system")
               (base32
                "00qdk9a4048pzfj2rhzkfw3lvm642znf6kr4x29i3d94494pxsnn"))))
    (build-system cmake-build-system)
-    (arguments `(#:phases
-                 (modify-phases %standard-phases
-                   (add-after
-                    'unpack 'patch-test-shebangs
-                    (lambda _
-                      (substitute* '("tests/xmltester/testrunner.sh"
-                                     "tests/xmltester/safe_to_xml.sh")
-                        (("/bin/sh") (which "sh"))))))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ,@(if (or (target-x86-32?) (target-arm32?))
+               '((add-after 'unpack 'disable-broken-tests
+                   (lambda _
+                     ;; This test fails due to limited accuracy.
+                     (delete-file "tests/xmltester/tests/general/TestCentroid.xml")
+                     (with-directory-excursion "tests/unit"
+                       ;; These also fail due to limited accuracy.
+                       (delete-file "algorithm/MinimumAreaRectangleTest.cpp")
+                       (delete-file "capi/GEOSMinimumRotatedRectangleTest.cpp")
+                       ;; It is unclear why these fail, but I'm guessing:
+                       ;; limited accuracy.
+                       (delete-file "linearref/LengthIndexedLineTest.cpp")
+                       (delete-file "math/DDTest.cpp")))))
+               '())
+         (add-after
+             'unpack 'patch-test-shebangs
+           (lambda _
+             (substitute* '("tests/xmltester/testrunner.sh"
+                            "tests/xmltester/safe_to_xml.sh")
+               (("/bin/sh") (which "sh"))))))))
    (inputs
     (list glib))
    (home-page "https://libgeos.org/")
@@ -955,6 +970,29 @@ hydrology and waste deposition.")
        (base32
         "03r6mspfv22fs4x4jcgv25v9gsj5k6zy8incvyf94qf50g47s2bc"))))
    (build-system cmake-build-system)
+    (arguments
+     (if (target-32bit?)
+         (list
+          #:phases
+          '(modify-phases %standard-phases
+             (add-after 'unpack 'patch-tests
+               (lambda _
+                 ;; These regression tests fail due to accuracy problems.
+                 (substitute* "test/unit/test_factory.cpp"
+                   (("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 (substitute* "test/unit/test_grids.cpp"
+                   (("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 (substitute* "test/unit/test_defmodel.cpp"
+                   (("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 ;; These regression tests fail due to accuracy problems.
+                 (substitute* "test/CMakeLists.txt"
+                   (("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
+                   (("proj_add_gie_test\\(\"Builtins\".+") "")
+                   (("proj_add_gie_test\\(\"peirce_q\".+") ""))))))
+         '()))
    (native-inputs (list googletest pkg-config))
    (propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc
    (home-page "https://proj.org/")
@@ -984,7 +1022,34 @@ lets developers use the functionality of Proj in their own software.")
                           version ".tar.gz"))
       (sha256
        (base32
-         "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))))
+         "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))
+    (arguments
+     (if (target-32bit?)
+         (list
+          #:phases
+          '(modify-phases %standard-phases
+             (add-after 'unpack 'patch-tests
+               (lambda _
+                 ;; These regression tests fail due to accuracy problems.
+                 (substitute* "test/unit/test_factory.cpp"
+                   (("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 (substitute* "test/unit/test_grids.cpp"
+                   (("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 (substitute* "test/unit/test_defmodel.cpp"
+                   (("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 ;; These regression tests fail due to accuracy problems.
+                 (substitute* "test/CMakeLists.txt"
+                   (("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
+                   (("proj_add_gie_test\\(\"Builtins\".+") "")
+                   (("proj_add_gie_test\\(\"peirce_q\".+") "")
+                   (("proj_add_gie_test\\(\"adams_ws2\".+") ""))
+                 (substitute* "test/cli/CMakeLists.txt"
+                   (("proj_add_test_script_sh\\(\"testvarious\" CS2CS_BIN\\)") ""))))))
+         '()))))
+

 (define-public python-obspy
  (package
@@ -1219,20 +1284,23 @@ readily with other Python GIS packages such as pyproj, Rtree, and Shapely.")
 (define-public python-geopack
  (package
    (name "python-geopack")
-    (version "1.0.10")
+    (version "1.0.12")
    (source
     (origin
-       (method url-fetch)
-       (uri (pypi-uri "geopack" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/tsssss/geopack")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
       (sha256
-        (base32 "0mryjp7m4h99qlpvnn40s81sygr73qcv8rkmjp9pcli1gz829kjf"))))
+        (base32 "0ap5j4359xxjkbz06y097yq5d37sxcwlnlsfwrv6dvza7ydmgcgg"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      ;; XXX Reported upstream <https://github.com/tsssss/geopack/issues/21>.
      #:tests? #f))
    (native-inputs
-     (list python-pytest python-setuptools python-wheel))
+     (list python-setuptools))
    (propagated-inputs
     (list python-numpy python-scipy))
    (home-page "https://github.com/tsssss/geopack")
@@ -50,15 +50,15 @@
 (define-public lcms
  (package
    (name "lcms")
-    (version "2.13.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/lcms/lcms/"
-                                  (version-major+minor version)
-                                  "/lcms2-" version ".tar.gz"))
-              (sha256
-               (base32
-                "121v414bg2zk0fcwx0kigr2l6nxl88nmblfn3gq5lz5jwybffwyl"))))
+    (version "2.16.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/lcms/lcms/"
+                           (version-major+minor version)
+                           "/lcms2-" (version-major+minor version) ".tar.gz"))
+       (sha256
+        (base32 "0lasskcj7k0sp0z7cpnwwisp826j51i1l7v322hcxd5rv15d6wyq"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags '("--disable-static")))
@@ -73,19 +73,8 @@ Consortium standard (ICC), approved as ISO 15076-1.")
    (home-page "https://www.littlecms.com/")
    (properties '((cpe-name . "little_cms_color_engine")))))

-(define-public lcms-next
-  (package
-    (inherit lcms)
-    (name "lcms-next")
-    (version "2.16.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/lcms/lcms/"
-                           (version-major+minor version)
-                           "/lcms2-" (version-major+minor version) ".tar.gz"))
-       (sha256
-        (base32 "0lasskcj7k0sp0z7cpnwwisp826j51i1l7v322hcxd5rv15d6wyq"))))))
+;; Can be removed after 2027/05/01.
+(define-deprecated-package lcms-next lcms)

 (define-public libpaper
  (package
@@ -994,7 +994,7 @@ useful for C++.")
 (define-public python-pygobject
  (package
    (name "python-pygobject")
-    (version "3.54.3")
+    (version "3.54.5")
    (source
     (origin
       (method url-fetch)
@@ -1003,7 +1003,7 @@ useful for C++.")
                           "/pygobject-" version ".tar.gz"))
       (sha256
        (base32
-         "1rxsj85xl73a14vz7s30sy8lx9sswd2j2hgj3i4mcz8g989hknm8"))))
+         "11dm5yi80v143dn21bayqxb53w67hk1lishmrw35c97m91inyrdn"))))
    (build-system meson-build-system)
    ;; The tests require mutter, which would introduce a circular dependency.
    (arguments (list #:tests? #f))
@@ -682,7 +682,7 @@ and a high score table.")
 (define-public komikku
  (package
    (name "komikku")
-    (version "50.1.0")
+    (version "50.3.0")
    (source
     (origin
       (method git-fetch)
@@ -692,7 +692,7 @@ and a high score table.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
+         "0hm1infvdsms193g2yp7qw7lrsxjsx5zziib8hgch34y6dbhfhf1"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -780,7 +780,7 @@ developed with the aim of being used with the Librem 5 phone.")
 (define-public komikku-servers
  (package
    (name "komikku-servers")
-    (version "50.1.0")
+    (version "50.3.0")
    (source
     (origin
       (method git-fetch)
@@ -790,7 +790,7 @@ developed with the aim of being used with the Librem 5 phone.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
+         "0hm1infvdsms193g2yp7qw7lrsxjsx5zziib8hgch34y6dbhfhf1"))))
    (build-system copy-build-system)
    (arguments
     (list
@@ -215,6 +215,7 @@
  #:use-module (gnu packages readline)
  #:use-module (gnu packages ruby-xyz)
  #:use-module (gnu packages rust)
+  #:use-module (gnu packages rust-apps)
  #:use-module (gnu packages samba)
  #:use-module (gnu packages scanner)
  #:use-module (gnu packages sdl)
@@ -2084,7 +2085,7 @@ offline sources, providing a centralized place for managing your contacts.")
 (define-public gnome-desktop
  (package
    (name "gnome-desktop")
-    (version "44.4")
+    (version "44.5")
    (source
     (origin
       (method url-fetch)
@@ -2093,11 +2094,16 @@ offline sources, providing a centralized place for managing your contacts.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-         "1129nh32ga5vv869fwby3n2lvj2chd9wys8j1jdnisr8lg3bk30x"))))
+         "0br33ma7l45nr8yp9bcjqgy9zrj57yy2fnkc0b0yh0rsdrd9kq10"))))
    (build-system meson-build-system)
    (arguments
     '(#:phases
       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-problematic-tests
+           (lambda _
+             ;; The languages test fails due to Guix defaulting to C.UTF-8.
+             (substitute* "tests/meson.build"
+               ((".*'languages':.*") ""))))
         (add-before 'configure 'patch-path
           (lambda* (#:key inputs #:allow-other-keys)
             (substitute* "libgnome-desktop/gnome-languages.c"
@@ -2687,7 +2693,7 @@ and single page document formats like PDF and DejaVu.")
 (define-public gsettings-desktop-schemas
  (package
    (name "gsettings-desktop-schemas")
-    (version "48.0")
+    (version "49.1")
    (source
     (origin
       (method url-fetch)
@@ -2696,7 +2702,7 @@ and single page document formats like PDF and DejaVu.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-         "1lqv5mn7r1c8nxm6dfxgvk56r2sqfgafkj5jm1jzh65z2dc1b3z6"))))
+         "0qqfxml3kqg87ly5w8rhqalin6qv20jcn2gqkdmhga75sn1pyykp"))))
    (build-system meson-build-system)
    (arguments
     `(#:phases (modify-phases %standard-phases
@@ -2874,7 +2880,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
 (define-public adwaita-icon-theme
  (package
    (name "adwaita-icon-theme")
-    (version "48.1")
+    (version "49.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -2882,7 +2888,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-                "04kfi8qpvghhmj83p03k509pnsp8ywlrii1qm0xv056dxf39pznb"))))
+                "0p3mj6bl8wp1cri2qdszqrqqs47irh7qvajr5yaaly5js5hn85k5"))))
    (build-system meson-build-system)
    (arguments
     (list #:phases
@@ -3221,6 +3227,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
    (build-system meson-build-system)
    (arguments
     (list
+      #:glib-or-gtk? #t
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'skip-gtk-update-icon-cache
@@ -3228,17 +3235,13 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
            (lambda _
              (substitute* "meson_post_install.py"
                (("gtk-update-icon-cache") "true"))))
-
-          #$@(if (this-package-input "gjs")
-                 '()
-                 '((add-after 'unpack 'skip-gjs-test
-                     (lambda _
-                       ;; When the optional dependency on GJS is missing, skip
-                       ;; the GJS plugin tests.
-                       (substitute* "tests/modules.c"
-                         (("g_test_add.*JavaScript.*" all)
-                          (string-append "// " all "\n")))
-                       (delete-file "tests/catalogs/gjsplugin.xml")))))
+          (add-after 'unpack 'skip-modules-test
+            ;; This test fails with 'GLib-GObject-FATAL-CRITICAL: cannot
+            ;; register existing type 'GIRepository' since the GNOME 49
+            ;; upgrades.
+            (lambda _
+              (substitute* "tests/meson.build"
+                ((".*'modules', .*") ""))))
          (add-before 'check 'pre-check
            (lambda _
              (setenv "HOME" "/tmp")
@@ -3494,7 +3497,7 @@ XML/CSS rendering engine.")
 (define-public libgsf
  (package
    (name "libgsf")
-    (version "1.14.54")
+    (version "1.14.55")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -3502,7 +3505,7 @@ XML/CSS rendering engine.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-                "08vny43clswk95djch50z17hdnns2p8qc93if6qcy4r598k6k26i"))))
+                "0c91l0l3camxpanpgp634nd68vz3v0jbk9bxs5dfmlsvl6xhmmkl"))))
    (build-system glib-or-gtk-build-system)
    (outputs '("out" "bin" "doc"))
    (arguments
@@ -3550,7 +3553,7 @@ for dealing with different structured file formats.")
 (define-public librsvg
  (package
    (name "librsvg")
-    (version "2.58.5")
+    (version "2.61.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/librsvg/"
@@ -3558,45 +3561,31 @@ for dealing with different structured file formats.")
                                  "librsvg-" version ".tar.xz"))
              (sha256
               (base32
-                "0ym2yg94sc7ralh1kwqqrhz3wcc51079z90mbx0qrls7wfh36hi2"))))
-    (build-system gnu-build-system)
+                "036afbhd2h4brbd491kmgig0ib1df3s7j9bx8349b3zjs4lfm87w"))))
+    (build-system meson-build-system)
    (outputs '("out" "doc" "debug"))
    (arguments
     (list
      #:configure-flags
-      #~(list "--disable-static"
-              #$@(if (%current-target-system)
-                     #~(;; g-ir-scanner can't import its modules
+      #~(list #$@(if (%current-target-system)
+                     #~( ;; g-ir-scanner can't import its modules
                        ;; and vala currently can't be cross-compiled.
-                        "--enable-introspection=no"
-                        "--enable-vala=no"
-                        ;; These two are necessary for cross-compiling.
-                        (string-append
-                         "--build=" #$(nix-system->gnu-triplet
-                                       (%current-system)))
-                        (string-append
-                         "--host=" #$(%current-target-system))
+                        "-Dintrospection=false"
+                        "-Dvala=false"
                        ;; This is needed when cross-compiling for some
                        ;; architectures as autoconf and rust disagree about
                        ;; the target triplet.
-                        (string-append "RUST_TARGET="
+                        (string-append "-Dtriplet="
                                       #$(platform-rust-target
                                          (lookup-platform-by-target
                                           (%current-target-system)))))
-                     #~("--enable-vala")))
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              (string-append "PKG_CONFIG=" #$(pkg-config-for-target))
-              #$@(if (%current-target-system)
-                     #~((string-append "RUST_TARGET="
-                                       #$(platform-rust-target
-                                          (lookup-platform-by-target
-                                           (%current-target-system)))))
-                     #~()))
-      #:imported-modules %cargo-build-system-modules
+                     #~())
+              "-Dpixbuf-loader=enabled") ;disabled since 2.61.2
+      #:imported-modules (append %cargo-build-system-modules
+                                 %meson-build-system-modules)
      #:modules
      '(((guix build cargo-build-system) #:prefix cargo:)
-        (guix build gnu-build-system)
+        (guix build meson-build-system)
        (guix build utils))
      #:phases
      #~(modify-phases %standard-phases
@@ -3613,12 +3602,19 @@ for dealing with different structured file formats.")
            (lambda _
              ;; Something about the build environment resists building
              ;; successfully with the '--locked' flag.
-              (substitute* '("Makefile.am" "Makefile.in")
-                (("--locked") ""))))
-          (add-after 'unpack 'loosen-test-boundaries
+              (substitute* "meson/cargo_wrapper.py"
+                (("\"--locked\",?") ""))
+              ;; This is needed so Cargo embeds the correct RUNPATH
+              ;; information to the binaries it produces,
+              ;; e.g. libpixbufloader_svg.so.
+              (setenv "RUSTFLAGS"
+                      (string-append "-C link-arg=-Wl,-rpath,"
+                                     #$output "/lib"))))
+          (add-after 'unpack 'prepare-for-tests
            (lambda _
+              (setenv "HOME" "/tmp")    ;placate fontconfig errors
              ;; Increase reftest tolerance a bit to account for different
-              ;; harfbuzz, pango, etc.
+              ;; libraries like pango, etc.
              (setenv "RSVG_TEST_TOLERANCE" "20")
              ;; These tests fail even after loosening the tolerance.
              (substitute* "rsvg/tests/reference.rs"
@@ -3626,19 +3622,16 @@ for dealing with different structured file formats.")
                ((".*rtl_tspan_svg.*") ""))))
          (add-before 'configure 'pre-configure
            (lambda* (#:key outputs #:allow-other-keys)
-              (substitute* "gdk-pixbuf-loader/Makefile.in"
+              (substitute* "gdk-pixbuf-loader/meson.build"
                ;; By default the gdk-pixbuf loader is installed under
                ;; gdk-pixbuf's prefix.  Work around that.
-                (("gdk_pixbuf_moduledir = .*$")
-                 (string-append "gdk_pixbuf_moduledir = "
-                                "$(prefix)/"
-                                #$(dirname %gdk-pixbuf-loaders-cache-file) "/"
-                                "loaders\n")))
-              (substitute* "configure"
-                (("gdk_pixbuf_cache_file=.*")
-                 (string-append "gdk_pixbuf_cache_file="
-                                #$output "/"
-                                #$%gdk-pixbuf-loaders-cache-file "\n")))))
+                (("pixbuf_dep.get_variable.*'gdk_pixbuf_moduledir'.*),")
+                 (format #f "get_option('prefix') / '~a',"
+                         #$%gdk-pixbuf-loaders-directory))
+                (("pixbuf_dep.get_variable.*'gdk_pixbuf_query_loaders'.*),")
+                 (format #f "'~a'," (which "gdk-pixbuf-query-loaders")))
+                (("pixbuf_dep.get_variable.*'gdk_pixbuf_cache_file'.*)")
+                 (format #f "prefix / '~a'" #$%gdk-pixbuf-loaders-cache-file)))))
          (add-after 'unpack 'prepare-cargo-build-system
            (lambda args
              (for-each
@@ -3650,23 +3643,30 @@ for dealing with different structured file formats.")
               '(unpack-rust-crates
                 configure
                 check-for-pregenerated-files
-                 patch-cargo-checksums)))))))
+                 patch-cargo-checksums))))
+          (add-after 'install 'sanitize-pkg-config-files
+            (lambda _
+              (substitute* (find-files #$output "\\.pc$")
+                (("^Requires.private:.*") "")))))))
    (native-inputs
     (append
      (list gdk-pixbuf
+            gi-docgen
            `(,glib "bin")
            gobject-introspection
            pkg-config
+            python
+            python-docutils             ;for rst2man
            rust
-            `(,rust "cargo")
+            rust-cargo-c
            vala)
      (or (and=> (%current-target-system)
                 (compose list make-rust-sysroot))
          '())))
    (inputs
-     (cons* freetype
+     (cons* dav1d
+            freetype
            gobject-introspection
-            harfbuzz
            libxml2
            pango
            (cargo-inputs 'librsvg)))
@@ -4667,7 +4667,7 @@ and RDP protocols.")
 (define-public dconf
  (package
    (name "dconf")
-    (version "0.40.0")
+    (version "0.49.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -4676,7 +4676,7 @@ and RDP protocols.")
                    name "-" version ".tar.xz"))
              (sha256
               (base32
-                "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg"))))
+                "0dkc7nbd0byibf6i5gm9xqclr7i94n1p1qbqcnwxnml1lm4px90n"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -4685,7 +4685,8 @@ and RDP protocols.")
      ;; there and loaded without having to set GCONF_PROFILE, which cannot be
      ;; safely set globally (as a gconf profile is a per-user thing).
      #:configure-flags #~(list "--sysconfdir=/etc"
-                                "-Dgtk_doc=true")
+                                "-Dgtk_doc=true"
+                                "--wrap-mode=nodownload") ;for gvdb
      #:phases #~(modify-phases %standard-phases
                   (add-after 'unpack 'increase-test-timeout
                     (lambda _
@@ -5211,17 +5212,26 @@ and other secrets.  It communicates with the \"Secret Service\" using DBus.")
 (define-public gi-docgen
  (package
    (name "gi-docgen")
-    (version "2025.4")
+    (version "2026.1")
    (source (origin
              (method url-fetch)
              (uri (pypi-uri "gi_docgen" version))
              (sha256
               (base32
-                "1i9dlwirizc0n5sw9w60yscaj14x9x06fdq64kwxqkia13d6dq3z"))))
+                "1df7yb6d5zsr4wks4p2lf40a2v4v2dasx3pv2v3d2ma25d7krb35"))))
    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-pytest-bootstrap
-           python-setuptools))
+    (arguments
+     (list
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-commands
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* '("gidocgen/config.py"
+                                      "gidocgen/utils.py")
+                         (("find_program\\(['\"]dot['\"])")
+                          (format #f "find_program(~s)"
+                                  (search-input-file inputs "bin/dot")))))))))
+    (native-inputs (list python-pytest-bootstrap python-setuptools))
+    (inputs (list graphviz-14))
    (propagated-inputs (list python-jinja2
                             python-markdown
                             python-markupsafe
@@ -6978,10 +6988,10 @@ side panel;
    (license license:gpl2+)))

 ;; Also update (@ (gnu packages rust-sources) rust-glycin-3) when updating this.
-(define-public glycin-loaders
+(define-public libglycin
  (package
-    (name "glycin-loaders")
-    (version "2.0.7")
+    (name "libglycin")
+    (version "2.1.1")
    (source
     (origin
       (method git-fetch)
@@ -6991,12 +7001,16 @@ side panel;
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0v6szxk5h8a4b28xb0lrhqrq6b4vka2ha4qgpdp35f6c49v9pdyp"))
+         "1mrv733xhbxydww4szskv7jc0hif908aavh8h4kjcxp0zgy13blf"))
       (patches (search-patches "glycin-sandbox-Adapt-bwrap-invocation.patch"))))
    (outputs '("out" "debug"))
    (build-system meson-build-system)
    (arguments
     (list
+      #:configure-flags #~(list "-Dglycin-loaders=false"
+                                "-Dglycin-thumbnailer=true"
+                                "-Dlibglycin=true"
+                                "-Dlibglycin-gtk4=true")
      #:imported-modules `(,@%meson-build-system-modules
                           ,@%cargo-build-system-modules)
      #:modules `(((guix build cargo-build-system) #:prefix cargo:)
@@ -7082,18 +7096,15 @@ side panel;
                           (method git-fetch)
                           (uri (git-reference
                                  (url "https://gitlab.gnome.org/sophie-h/test-images.git")
-                                  (commit "b148bcf70847d6f126a8e83e27e1c59d2e474adf")))
+                                  (commit "b3a107267cc4f1d136b7007938556250ce06fc4f")))
                           (file-name "glycin-test-images")
                           (sha256
                            (base32
-                             "16s3lss4cbny5d0ixhc0vaxxcvq2n7rcnbklrxdm84p2m21192vm")))))
+                             "1jvra75kjqkndxzzpmi5lb8d3q4fi3yc4hha0r1g9brdsnbhsp6f")))))
    (inputs (cons* bubblewrap
-                   libheif
-                   libjxl
-                   librsvg
                   (cargo-inputs 'glycin)))
    ;; The following inputs are 'Required' in the pkg-config files.
-    (propagated-inputs (list fontconfig glib gtk lcms-next libseccomp))
+    (propagated-inputs (list fontconfig glib gtk lcms libseccomp))
    (home-page "https://gitlab.gnome.org/GNOME/glycin")
    (synopsis "Rust library for sandboxed image decoding")
    (description "Glycin is a sandbox image decoder for image viewers and
@@ -7101,6 +7112,22 @@ thumbnails to display untrusted content safely.  This package provides the
 runtime image loader executables that are used inside the sandbox.")
    (license (list license:mpl2.0 license:lgpl2.1+))))

+(define-public glycin-loaders
+  (package/inherit libglycin
+    (name "glycin-loaders")
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:configure-flags original-flags #~(list))
+        #~(list "-Dglycin-loaders=true"
+                "-Dglycin-thumbnailer=false"
+                "-Dlibglycin=false"
+                "-Dlibglycin-gtk4=false"))))
+    (inputs
+     (modify-inputs inputs
+       (prepend libheif
+                libjxl
+                librsvg)))))
+
 (define-public loupe
  (package
    (name "loupe")
@@ -7171,6 +7198,7 @@ runtime image loader executables that are used inside the sandbox.")
            gtk
            lcms
            libadwaita
+            libglycin
            libgweather
            libseccomp
            (cargo-inputs 'loupe)))
@@ -7211,14 +7239,14 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
 (define-public msgraph
  (package
    (name "msgraph")
-    (version "0.3.3")
+    (version "0.3.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/msgraph/"
                                  (version-major+minor version) "/"
                                  "msgraph-" version ".tar.xz"))
              (sha256
-               (base32 "04j00lf0aqiccgbg95jh9sxmx48bgsrg110ilap9014r58py3mrp"))))
+               (base32 "1iyn0jdqgw238cxaxvji0v9ds0xwfzffz65xpgzywcibn3kfqc87"))))
    (build-system meson-build-system)
    (native-inputs (list gi-docgen gobject-introspection pkg-config uhttpmock))
    (inputs (list gnome-online-accounts json-glib libsoup librest))
@@ -7231,7 +7259,7 @@ MS Graph APIs.")
 (define-public gvfs
  (package
    (name "gvfs")
-    (version "1.58.0")
+    (version "1.58.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/gvfs/"
@@ -7239,7 +7267,7 @@ MS Graph APIs.")
                                  "gvfs-" version ".tar.xz"))
              (sha256
               (base32
-                "0bqq9z1y31yk3c8wz8i8fql7dr8cfxsd5a49xc4v7z6hfdlf76yx"))))
+                "0fywnla2xwyi44jfipyixcczxh5h34c4lzfzf9lsgzxip9mpslzw"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -7589,7 +7617,7 @@ environments.")
 (define-public yelp-xsl
  (package
    (name "yelp-xsl")
-    (version "42.4")
+    (version "49.0")
    (source
     (origin
       (method url-fetch)
@@ -7598,7 +7626,7 @@ environments.")
                       (version-major version) "/"
                       name "-" version ".tar.xz"))
       (sha256
-        (base32 "1lfpmdc4y46a528q5filn6xs8add921avrnwl2vpysp6n9zb1szx"))))
+        (base32 "1v7va1xa80pyj0dyfraalvsag4m0lza4v87r2i7phyz6iy7kmm2r"))))
    (build-system meson-build-system)
    (native-inputs
     (list mallard-ducktype
@@ -7626,7 +7654,7 @@ jQuery.Syntax JavaScript libraries.")
 (define-public yelp
  (package
    (name "yelp")
-    (version "42.3")
+    (version "49.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -7634,7 +7662,7 @@ jQuery.Syntax JavaScript libraries.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-                "18w95bfhq3d364af1qqb63rgaixkrl7xk0x079x6m7lscwic9k16"))))
+                "0mrlqsbr2wb0k2p3dmywzdb0c0rzcx1dv6qlimxzx9ab3w5lwqg6"))))
    (build-system meson-build-system)
    (arguments
     (list #:phases
@@ -7659,7 +7687,9 @@ jQuery.Syntax JavaScript libraries.")
                     `("PATH" ":" prefix
                       (,(dirname (search-input-file inputs "bin/groff"))))))))))
    (native-inputs
-     (list `(,glib "bin") ; for glib-genmarshal, etc.
+     (list desktop-file-utils
+           `(,glib "bin")               ;for glib-genmarshal, etc.
+           `(,gtk "bin")
           intltool
           itstool
           pkg-config))
@@ -7668,13 +7698,14 @@ jQuery.Syntax JavaScript libraries.")
    (inputs
     (list bash-minimal
           gsettings-desktop-schemas
+           libadwaita
           libhandy
           libxslt
-           man-db                                 ;for URIs like "man:ls"
-           groff-minimal                          ;ditto
-           gtk+
+           man-db                       ;for URIs like "man:ls"
+           groff-minimal                ;ditto
+           gtk
           sqlite
-           webkitgtk-for-gtk3
+           webkitgtk
           yelp-xsl))
    (home-page "https://wiki.gnome.org/Apps/Yelp")
    (synopsis "GNOME help browser")
@@ -7963,57 +7994,88 @@ configuration program to choose applications starting on login.")
 (define-public gjs
  (package
    (name "gjs")
-    (version "1.84.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0rh1fkkb35aa1zrhzbizzxllkwc3snkw67i901in61ap6kgjw51m"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (substitute* "installed-tests/scripts/testCommandLine.sh"
-                    (("Valentín") "")
-                    (("☭") ""))
-                  (substitute* "modules/script/package.js"
-                    (("type_default_interface_ref")
-                     "type_default_interface_get"))))))
+    (version "1.88.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/" name "/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0ly43lcpafl0an3k4g4mvwrwvc78f0y91ckdi6qn13ky67rvk81h"))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet
+        #~(begin
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            (define (delete-all-but directory . preserve)
+              (with-directory-excursion directory
+                (let* ((pred (negate (cut member <>
+                                          (cons* "." ".." preserve))))
+                       (items (scandir "." pred)))
+                  (for-each (cut delete-file-recursively <>) items))))
+            (delete-all-but "subprojects"
+                            "gobject-introspection-tests")))))
    (build-system meson-build-system)
    (arguments
-     '(#:configure-flags '("-Dinstalled_tests=false")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'pre-check
-           (lambda _
-             ;; The test suite requires a running X server.
-             (system "Xvfb :1 &")
-             (setenv "DISPLAY" ":1")
-
-             ;; For the missing /etc/machine-id.
-             (setenv "DBUS_FATAL_WARNINGS" "0")
-             (setenv "HOME" (getcwd))))
-         (add-after 'unpack 'skip-failing-tests
-           (lambda _
-               ;; Expects to test against 2.84, but we're using 2.86.
-             (substitute* "installed-tests/js/testIntrospection.js"
-               (("const skip = imports.gi.versions.GioUnix !== '2\\.0';")
-                "const skip = true;"))))
-         (add-after 'install 'wrap-gi
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (wrap-program (string-append (assoc-ref outputs "out")
-                                          "/bin/gjs")
-               `("GI_TYPELIB_PATH" suffix
-                 (,(dirname
-                    (search-input-file
-                     inputs
-                     "lib/girepository-1.0/GObject-2.0.typelib"))
-                  ,(dirname
-                    (search-input-file
-                     inputs
-                     "lib/girepository-1.0/GIRepository-2.0.typelib"))))))))))
+     (list
+      #:modules '((guix build meson-build-system)
+                  (guix build utils)
+                  (ice-9 match))
+      #:configure-flags #~(list "-Dinstalled_tests=false")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'wrap-gi
+            (lambda* (#:key inputs #:allow-other-keys)
+              (wrap-program (string-append #$output "/bin/gjs")
+                `("GI_TYPELIB_PATH" suffix
+                  (,(dirname
+                     (search-input-file
+                      inputs
+                      "lib/girepository-1.0/GObject-2.0.typelib"))
+                   ,(dirname
+                     (search-input-file
+                      inputs
+                      "lib/girepository-1.0/GIRepository-2.0.typelib")))))))
+          (replace 'check
+            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+              (when tests?
+                ;; For the missing /etc/machine-id.
+                (setenv "DBUS_FATAL_WARNINGS" "0")
+                (setenv "HOME" (getcwd))
+                ;; In Guix, gobject-introspection is patched to always embed
+                ;; the absolute path of a typelib library; unfortunately it
+                ;; does this also for test typelibs not meant to be installed;
+                ;; work around it via temporary symlinks.
+                (let* ((test-libraries (find-files (getcwd)
+                                                   "\\.so(\\.[0-9]*)?$"))
+                       (test-library-links (map (lambda (x)
+                                                  (cons x (string-append
+                                                           #$output "/lib/"
+                                                           (basename x))))
+                                                test-libraries)))
+                  (for-each (match-lambda
+                              ((old . new)
+                               (symlink old new)))
+                            test-library-links)
+                  (invoke "xvfb-run" "--" "dbus-run-session"
+                          "meson" "test" "--print-errorlogs" "-t" "0"
+                          "-j" (if parallel-tests?
+                                   (number->string (parallel-job-count))
+                                   "1"))
+                  (for-each delete-file (map cdr test-library-links))))))
+          (add-after 'install 'delete-installed-tests
+            (lambda _
+              ;; Installed tests libraries are installed despite
+              ;; -Dinstalled_tests=false.
+              (delete-file-recursively
+               (string-append #$output "/libexec/installed-tests"))))
+          (add-after 'install 'sanitize-pkg-config-files
+            (lambda _
+              (substitute* (find-files #$output "\\.pc$")
+                (("^Requires.private:.*") "")))))))
    (native-inputs
     (list `(,glib "bin")               ;for glib-compile-resources
           pkg-config
@@ -8021,16 +8083,16 @@ configuration program to choose applications starting on login.")
           ;; For testing
           dbus
           dconf                        ;required to properly store settings
+           gtk+
+           sysprof
           util-linux
-           xorg-server-for-tests))
+           xvfb-run))
+    (inputs (list mozjs readline))
    (propagated-inputs
-     ;; These are all in the Requires.private field of gjs-1.0.pc.
-     ;; Check the version of mozjs required in meson.build.
-     (list cairo gobject-introspection mozjs-128))
-    (inputs
-     (list gtk+ readline))
+     ;; These are all in the Requires field of gjs-1.0.pc.
+     (list glib gobject-introspection))
    (synopsis "Javascript bindings for GNOME")
-    (home-page "https://wiki.gnome.org/Gjs")
+    (home-page "https://gitlab.gnome.org/GNOME/gjs")
    (description
     "Gjs is a javascript binding for GNOME.  It's mainly based on spidermonkey
 javascript engine and the GObject introspection framework.")
@@ -8352,7 +8414,7 @@ window manager.")
 (define-public gnome-online-accounts
  (package
    (name "gnome-online-accounts")
-    (version "3.54.9")
+    (version "3.56.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -8360,7 +8422,7 @@ window manager.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-                "10bwrc50aqaf7j3qabv7zpfnf2dmf9mwbmnjpgqfqsmny2ba80pb"))))
+                "1cv1l757g4iac39l0ccwvqhibyjdjhy9q8p86fp8mqs5mfnix0ra"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -9881,7 +9943,7 @@ easy, safe, and automatic.")
 (define-public tinysparql
  (package
    (name "tinysparql")
-    (version "3.9.2")
+    (version "3.10.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/tinysparql/"
@@ -9889,7 +9951,7 @@ easy, safe, and automatic.")
                                  "tinysparql-" version ".tar.xz"))
              (sha256
               (base32
-                "13mddmszrk4ihfwi5n67v5ykf01fmld4pkmw4881hphk4j807khl"))))
+                "0r824dz8szfwd2z95nk8ffkvwq0ayva0wa6n1railrxnkmw3wzss"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -10172,6 +10234,7 @@ through portals.")
           gst-plugins-base
           json-glib
           libadwaita
+           libglycin
           libportal
           libseccomp
           libselinux
@@ -10243,7 +10306,7 @@ is complete it provides a graphical representation of each selected folder.")
 (define-public gnome-backgrounds
  (package
    (name "gnome-backgrounds")
-    (version "48.2.1")
+    (version "49.0")
    (source
     (origin
       (method url-fetch)
@@ -10252,7 +10315,7 @@ is complete it provides a graphical representation of each selected folder.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-         "1n8ypmdgpp2hj7jsbpicha0d2pfnqbwmavcjfzlmr3qd5rxmn73a"))))
+         "1dgl8jxczx2cwszg07bhrjpcg2rywfcak2d5md20x84bwl6jdzh1"))))
    (build-system meson-build-system)
    (native-inputs (list gettext-minimal))
    (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
@@ -10317,7 +10380,7 @@ beautifying border effects.")
 (define-public dconf-editor
  (package
    (name "dconf-editor")
-    (version "45.0.1")
+    (version "49.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -10325,7 +10388,7 @@ beautifying border effects.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-                "1pa1k510qx4v0ywhqwpj3qfjyz8qiiis4565ghhydnpfg1v2k00i"))))
+                "16fkppclv7xzglfafqg8b9nd5cjqlfwlyci800gg7psivzxcra4h"))))
    (build-system meson-build-system)
    (arguments
     (list #:phases #~(modify-phases %standard-phases
@@ -10674,6 +10737,7 @@ playing media, scanning, and much more.")
                            system-config-printer
                            xdg-desktop-portal
                            xdg-user-dirs
+                            xdg-user-dirs-gtk
                            yelp
                            zenity))
   (description "This package provides a list of packages required for
@@ -11575,7 +11639,8 @@ accessibility infrastructure.")
                    name "-" version ".tar.xz"))
              (sha256
               (base32
-                "0sfs06f66dsibvnp87jshhs7n3f8shkn9x7j3ygpk8409za2n2xy"))))
+                "0sfs06f66dsibvnp87jshhs7n3f8shkn9x7j3ygpk8409za2n2xy"))
+              (patches (search-patches "orca-fix-gst-init-check-call.patch"))))
    (build-system meson-build-system)
    (arguments
     '(#:glib-or-gtk? #t
@@ -11593,10 +11658,7 @@ accessibility infrastructure.")
                   (pgrep (string-append
                           (assoc-ref inputs "procps") "/bin/pgrep")))
               (substitute* "src/orca/orca_modifier_manager.py"
-                 (("'xkbcomp'") (format #f "'~a'" xkbcomp)))
-               (substitute* "src/orca/debug.py"
-                 (("'pgrep %s'")
-                  (format #f "'~a %s'" pgrep)))
+                 (("\"xkbcomp\"") (format #f "'~a'" xkbcomp)))
               (substitute* "src/orca/orca_bin.py.in"
                 (("'pgrep -u %s -x orca'")
                  (format #f "'~a -u %s -x orca'" pgrep))))))
@@ -11627,6 +11689,7 @@ accessibility infrastructure.")
           `(,liblouis "python")
           procps                       ; for pgrep
           python
+           python-dbus
           python-pygobject-3.50
           python-pyatspi
           speech-dispatcher
@@ -13383,7 +13446,7 @@ GObject introspection bindings.")
 (define-public sysprof
  (package
    (name "sysprof")
-    (version "48.1")
+    (version "49.0")
    (source
     (origin
       (method url-fetch)
@@ -13391,7 +13454,7 @@ GObject introspection bindings.")
                           (version-major version) "/"
                           "sysprof-" version ".tar.xz"))
       (sha256
-        (base32 "1qmv76877vkw2ajfnc4cr8gw5qch5m32qm1fybig3vgizvymgwal"))))
+        (base32 "0y18535lymqv684n8aa2v601d61v6aj8f84690cq8p3q6yb1617z"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -13688,7 +13751,7 @@ Document Analysis and Recognition program.")
 (define-public libadwaita
  (package
    (name "libadwaita")
-    (version "1.8.2")
+    (version "1.8.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/libadwaita/"
@@ -13696,7 +13759,7 @@ Document Analysis and Recognition program.")
                                  "libadwaita-" version ".tar.xz"))
              (sha256
               (base32
-                "1cdda2sk1w5jmfkism8v6ihl03gs2s72klx7j230wx4i847nx6jq"))))
+                "074j59bz5zgnb7grw3clpwyxickw9268k6fj0980bw8gdxxvfayh"))))
    (build-system meson-build-system)
    (arguments
     `(#:phases
@@ -26,6 +26,7 @@
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
 ;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -971,10 +972,8 @@ passphrase when @code{gpg} is run and needs it.")))
           (lambda _
             (invoke "sh" "autogen.sh"))))))
    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("gettext" ,gettext-minimal)
-       ,@(package-native-inputs pinentry-tty)))
+     (modify-inputs native-inputs
+       (prepend autoconf automake gettext-minimal)))
    (inputs
     (modify-inputs inputs
       (prepend efl)))
@@ -106,355 +106,6 @@
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages time))

-(define-public mozjs
-  (package
-    (name "mozjs")
-    (version "140.3.0")
-    (source (origin
-              (method url-fetch)
-              ;; TODO: Switch to IceCat source once available on ftp.gnu.org.
-              (uri (string-append "https://ftp.mozilla.org/pub/firefox"
-                                  "/releases/" version "esr/source/firefox-"
-                                  version "esr.source.tar.xz"))
-              (sha256
-               (base32
-                "05i3czn3v2qnhir8apcphbqy7rmy1dn7kcwx5yyi2qvmjcyfpipg"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
-      #:modules `((guix build cargo-utils)
-                  ,@%default-gnu-modules)
-      #:test-target "check-jstests"
-      #:configure-flags
-      #~(list
-         ;; Disable debugging symbols to save space.
-         "--disable-debug"
-         "--disable-debug-symbols"
-         ;; This is important because without it gjs will segfault during the
-         ;; configure phase.  With jemalloc only the standalone mozjs console
-         ;; will work.
-         "--disable-jemalloc"
-         "--enable-tests"
-         "--enable-hardening"
-         "--enable-optimize"
-         "--enable-release"
-         "--enable-readline"
-         "--enable-rust-simd"
-         "--enable-shared-js"
-         "--with-system-icu"
-         "--with-system-nspr"
-         "--with-system-zlib"
-         "--with-intl-api")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'python-3.11-compatibility
-            (lambda _
-              (substitute* '("python/mozbuild/mozpack/files.py"
-                             "python/mozbuild/mozbuild/util.py"
-                             "python/mozbuild/mozbuild/action/process_define_files.py"
-                             "python/mozbuild/mozbuild/backend/base.py"
-                             "python/mozbuild/mozbuild/preprocessor.py")
-                (("\"rU\"") "\"r\""))))
-          (add-after 'patch-source-shebangs 'patch-cargo-checksums
-            (lambda _
-              (let ((null-hash
-                     "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
-                (for-each (lambda (file)
-                            (format #t "patching checksums in ~a~%" file)
-                            (substitute* file
-                              (("^checksum = \".*\"")
-                               (string-append "checksum = \"" null-hash "\""))))
-                          (find-files "." "Cargo\\.lock$"))
-                (for-each generate-all-checksums
-                          '("js" "third_party/rust")))))
-          (replace 'configure
-            (lambda* (#:key configure-flags #:allow-other-keys)
-              ;; The configure script does not accept environment variables as
-              ;; arguments.  It also must be run from a different directory,
-              ;; but not the root directory either.
-              (mkdir "run-configure-from-here")
-              (chdir "run-configure-from-here")
-              ;; Configure script writes to $HOME.
-              (setenv "HOME" (getcwd))
-              (setenv "SHELL" (which "sh"))
-              (setenv "CONFIG_SHELL" (which "sh"))
-              (setenv "AUTOCONF" (which "autoconf"))
-              (apply invoke "python" "../configure.py"
-                     "--enable-project=js"
-                     (string-append "--prefix=" #$output)
-                     configure-flags)))
-          (add-before 'check 'adjust-tests
-            (lambda _
-              (with-directory-excursion "../js/src/tests"
-                (substitute* "shell/os.js"
-                  ;; FIXME: Why does the killed process have an exit status?
-                  ((".*killed process should not have exitStatus.*")
-                   ""))
-
-                ;; Most of the timezone related failures are probably
-                ;; attributable to our use of a system-provided icu4c library
-                ;; instead of the bundled one.
-                (for-each
-                 delete-file
-                 '( ;; FIXME: An one-hour difference is produced after DST
-                   ;; starting in the timezone the test suite uses.
-                   "non262/Date/15.9.5.7.js"
-
-                   ;; The test suite expects a lightly patched ICU.  Disable tests
-                   ;; that do not work with the system version.  See
-                   ;; "intl/icu-patches" for clues.
-
-                   ;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
-                   ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
-                   ;; related patch for why this is failing.
-                   "non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js"
-                   ;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
-                   "non262/Intl/DateTimeFormat/day-period-hour-cycle.js"
-                   ;; FIXME: got "en-US-posix", expected "en-US-POSIX".
-                   "non262/Intl/available-locales-supported.js"
-                   ;; FIXME: got "en-US", expected "en-US-POSIX"
-                   "non262/Intl/available-locales-resolved.js"
-
-;;; Since 115:
-                   ;; Mismatching array lengths
-                   "non262/Intl/supportedValuesOf-timeZones-canonical.js"
-                   ;; TODO: tzdata 2024a expected – find a way to regenerate
-                   ;; these generated tests
-                   "non262/Intl/DateTimeFormat/timeZone_version.js"
-
-                   ;; FIXME: got "\uD840\uDDF2", expected "\u5047"
-                   "non262/Intl/Collator/implicithan.js"
-                   ;; FIXME: got "\uD840\uDDF2", expected "\u3467"
-                   "non262/Intl/Collator/big5han-gb2312han.js"
-
-                   ;; Since 128:
-                   ;; FIXME: got (void 0), expected "GMT"
-                   "non262/Intl/DateTimeFormat/formatRange-timeZoneName-matches-format.js"
-                   ;; FIXME: got 7, expected 9: parts count mismatch
-                   "non262/Intl/DateTimeFormat/formatRange-timeZone-offset.js"
-                   "non262/Intl/DateTimeFormat/formatRange-timeZoneName.js"
-
-                   ;; Since 140:
-                   ;; RangeError: invalid time zone: America/Coyhaique
-                   "non262/Temporal/ZonedDateTime/zones-and-links.js"
-                   ;; got 2042, expected 2043
-                   "non262/Temporal/Intl/consistent-dates.js"
-                   ;;  got "Pacific/Auckland", expected "Antarctica/McMurdo"
-                   "non262/Intl/DateTimeFormat/timeZone_links.js"
-                   "test262/staging/sm/Temporal/ZonedDateTime/zones-and-links.js"
-                   ;; Test262Error: Expected true but got false
-                   "test262/staging/Intl402/Temporal/old/zoneddatetime-dst-corner-cases.js"
-                   ;; Test262Error: getTimeZoneTransition(next) does not return its input
-                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
-getTimeZoneTransition/result-type.js"
-                   ;; Expected SameValue («1912-01-01T00:16:08+00:00[Africa/Abidjan]», «null»
-                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
-getTimeZoneTransition/transition-at-instant-boundaries.js"
-                   ;; Expected SameValue(«1762063200000000000n», «1572760800000000000n»
-                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
-getTimeZoneTransition/specific-tzdb-values.js"
-                   ;; Expected SameValue(«"2025-03-30T03:00:00+02:00[Europe/Berlin]"»,
-                   ;; «"2020-10-25T02:00:00+01:00[Europe/Berlin]"»
-                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
-getTimeZoneTransition/nanoseconds-subtracted-or-added-at-dst-transition.js"
-                   ;; TypeError: can't access property "epochNanoseconds",
-                   ;; before.getTimeZoneTransition(...) is null
-                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
-getTimeZoneTransition/transitions-close-together.js")))))
-          (add-before 'check 'pre-check
-            (lambda _
-              (setenv "JSTESTS_EXTRA_ARGS"
-                      (string-join
-                       (list
-                        ;; Do not run tests marked as "random".
-                        "--exclude-random"
-                        ;; Exclude web platform tests.
-                        "--wpt=disabled"
-                        ;; Respect the daemons configured number of jobs.
-                        (string-append "--worker-count="
-                                       (number->string (parallel-job-count)))))))))))
-    (native-inputs
-     (list autoconf
-           llvm                         ;for llvm-objdump
-           m4
-           perl
-           pkg-config
-           python-wrapper
-           rust
-           `(,rust "cargo")
-           rust-cbindgen))
-    (inputs
-     (list icu4c-77 readline zlib))
-    (propagated-inputs
-     (list nspr))                ; in the Requires.private field of mozjs-*.pc
-    (home-page
-     "https://spidermonkey.dev/")
-    (synopsis "Mozilla JavaScript engine")
-    (description "SpiderMonkey is Mozilla's JavaScript engine written
-in C/C++.")
-    (license license:mpl2.0))) ; and others for some files
-
-(define-public mozjs-128
-  (package
-    (inherit mozjs)
-    (version "128.3.1")
-    (source (origin
-              (method url-fetch)
-              ;; TODO: Switch to IceCat source once available on ftp.gnu.org.
-              (uri (string-append "https://ftp.mozilla.org/pub/firefox"
-                                  "/releases/" version "esr/source/firefox-"
-                                  version "esr.source.tar.xz"))
-              (sha256
-               (base32
-                "1a3h7p7126pxzpidb1lqckvhfh1had805mai4l96mnc878phbx61"))))
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags flags)
-        #~(delete "--enable-rust-simd" #$flags))
-       ((#:phases phases)
-        #~(modify-phases #$phases
-          (replace 'adjust-tests
-            (lambda _
-              (with-directory-excursion "../js/src/tests"
-                (substitute* "shell/os.js"
-                  ;; FIXME: Why does the killed process have an exit status?
-                  ((".*killed process should not have exitStatus.*")
-                   ""))
-
-                ;; This was fixed sometime between 102.15.1 and 115.11.0.
-                ;; These tests are supposed to be skipped on all 64-bit systems.
-                #$@(if (target-riscv64?)
-                       #~((substitute* '("non262/Array/regress-157652.js"
-                                         "non262/regress/regress-422348.js")
-                            (("mips64") "mips64|riscv64")))
-                       #~())
-
-                ;; FIXME: An one-hour difference is produced after DST
-                ;; starting in the timezone the test suite uses.
-                (delete-file "non262/Date/15.9.5.7.js")
-
-                ;; The test suite expects a lightly patched ICU.  Disable tests
-                ;; that do not work with the system version.  See
-                ;; "intl/icu-patches" for clues.
-
-                ;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
-                ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
-                ;; related patch for why this is failing.
-                (delete-file "non262/Intl/DateTimeFormat/\
-fractional-second-digits-append-item.js")
-                ;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
-                (delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js")
-                ;; FIXME: got "en-US-posix", expected "en-US-POSIX".
-                (delete-file "non262/Intl/available-locales-supported.js")
-                ;; FIXME: got "en-US", expected "en-US-POSIX"
-                (delete-file "non262/Intl/available-locales-resolved.js")
-
-                ;;; Since 115:
-                ;; Mismatching array lengths
-                (delete-file "non262/Intl/supportedValuesOf-timeZones-canonical.js")
-                ;; FIXME: got "America/Santa_Isabel", expected "America/Tijuana":
-                ;; America/Santa_Isabel -> America/Tijuana
-                (delete-file "non262/Intl/DateTimeFormat/timeZone_backward_links.js")
-                ;; TODO: tzdata 2024a expected – find a way to regenerate
-                ;; these generated tests
-                (delete-file "non262/Intl/DateTimeFormat/timeZone_version.js")
-
-                ;; FIXME: got "\uD840\uDDF2", expected "\u5047"
-                (delete-file "non262/Intl/Collator/implicithan.js")
-                ;; FIXME: got "\uD840\uDDF2", expected "\u3467"
-                (delete-file "non262/Intl/Collator/big5han-gb2312han.js")
-
-                ;; Since 128:
-                ;; FIXME: got (void 0), expected "GMT"
-                (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZoneName-matches-format.js")
-                ;; FIXME: got 7, expected 9: parts count mismatch
-                (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZone-offset.js")
-                (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZoneName.js"))))))))
-    (inputs
-     (list icu4c-73 readline zlib))))
-
-(define-public mozjs-115
-  (package
-    (inherit mozjs)
-    (version "115.26.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.mozilla.org/pub/firefox"
-                                  "/releases/" version "esr/source/firefox-"
-                                  version "esr.source.tar.xz"))
-              (sha256
-               (base32
-                "0xvwk3vkbxnybpi3gwk48nxffg44lbv58mbk2xq6cz50ffq0k5k2"))))
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags flags)
-        #~(delete "--enable-rust-simd" #$flags))
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (replace 'adjust-tests
-              (lambda _
-                (with-directory-excursion "../js/src/tests"
-                ;; The test suite expects a lightly patched ICU.  Disable tests
-                ;; that do not work with the system version.  See
-                ;; "intl/icu-patches" for clues.
-
-                ;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
-                ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
-                ;; related patch for why this is failing.
-                (delete-file "non262/Intl/DateTimeFormat/\
-fractional-second-digits-append-item.js")
-                ;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
-                (delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js")
-                ;; FIXME: got "en-US-posix", expected "en-US-POSIX".
-                (delete-file "non262/Intl/available-locales-supported.js")
-                ;; FIXME: got "en-US", expected "en-US-POSIX"
-                (delete-file "non262/Intl/available-locales-resolved.js")
-
-                ;;; Since 115:
-                ;; Mismatching array lengths
-                (delete-file "non262/Intl/supportedValuesOf-timeZones-canonical.js")
-                ;; FIXME: got "America/Santa_Isabel", expected "America/Tijuana":
-                ;; America/Santa_Isabel -> America/Tijuana
-                (delete-file "non262/Intl/DateTimeFormat/timeZone_backward_links.js")
-                ;; TODO: tzdata 2024a expected – find a way to regenerate
-                ;; these generated tests
-                (delete-file "non262/Intl/DateTimeFormat/timeZone_version.js")
-
-                ;; FIXME: got "\uD840\uDDF2", expected "\u5047"
-                (delete-file "non262/Intl/Collator/implicithan.js")
-                ;; FIXME: got "\uD840\uDDF2", expected "\u3467"
-                (delete-file "non262/Intl/Collator/big5han-gb2312han.js"))))
-
-            (replace 'pre-check
-              (lambda _
-                (with-directory-excursion "../js/src/tests"
-                  (substitute* "shell/os.js"
-                    ;; FIXME: Why does the killed process have an exit status?
-                    ((".*killed process should not have exitStatus.*")
-                     ""))
-
-                  ;; XXX: Delete all tests that test time zone functionality,
-                  ;; because the test suite uses /etc/localtime to figure out
-                  ;; the offset from the hardware clock, which does not work
-                  ;; in the build container.  See <tests/non262/Date/shell.js>.
-                  (delete-file-recursively "non262/Date")
-                  (delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")
-
-                  (setenv "JSTESTS_EXTRA_ARGS"
-                          (string-join
-                           (list
-                            ;; Do not run tests marked as "random".
-                            "--exclude-random"
-                            ;; Exclude web platform tests.
-                            "--wpt=disabled"
-                            ;; Respect the daemons configured number of jobs.
-                            (string-append "--worker-count="
-                                           (number->string
-                                            (parallel-job-count)))))))))))))
-    (inputs
-     (list icu4c-73 readline zlib))))
-
 (define computed-origin-method (@@ (guix packages) computed-origin-method))

 (define mozilla-compare-locales
@@ -605,9 +256,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.10.0")
+(define %icecat-base-version "140.10.1")
 (define %icecat-version (string-append %icecat-base-version "-gnu1"))
-(define %icecat-build-id "20260421000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-build-id "20260428000000") ;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 +278,9 @@ in the case of Firefox, it is browser/locales/all-locales."
                  "firefox-" upstream-firefox-version ".source.tar.xz"))
            (sha256
             (base32
-              "06996548nfmn4r4mfw3wvgb1mp35majc5hjyhs1krgp33ck2m1f0"))))
+              "1fx52y52c3dmgr5gm64x40r2n6zq5ckqiqsd6vlhsly5wb1w0xaf"))))

-         (gnuzilla-commit "02125f31250c0240ee2ab1aa629ce66d4ffb9f30")
+         (gnuzilla-commit "5162cbc74c483c361ad5709c767c5cb2395ff4f9")
         (gnuzilla-source
          (origin
            (method git-fetch)
@@ -640,7 +291,7 @@ in the case of Firefox, it is browser/locales/all-locales."
                                      (string-take gnuzilla-commit 8)))
            (sha256
             (base32
-              "1hgx286gp0j46pklzzh5kvsnari1j3s0bff384m505m942k6l4hf"))))
+              "06qyirgjjgy7fwn7mbrz23wsdv9a88w70pz8qm1yszln74xxdsp0"))))

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

+(define-public mozjs
+  (package
+    (name "mozjs")
+    (version %icecat-version)
+    (source (origin (inherit icecat-source)
+                    (patches (search-patches "mozjs-xp-win.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
+      #:modules `((guix build cargo-utils)
+                  ,@%default-gnu-modules)
+      #:test-target "check-jstests"
+      #:configure-flags
+      #~(list
+         ;; Disable debugging symbols to save space.
+         "--disable-debug"
+         "--disable-debug-symbols"
+         ;; This is important because without it gjs will segfault during the
+         ;; configure phase.  With jemalloc only the standalone mozjs console
+         ;; will work.
+         "--disable-jemalloc"
+         "--enable-tests"
+         "--enable-hardening"
+         "--enable-optimize"
+         "--enable-release"
+         "--enable-readline"
+         "--enable-rust-simd"
+         "--enable-shared-js"
+         "--with-system-icu"
+         "--with-system-nspr"
+         "--with-system-zlib"
+         "--with-intl-api")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'python-3.11-compatibility
+            (lambda _
+              (substitute* '("python/mozbuild/mozpack/files.py"
+                             "python/mozbuild/mozbuild/util.py"
+                             "python/mozbuild/mozbuild/action/process_define_files.py"
+                             "python/mozbuild/mozbuild/backend/base.py"
+                             "python/mozbuild/mozbuild/preprocessor.py")
+                (("\"rU\"") "\"r\""))))
+          (add-after 'unpack 'restore-api-compat
+            (lambda _
+              (substitute* "js/public/GCAPI.h"
+                (("enum class GCReason")
+                 "#define FIRST_FIREFOX_REASON FIRST_ICECAT_REASON
+#define LAST_FIREFOX_REASON LAST_ICECAT_REASON
+enum class GCReason"))))
+          (add-after 'patch-source-shebangs 'patch-cargo-checksums
+            (lambda _
+              (let ((null-hash
+                     "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
+                (for-each (lambda (file)
+                            (format #t "patching checksums in ~a~%" file)
+                            (substitute* file
+                              (("^checksum = \".*\"")
+                               (string-append "checksum = \"" null-hash "\""))))
+                          (find-files "." "Cargo\\.lock$"))
+                (for-each generate-all-checksums
+                          '("js" "third_party/rust")))))
+          (replace 'configure
+            (lambda* (#:key configure-flags #:allow-other-keys)
+              ;; The configure script does not accept environment variables as
+              ;; arguments.  It also must be run from a different directory,
+              ;; but not the root directory either.
+              (mkdir "run-configure-from-here")
+              (chdir "run-configure-from-here")
+              ;; Configure script writes to $HOME.
+              (setenv "HOME" (getcwd))
+              (setenv "SHELL" (which "sh"))
+              (setenv "CONFIG_SHELL" (which "sh"))
+              (setenv "AUTOCONF" (which "autoconf"))
+              (apply invoke "python" "../configure.py"
+                     "--enable-project=js"
+                     (string-append "--prefix=" #$output)
+                     configure-flags)))
+          (add-before 'check 'adjust-tests
+            (lambda _
+              (with-directory-excursion "../js/src/tests"
+                (substitute* "shell/os.js"
+                  ;; FIXME: Why does the killed process have an exit status?
+                  ((".*killed process should not have exitStatus.*")
+                   ""))
+
+                ;; Most of the timezone related failures are probably
+                ;; attributable to our use of a system-provided icu4c library
+                ;; instead of the bundled one.
+                (for-each
+                 delete-file
+                 '( ;; FIXME: An one-hour difference is produced after DST
+                   ;; starting in the timezone the test suite uses.
+                   "non262/Date/15.9.5.7.js"
+
+                   ;; The test suite expects a lightly patched ICU.  Disable tests
+                   ;; that do not work with the system version.  See
+                   ;; "intl/icu-patches" for clues.
+
+                   ;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
+                   ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
+                   ;; related patch for why this is failing.
+                   "non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js"
+                   ;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
+                   "non262/Intl/DateTimeFormat/day-period-hour-cycle.js"
+                   ;; FIXME: got "en-US-posix", expected "en-US-POSIX".
+                   "non262/Intl/available-locales-supported.js"
+                   ;; FIXME: got "en-US", expected "en-US-POSIX"
+                   "non262/Intl/available-locales-resolved.js"
+
+;;; Since 115:
+                   ;; Mismatching array lengths
+                   "non262/Intl/supportedValuesOf-timeZones-canonical.js"
+                   ;; TODO: tzdata 2024a expected – find a way to regenerate
+                   ;; these generated tests
+                   "non262/Intl/DateTimeFormat/timeZone_version.js"
+
+                   ;; FIXME: got "\uD840\uDDF2", expected "\u5047"
+                   "non262/Intl/Collator/implicithan.js"
+                   ;; FIXME: got "\uD840\uDDF2", expected "\u3467"
+                   "non262/Intl/Collator/big5han-gb2312han.js"
+
+                   ;; Since 128:
+                   ;; FIXME: got (void 0), expected "GMT"
+                   "non262/Intl/DateTimeFormat/formatRange-timeZoneName-matches-format.js"
+                   ;; FIXME: got 7, expected 9: parts count mismatch
+                   "non262/Intl/DateTimeFormat/formatRange-timeZone-offset.js"
+                   "non262/Intl/DateTimeFormat/formatRange-timeZoneName.js"
+
+                   ;; Since 140:
+                   ;; RangeError: invalid time zone: America/Coyhaique
+                   "non262/Temporal/ZonedDateTime/zones-and-links.js"
+                   ;; got 2042, expected 2043
+                   "non262/Temporal/Intl/consistent-dates.js"
+                   ;;  got "Pacific/Auckland", expected "Antarctica/McMurdo"
+                   "non262/Intl/DateTimeFormat/timeZone_links.js"
+                   "test262/staging/sm/Temporal/ZonedDateTime/zones-and-links.js"
+                   ;; Test262Error: Expected true but got false
+                   "test262/staging/Intl402/Temporal/old/zoneddatetime-dst-corner-cases.js"
+                   ;; Test262Error: getTimeZoneTransition(next) does not return its input
+                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
+getTimeZoneTransition/result-type.js"
+                   ;; Expected SameValue («1912-01-01T00:16:08+00:00[Africa/Abidjan]», «null»
+                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
+getTimeZoneTransition/transition-at-instant-boundaries.js"
+                   ;; Expected SameValue(«1762063200000000000n», «1572760800000000000n»
+                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
+getTimeZoneTransition/specific-tzdb-values.js"
+                   ;; Expected SameValue(«"2025-03-30T03:00:00+02:00[Europe/Berlin]"»,
+                   ;; «"2020-10-25T02:00:00+01:00[Europe/Berlin]"»
+                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
+getTimeZoneTransition/nanoseconds-subtracted-or-added-at-dst-transition.js"
+                   ;; TypeError: can't access property "epochNanoseconds",
+                   ;; before.getTimeZoneTransition(...) is null
+                   "test262/intl402/Temporal/ZonedDateTime/prototype/\
+getTimeZoneTransition/transitions-close-together.js")))))
+          (add-before 'check 'pre-check
+            (lambda _
+              (setenv "JSTESTS_EXTRA_ARGS"
+                      (string-join
+                       (list
+                        ;; Do not run tests marked as "random".
+                        "--exclude-random"
+                        ;; Exclude web platform tests.
+                        "--wpt=disabled"
+                        ;; Respect the daemons configured number of jobs.
+                        (string-append "--worker-count="
+                                       (number->string (parallel-job-count)))))))))))
+    (native-inputs
+     (list autoconf
+           llvm                         ;for llvm-objdump
+           m4
+           perl
+           pkg-config
+           python-wrapper
+           rust
+           `(,rust "cargo")
+           rust-cbindgen))
+    (inputs
+     (list icu4c-77 readline zlib))
+    (propagated-inputs
+     (list nspr))                ; in the Requires.private field of mozjs-*.pc
+    (home-page
+     "https://spidermonkey.dev/")
+    (synopsis "Mozilla JavaScript engine")
+    (description "SpiderMonkey is Mozilla's JavaScript engine written
+in C/C++.")
+    (license license:mpl2.0))) ; and others for some files
+
+(define-public mozjs-128
+  (package
+    (inherit mozjs)
+    (version "128.3.1")
+    (source (origin
+              (method url-fetch)
+              ;; TODO: Switch to IceCat source once available on ftp.gnu.org.
+              (uri (string-append "https://ftp.mozilla.org/pub/firefox"
+                                  "/releases/" version "esr/source/firefox-"
+                                  version "esr.source.tar.xz"))
+              (sha256
+               (base32
+                "1a3h7p7126pxzpidb1lqckvhfh1had805mai4l96mnc878phbx61"))))
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:configure-flags flags)
+        #~(delete "--enable-rust-simd" #$flags))
+       ((#:phases phases)
+        #~(modify-phases #$phases
+          (replace 'adjust-tests
+            (lambda _
+              (with-directory-excursion "../js/src/tests"
+                (substitute* "shell/os.js"
+                  ;; FIXME: Why does the killed process have an exit status?
+                  ((".*killed process should not have exitStatus.*")
+                   ""))
+
+                ;; This was fixed sometime between 102.15.1 and 115.11.0.
+                ;; These tests are supposed to be skipped on all 64-bit systems.
+                #$@(if (target-riscv64?)
+                       #~((substitute* '("non262/Array/regress-157652.js"
+                                         "non262/regress/regress-422348.js")
+                            (("mips64") "mips64|riscv64")))
+                       #~())
+
+                ;; FIXME: An one-hour difference is produced after DST
+                ;; starting in the timezone the test suite uses.
+                (delete-file "non262/Date/15.9.5.7.js")
+
+                ;; The test suite expects a lightly patched ICU.  Disable tests
+                ;; that do not work with the system version.  See
+                ;; "intl/icu-patches" for clues.
+
+                ;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
+                ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
+                ;; related patch for why this is failing.
+                (delete-file "non262/Intl/DateTimeFormat/\
+fractional-second-digits-append-item.js")
+                ;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
+                (delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js")
+                ;; FIXME: got "en-US-posix", expected "en-US-POSIX".
+                (delete-file "non262/Intl/available-locales-supported.js")
+                ;; FIXME: got "en-US", expected "en-US-POSIX"
+                (delete-file "non262/Intl/available-locales-resolved.js")
+
+                ;;; Since 115:
+                ;; Mismatching array lengths
+                (delete-file "non262/Intl/supportedValuesOf-timeZones-canonical.js")
+                ;; FIXME: got "America/Santa_Isabel", expected "America/Tijuana":
+                ;; America/Santa_Isabel -> America/Tijuana
+                (delete-file "non262/Intl/DateTimeFormat/timeZone_backward_links.js")
+                ;; TODO: tzdata 2024a expected – find a way to regenerate
+                ;; these generated tests
+                (delete-file "non262/Intl/DateTimeFormat/timeZone_version.js")
+
+                ;; FIXME: got "\uD840\uDDF2", expected "\u5047"
+                (delete-file "non262/Intl/Collator/implicithan.js")
+                ;; FIXME: got "\uD840\uDDF2", expected "\u3467"
+                (delete-file "non262/Intl/Collator/big5han-gb2312han.js")
+
+                ;; Since 128:
+                ;; FIXME: got (void 0), expected "GMT"
+                (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZoneName-matches-format.js")
+                ;; FIXME: got 7, expected 9: parts count mismatch
+                (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZone-offset.js")
+                (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZoneName.js"))))))))
+    (inputs
+     (list icu4c-73 readline zlib))))
+
+(define-public mozjs-115
+  (package
+    (inherit mozjs)
+    (version "115.26.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://archive.mozilla.org/pub/firefox"
+                                  "/releases/" version "esr/source/firefox-"
+                                  version "esr.source.tar.xz"))
+              (sha256
+               (base32
+                "0xvwk3vkbxnybpi3gwk48nxffg44lbv58mbk2xq6cz50ffq0k5k2"))))
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:configure-flags flags)
+        #~(delete "--enable-rust-simd" #$flags))
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (replace 'adjust-tests
+              (lambda _
+                (with-directory-excursion "../js/src/tests"
+                ;; The test suite expects a lightly patched ICU.  Disable tests
+                ;; that do not work with the system version.  See
+                ;; "intl/icu-patches" for clues.
+
+                ;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
+                ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
+                ;; related patch for why this is failing.
+                (delete-file "non262/Intl/DateTimeFormat/\
+fractional-second-digits-append-item.js")
+                ;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
+                (delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js")
+                ;; FIXME: got "en-US-posix", expected "en-US-POSIX".
+                (delete-file "non262/Intl/available-locales-supported.js")
+                ;; FIXME: got "en-US", expected "en-US-POSIX"
+                (delete-file "non262/Intl/available-locales-resolved.js")
+
+                ;;; Since 115:
+                ;; Mismatching array lengths
+                (delete-file "non262/Intl/supportedValuesOf-timeZones-canonical.js")
+                ;; FIXME: got "America/Santa_Isabel", expected "America/Tijuana":
+                ;; America/Santa_Isabel -> America/Tijuana
+                (delete-file "non262/Intl/DateTimeFormat/timeZone_backward_links.js")
+                ;; TODO: tzdata 2024a expected – find a way to regenerate
+                ;; these generated tests
+                (delete-file "non262/Intl/DateTimeFormat/timeZone_version.js")
+
+                ;; FIXME: got "\uD840\uDDF2", expected "\u5047"
+                (delete-file "non262/Intl/Collator/implicithan.js")
+                ;; FIXME: got "\uD840\uDDF2", expected "\u3467"
+                (delete-file "non262/Intl/Collator/big5han-gb2312han.js"))))
+
+            (replace 'pre-check
+              (lambda _
+                (with-directory-excursion "../js/src/tests"
+                  (substitute* "shell/os.js"
+                    ;; FIXME: Why does the killed process have an exit status?
+                    ((".*killed process should not have exitStatus.*")
+                     ""))
+
+                  ;; XXX: Delete all tests that test time zone functionality,
+                  ;; because the test suite uses /etc/localtime to figure out
+                  ;; the offset from the hardware clock, which does not work
+                  ;; in the build container.  See <tests/non262/Date/shell.js>.
+                  (delete-file-recursively "non262/Date")
+                  (delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")
+
+                  (setenv "JSTESTS_EXTRA_ARGS"
+                          (string-join
+                           (list
+                            ;; Do not run tests marked as "random".
+                            "--exclude-random"
+                            ;; Exclude web platform tests.
+                            "--wpt=disabled"
+                            ;; Respect the daemons configured number of jobs.
+                            (string-append "--worker-count="
+                                           (number->string
+                                            (parallel-job-count)))))))))))))
+    (inputs
+     (list icu4c-73 readline zlib))))
+
 ;;; TEMPORARY old version of icecat-source for use by icedove until it is updated.
 (define %icecat-140.9.1-base-version "140.9.1")
 (define %icecat-140.9.1-version (string-append %icecat-140.9.1-base-version "-gnu1"))
@@ -245,6 +245,55 @@ go-fuzz-headers.")
@end itemize")
    (license license:expat)))

+(define-public go-github-com-alexkohler-prealloc
+  (package
+    (name "go-github-com-alexkohler-prealloc")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/alexkohler/prealloc")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "011i8yqzyjgwj17k44xvvg4bxfv8z20s0416r2d3yf4s3wqqygpq"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/alexkohler/prealloc"))
+    (home-page "https://github.com/alexkohler/prealloc")
+    (synopsis "Find slice declarations that could be preallocated")
+    (description
+     "This package is a Go static analysis tool to find slice declarations
+that could potentially be preallocated.")
+    (license license:expat)))
+
+(define-public go-github-com-alingse-asasalint
+  (package
+    (name "go-github-com-alingse-asasalint")
+    (version "0.0.11")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/alingse/asasalint")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1avz33cx3gcpps26rxijv7ic0njfmsdkbcp2mqg5yxhdcpq57s0q"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/alingse/asasalint"))
+    (propagated-inputs
+     (list go-golang-org-x-tools))
+    (home-page "https://github.com/alingse/asasalint")
+    (synopsis "Lint pass any slice as any in variadic function")
+    (description
+     "Golang linter, lint that pass any slice as any in variadic function.")
+    (license license:expat)))
+
 (define-public go-github-com-andreyvit-diff
  (package
    (name "go-github-com-andreyvit-diff")
@@ -603,6 +652,42 @@ time functions.")
 strings which may be used in mock tests.")
    (license license:unlicense)))

+(define-public go-github-com-daixiang0-gci
+  (package
+    (name "go-github-com-daixiang0-gci")
+    (version "0.13.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/daixiang0/gci")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vhnqisf6d706qvswccb0d7bkbl53lyi84f5sl3zyaf6yk8ml9dx"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/daixiang0/gci"))
+    (native-inputs
+     (list go-github-com-stretchr-testify
+           go-github-com-spf13-cobra))
+    (propagated-inputs
+     (list go-gopkg-in-yaml-v3
+           go-golang-org-x-tools
+           go-golang-org-x-sync
+           go-golang-org-x-mod
+           go-go-uber-org-zap
+           go-github-com-pmezard-go-difflib
+           go-github-com-hexops-gotextdiff))
+    (home-page "https://github.com/daixiang0/gci")
+    (synopsis "Tool to make Go import order deterministic")
+    (description
+     "This package provides a tool that controls Go package import order and
+makes it always deterministic.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-data-dog-go-sqlmock
  (package
    (name "go-github-com-data-dog-go-sqlmock")
@@ -676,6 +761,34 @@ style).
@end itemize")
    (license license:isc)))

+(define-public go-github-com-denis-tingaikin-go-header
+  (package
+    (name "go-github-com-denis-tingaikin-go-header")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/denis-tingaikin/go-header")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0qzy2ps59dzsdn4ny8x48k9d1kscpddjilkxra1w16npsvix6mcm"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/denis-tingaikin/go-header"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-golang-org-x-tools
+           go-gopkg-in-yaml-v3))
+    (home-page "https://github.com/denis-tingaikin/go-header")
+    (synopsis "Go linter for copyright headers")
+    (description
+     "Simple Go source code linter providing checks for copyright headers.")
+    (license license:gpl3)))
+
 (define-public go-github-com-dgryski-go-ddmin
  (package
    (name "go-github-com-dgryski-go-ddmin")
@@ -885,6 +998,31 @@ can use the mock clock.  This is a maintained fork of benbjohnson's
@url{https://github.com/benbjohnson/clock, clock} package.")
    (license license:expat)))

+(define-public go-github-com-firefart-nonamedreturns
+  (package
+    (name "go-github-com-firefart-nonamedreturns")
+    (version "1.0.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/firefart/nonamedreturns")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1y9dz8rkd55p1rkib4y3b0czs44c2bb1pmlr4k53ms1k8d9bjgwk"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/firefart/nonamedreturns"))
+    (propagated-inputs
+     (list go-golang-org-x-tools))
+    (home-page "https://github.com/firefart/nonamedreturns")
+    (synopsis "Go linter to catch named returns")
+    (description
+     "This package provides a linter to find named returns in Go code.")
+    (license license:gpl3)))
+
 ;; XXX: The project looks like abandoned, see
 ;; <https://github.com/frankban/quicktest/issues/172>, remove when nothing
 ;; depends on it.
@@ -923,6 +1061,30 @@ can use the mock clock.  This is a maintained fork of benbjohnson's
 tests.")
    (license license:expat)))

+(define-public go-github-com-fzipp-gocyclo
+  (package
+    (name "go-github-com-fzipp-gocyclo")
+    (version "0.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/fzipp/gocyclo")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1w2h8qlifrskn8g8zcwb6banr9si0vck9y8irg1r51mc98cjv36l"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/fzipp/gocyclo"))
+    (home-page "https://github.com/fzipp/gocyclo")
+    (synopsis "Calculate cyclomatic complexity in Go")
+    (description
+     "This package calculates the cyclomatic complexities of functions and
+methods in Go source code.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-gdey-tbltest
  (package
    (name "go-github-com-gdey-tbltest")
@@ -947,6 +1109,45 @@ tests.")
 tests.")
    (license license:expat)))

+(define-public go-github-com-ghostiam-protogetter
+  (package
+    (name "go-github-com-ghostiam-protogetter")
+    (version "0.3.20")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/ghostiam/protogetter")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1hap2ykmlnan5vz8sczdpiv93iidbgl13mlcdx468nhfprg2hbbm"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:tests? #f ;"module lookup disabled by GOPROXY=off"
+      #:import-path "github.com/ghostiam/protogetter"))
+    (propagated-inputs
+     (list go-golang-org-x-tools
+           go-github-com-gobwas-glob))
+    (home-page "https://github.com/ghostiam/protogetter")
+    (synopsis "Protobuf Golang linter")
+    (description
+     "This package is a linter developed specifically for Go programmers
+working with nested @code{protobuf} types.  It's designed to aid developers in
+preventing invalid memory address or nil pointer dereference errors arising
+from direct access of nested protobuf fields.
+
+When working with protobuf, it's quite common to have complex structures where
+a message field is contained within another message, which itself can be part
+of another message, and so on. If these fields are accessed directly and some
+field in the call chain will not be initialized, it can result in application
+panic.
+
+Protogetter addresses this issue by suggesting use of getter methods for field
+access.")
+    (license license:expat)))
+
 (define-public go-github-com-gkampitakis-ciinfo
  (package
    (name "go-github-com-gkampitakis-ciinfo")
@@ -1202,6 +1403,29 @@ kept in fixtures files.  Before the execution of every test, the test database
 is cleaned and the fixture data is loaded into the database.")
    (license license:expat)))

+(define-public go-github-com-go-xmlfmt-xmlfmt
+  (package
+    (name "go-github-com-go-xmlfmt-xmlfmt")
+    (version "1.1.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/go-xmlfmt/xmlfmt")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1cglrwmpg0lb7cnyvdz8js52h07rcvka7y9abksk9p5ajxj5rp1s"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/go-xmlfmt/xmlfmt"))
+    (home-page "https://github.com/go-xmlfmt/xmlfmt")
+    (synopsis "Go XML Formatter")
+    (description
+     "The Go XML Formatter, xmlfmt, will format the XML string in a readable way.")
+    (license license:expat)))
+
 ;; XXX: This repository has been archived by the owner
 ;; on May 9, 2021. It is now read-only. It's only used
 ;; by go-github-com-golang-gddo. Consider to remove when nothing
@@ -3967,6 +4191,20 @@ thoroughly
                    "  This package provides an command line interface (CLI)
 tool."))))

+(define-public go-gci
+  (package/inherit go-github-com-daixiang0-gci
+    (name "go-gci")
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:tests? _ #t) #f)
+       ((#:install-source? _ #t) #f)
+       ((#:skip-build? _ #t) #f)))
+    (native-inputs
+     (append (package-native-inputs go-github-com-daixiang0-gci)
+             (package-propagated-inputs go-github-com-daixiang0-gci)))
+    (propagated-inputs '())
+    (inputs '())))
+
 (define-public go-pgmockproxy
  (package/inherit go-github-com-jackc-pgmock
    (name "go-pgmockproxy")
@@ -4090,6 +4328,21 @@ prints an ASCII fraphic representing the memory layout.")))
                    "  This package provides an command line interface (CLI)
 tool."))))

+(define-public protogetter
+  (package/inherit go-github-com-ghostiam-protogetter
+    (name "protogetter")
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:tests? _ #f) #f)
+       ((#:skip-build? _ #t) #f)
+       ((#:install-source? _ #t) #f)
+       ((#:import-path _) "github.com/ghostiam/protogetter/cmd/protogetter")
+       ((#:unpack-path _ "") "github.com/ghostiam/protogetter")))
+    (native-inputs
+     (package-propagated-inputs go-github-com-ghostiam-protogetter))
+    (propagated-inputs '())
+    (inputs '())))
+
 (define-public unparam
  (package
    (inherit go-mvdan-cc-unparam)
@@ -1600,7 +1600,7 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
 (define-public go-github-com-google-go-tpm
  (package
    (name "go-github-com-google-go-tpm")
-    (version "0.9.1")
+    (version "0.9.4")
    (source
     (origin
       (method git-fetch)
@@ -1609,7 +1609,7 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1c5j5cvwl45ka93nknmv454ivd7kp9n8yql19gr6z01z0s1ph7sg"))))
+        (base32 "1sp1mbr6vz36zy9w36iksirbsj5p2jslsl8zs1cdj8s4ig4lkd9d"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -3286,6 +3286,37 @@ to support the streaming mode required by Go's standard Hash interface.")
@url{https://www.rfc-editor.org/errata/rfc7512, errata} specifications.")
    (license license:asl2.0)))

+(define-public go-github-com-tailscale-golang-x-crypto
+  (package
+    (name "go-github-com-tailscale-golang-x-crypto")
+    (version "0.91.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/tailscale/golang-x-crypto")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0m9qkk48mihrkmfh1fzfhc39l8957qkpfx8qbw4xdjws7dy4vzbz"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:tests? #f ;Tests have broken package imports (expected as per readme)
+      #:import-path "github.com/tailscale/golang-x-crypto"))
+    (propagated-inputs
+     (list go-golang-org-x-crypto
+           go-golang-org-x-term
+           go-golang-org-x-sys
+           go-golang-org-x-net))
+    (home-page "https://github.com/tailscale/golang-x-crypto")
+    (synopsis "Supplementary Go crypto libraries")
+    (description
+     "This package holds supplementary Go cryptography libraries, it's a fork
+of @code{golang.org/x/crypto} maintained by Tailscale.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-tink-crypto-tink-go-v2
  (package
    (name "go-github-com-tink-crypto-tink-go-v2")
@@ -456,6 +456,29 @@ penalization.")
 FFT (Schonhage-Strassen method for multiplying integers).")
    (license license:bsd-3)))

+(define-public go-github-com-robinus2-golang-moving-average
+  (package
+    (name "go-github-com-robinus2-golang-moving-average")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/RobinUS2/golang-moving-average")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02z3ad29653fz7whxkjjpq820ig9j8m68xj4kay14jyazkr5in1f"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/RobinUS2/golang-moving-average"))
+    (home-page "https://github.com/RobinUS2/golang-moving-average")
+    (synopsis "Moving average implementation for Go")
+    (description
+     "This package provides a moving average implementation for Go.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-shopspring-decimal
  (package
    (name "go-github-com-shopspring-decimal")
@@ -76,6 +76,7 @@
 ;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
 ;;; Copyright © 2026 Evgeny Pisemsky <mail@pisemsky.site>
 ;;; Copyright © 2026 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -120,7 +121,13 @@
  #:use-module (gnu packages serialization)
  #:use-module (gnu packages specifications)
  #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages xorg)
+
+  ;; TODO: Remove when go-github-com-containerd-containerd is moved to (gnu
+  ;; packages containers)
+  #:use-module (gnu packages docker)
+  #:use-module (gnu packages prometheus)
+  #:use-module (gnu packages kubernetes))

 ;;; Commentary:
 ;;;
@@ -525,6 +532,35 @@ file along with an index.html file.")
     "Package tcell provides a gruid Driver for making terminal apps.")
    (license license:isc)))

+(define-public go-codeberg-org-chavacava-garif
+  (package
+    (name "go-codeberg-org-chavacava-garif")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://codeberg.org/chavacava/garif.git")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0cz037yb9gnk9fd61pni6m0n9cbrwmlxxija5vm91mplyxlih05h"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "codeberg.org/chavacava/garif"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (home-page "https://codeberg.org/chavacava/garif")
+    (synopsis "Create and manipulate SARIF logs")
+    (description
+     "This package defines all the Go structures required to model a log file.
+
+SARIF, from Static Analysis Results Interchange Format, is a standard
+JSON-based format for the output of static analysis tools defined and promoted
+by @url{https://www.oasis-open.org/, OASIS}.")
+    (license license:expat)))
+
 (define-public go-codeberg-org-emersion-go-scfg
  (package
    (name "go-codeberg-org-emersion-go-scfg")
@@ -613,6 +649,33 @@ recursively any exported one.  It also won't merge structs inside
 maps (because they are not addressable using Go reflection).")
    (license license:bsd-3)))

+(define-public go-fyne-io-systray
+  (package
+    (name "go-fyne-io-systray")
+    (version "1.11.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/fyne-io/systray")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0yrd4f3n8wrqcqradmqq9w0b31hd5hali876xkynfhm3nhaz4j1i"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "fyne.io/systray"))
+    (propagated-inputs
+     (list go-github-com-godbus-dbus-v5
+           go-golang-org-x-sys))
+    (home-page "https://fyne.io/systray/")
+    (synopsis "Place an icon and menu in the notification area")
+    (description
+     "This package is a cross-platform Go library to place an icon and menu in
+the notification area.")
+    (license license:asl2.0)))
+
 (define-public go-git-sr-ht-rjarry-go-opt
  (package
    (name "go-git-sr-ht-rjarry-go-opt")
@@ -2981,6 +3044,38 @@ input from the terminal while not echoing the input back (similar to
 and is therefore compatible with cross-compiling.")
    (license license:expat)))

+(define-public go-github-com-bitfield-script
+  (package
+    (name "go-github-com-bitfield-script")
+    (version "0.24.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/bitfield/script")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pzmz7n39sh9sprclzd0m0l0flf626286fh51m065yjhkqzrjw89"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/bitfield/script"
+      #:test-flags #~(list "-vet=off")))
+    (native-inputs
+     (list go-github-com-google-go-cmp))
+    (propagated-inputs
+     (list go-github-com-itchyny-gojq
+           go-github-com-rogpeppe-go-internal
+           go-mvdan-cc-sh-v3))
+    (home-page "https://github.com/bitfield/script")
+    (synopsis "Making it easy to write shell-like scripts in Go")
+    (description
+     "Package script aims to make it easy to write shell-type scripts in Go,
+for general system administration purposes: reading files, counting lines,
+matching strings, and so on.")
+    (license license:expat)))
+
 (define-public go-github-com-bitly-go-hostpool
  (package
    (name "go-github-com-bitly-go-hostpool")
@@ -4433,6 +4528,34 @@ over strings.")
@code{https://en.wikipedia.org/wiki/WebP, WebP} images.")
    (license license:bsd-3)))

+(define-public go-github-com-chainguard-dev-clog
+  (package
+    (name "go-github-com-chainguard-dev-clog")
+    (version "1.8.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/chainguard-dev/clog")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0b95vw8czs2r9lscyi85vppbyqj672zm6z2n9siy1s9yv6fkys62"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/chainguard-dev/clog"))
+    (home-page "https://github.com/chainguard-dev/clog")
+    (synopsis "Context aware slog")
+    (description
+     "This package provides a context-aware Go std lib
+@url{https://pkg.go.dev/log/slog, @code{slog}}.  The context Logger can be
+used to use Loggers from the context.  This is sometimes preferred over the
+@url{https://github.com/chainguard-dev/clog#context-handler, Context Handler},
+since this can make it easier to use different loggers in different
+contexts (e.g. testing).")
+    (license license:asl2.0)))
+
 (define-public go-github-com-charlievieth-fastwalk
  (package
    (name "go-github-com-charlievieth-fastwalk")
@@ -6039,6 +6162,7 @@ dependencies and a simple API.")
    (license license:asl2.0)))

 (define-public go-github-com-containerd-containerd
+  ;; TODO: Move to (gnu packages containers).
  (package
    (name "go-github-com-containerd-containerd")
    (version "1.7.22")
@@ -6046,110 +6170,156 @@ dependencies and a simple API.")
     (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://github.com/containerd/containerd")
-             (commit (string-append "v" version))))
+              (url "https://github.com/containerd/containerd")
+              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "1yfda4qnygy4lcqb6cqc7v7h2lf0gl64xhvkp39zngmqm0lw30gh"))
       (snippet
        #~(begin
            (use-modules (guix build utils))
-            (delete-file-recursively "vendor")))))
+            (delete-file-recursively "vendor")
+            ;; Submodules with their own go.mod files and packaged separately:
+            ;;
+            ;; - github.com/containerd/containerd/api
+            (delete-file-recursively "api")))))
    (build-system go-build-system)
-
-    ;; For the forgejo-runner build, we only need the pkg/userns module which
-    ;; doesn't require the massive dependency tree for all of containerd, so
-    ;; we cheat and skip the build and avoid having to package a large number
-    ;; of additional dependencies.
    (arguments
     (list
      #:import-path "github.com/containerd/containerd"
      #:skip-build? #t
-      #:tests? #f))
-    ;; (propagated-inputs
-    ;;  (list go-tags-cncf-io-container-device-interface
-    ;;        go-k8s-io-utils
-    ;;        go-k8s-io-klog-v2
-    ;;        go-k8s-io-cri-api
-    ;;        go-k8s-io-component-base
-    ;;        go-k8s-io-client-go
-    ;;        go-k8s-io-apiserver
-    ;;        go-k8s-io-apimachinery
-    ;;        go-k8s-io-api
-    ;;        go-google-golang-org-protobuf
-    ;;        go-google-golang-org-grpc
-    ;;        go-google-golang-org-genproto-googleapis-rpc
-    ;;        go-google-golang-org-genproto
-    ;;        go-golang-org-x-sys
-    ;;        go-golang-org-x-sync
-    ;;        go-golang-org-x-net
-    ;;        go-go-opentelemetry-io-otel-trace
-    ;;        go-go-opentelemetry-io-otel-sdk
-    ;;        go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracehttp
-    ;;        go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracegrpc
-    ;;        go-go-opentelemetry-io-otel-exporters-otlp-otlptrace
-    ;;        go-go-opentelemetry-io-otel
-    ;;        go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp
-    ;;        go-go-opentelemetry-io-contrib-instrumentation-google-golang-org-grpc-otelgrpc
-    ;;        go-go-etcd-io-bbolt
-    ;;        go-github-com-vishvananda-netlink
-    ;;        go-github-com-urfave-cli
-    ;;        go-github-com-tchap-go-patricia-v2
-    ;;        go-github-com-stretchr-testify
-    ;;        go-github-com-sirupsen-logrus
-    ;;        go-github-com-prometheus-client-golang
-    ;;        go-github-com-pelletier-go-toml
-    ;;        go-github-com-opencontainers-selinux
-    ;;        go-github-com-opencontainers-runtime-tools
-    ;;        go-github-com-opencontainers-runtime-spec
-    ;;        go-github-com-opencontainers-image-spec
-    ;;        go-github-com-opencontainers-go-digest
-    ;;        go-github-com-moby-sys-userns
-    ;;        go-github-com-moby-sys-user
-    ;;        go-github-com-moby-sys-symlink
-    ;;        go-github-com-moby-sys-signal
-    ;;        go-github-com-moby-sys-sequential
-    ;;        go-github-com-moby-sys-mountinfo
-    ;;        go-github-com-moby-locker
-    ;;        go-github-com-minio-sha256-simd
-    ;;        go-github-com-klauspost-compress
-    ;;        go-github-com-intel-goresctrl
-    ;;        go-github-com-grpc-ecosystem-go-grpc-prometheus
-    ;;        go-github-com-grpc-ecosystem-go-grpc-middleware
-    ;;        go-github-com-google-uuid
-    ;;        go-github-com-google-go-cmp
-    ;;        go-github-com-fsnotify-fsnotify
-    ;;        go-github-com-emicklei-go-restful-v3
-    ;;        go-github-com-docker-go-units
-    ;;        go-github-com-docker-go-metrics
-    ;;        go-github-com-docker-go-events
-    ;;        go-github-com-distribution-reference
-    ;;        go-github-com-davecgh-go-spew
-    ;;        go-github-com-coreos-go-systemd-v22
-    ;;        go-github-com-containernetworking-plugins
-    ;;        go-github-com-containernetworking-cni
-    ;;        go-github-com-containerd-zfs
-    ;;        go-github-com-containerd-typeurl-v2
-    ;;        go-github-com-containerd-ttrpc
-    ;;        go-github-com-containerd-platforms
-    ;;        go-github-com-containerd-nri
-    ;;        go-github-com-containerd-log
-    ;;        go-github-com-containerd-imgcrypt
-    ;;        go-github-com-containerd-go-runc
-    ;;        go-github-com-containerd-go-cni
-    ;;        go-github-com-containerd-fifo
-    ;;        go-github-com-containerd-errdefs
-    ;;        go-github-com-containerd-continuity
-    ;;        go-github-com-containerd-containerd-api
-    ;;        go-github-com-containerd-console
-    ;;        go-github-com-containerd-cgroups-v3
-    ;;        go-github-com-containerd-btrfs-v2
-    ;;        go-github-com-containerd-aufs
-    ;;        go-github-com-microsoft-hcsshim
-    ;;        go-github-com-microsoft-go-winio
-    ;;        go-github-com-adamkorcz-go-118-fuzz-build
-    ;;        go-github-com-adalogics-go-fuzz-headers
-    ;;        go-dario-cat-mergo))
+      #:test-subdirs
+      ;; XXX: Remove when all inputs are packaged.
+      #~(list "archive/compression"
+              "cio"
+              "content"
+              "content/local"
+              "contrib/apparmor"
+              "contrib/seccomp/kernelversion"
+              "diff/apply"
+              "events/exchange"
+              "gc"
+              "gc/scheduler"
+              "identifiers"
+              "images"
+              "labels"
+              "leases"
+              "mount"
+              "namespaces"
+              "pkg/atomic"
+              "pkg/atomicfile"
+              "pkg/cap"
+              "pkg/cleanup"
+              "pkg/cri/io"
+              "pkg/cri/store/label"
+              "pkg/cri/store/snapshot"
+              "pkg/cri/streaming/internal/wsstream"
+              "pkg/cri/util"
+              "pkg/epoch"
+              "pkg/failpoint"
+              "pkg/ioutil"
+              "pkg/kmutex"
+              "pkg/registrar"
+              "pkg/snapshotters"
+              "pkg/transfer/image"
+              "pkg/transfer/streaming"
+              "plugin"
+              "protobuf"
+              "reference"
+              "remotes"
+              "remotes/docker/auth"
+              "remotes/docker/config"
+              "runtime/v2/shim"
+              "services/server/config"
+              "snapshots/benchsuite"
+              "snapshots/devmapper/dmsetup"
+              "snapshots/overlay/overlayutils"
+              "snapshots/storage")))
+    (native-inputs
+     (list go-github-com-davecgh-go-spew
+           go-github-com-google-go-cmp
+           go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-dario-cat-mergo
+           go-github-com-adalogics-go-fuzz-headers
+           go-github-com-adamkorcz-go-118-fuzz-build
+           go-github-com-containerd-btrfs-v2
+           go-github-com-containerd-cgroups-v3
+           go-github-com-containerd-console
+           go-github-com-containerd-containerd-api
+           go-github-com-containerd-continuity
+           go-github-com-containerd-errdefs
+           go-github-com-containerd-fifo
+           go-github-com-containerd-go-cni
+           go-github-com-containerd-go-runc
+           go-github-com-containerd-log
+           go-github-com-containerd-nri
+           go-github-com-containerd-platforms
+           go-github-com-containerd-ttrpc
+           go-github-com-containerd-typeurl-v2
+           go-github-com-containernetworking-cni
+           go-github-com-containernetworking-plugins
+           go-github-com-coreos-go-systemd-v22
+           go-github-com-distribution-reference
+           go-github-com-docker-go-events
+           go-github-com-docker-go-metrics
+           go-github-com-docker-go-units
+           go-github-com-emicklei-go-restful-v3
+           go-github-com-fsnotify-fsnotify
+           go-github-com-google-uuid
+           go-github-com-grpc-ecosystem-go-grpc-middleware
+           go-github-com-grpc-ecosystem-go-grpc-prometheus
+           go-github-com-intel-goresctrl
+           go-github-com-klauspost-compress
+           go-github-com-minio-sha256-simd
+           go-github-com-moby-locker
+           go-github-com-moby-sys-mountinfo
+           go-github-com-moby-sys-sequential
+           go-github-com-moby-sys-signal
+           go-github-com-moby-sys-symlink
+           go-github-com-moby-sys-user
+           go-github-com-moby-sys-userns
+           go-github-com-opencontainers-go-digest
+           go-github-com-opencontainers-image-spec
+           go-github-com-opencontainers-runtime-spec
+           go-github-com-opencontainers-runtime-tools
+           go-github-com-opencontainers-selinux
+           go-github-com-pelletier-go-toml
+           go-github-com-prometheus-client-golang
+           go-github-com-sirupsen-logrus
+           go-github-com-tchap-go-patricia-v2
+           go-github-com-urfave-cli
+           go-github-com-vishvananda-netlink
+           go-go-etcd-io-bbolt
+           go-go-opentelemetry-io-contrib-instrumentation-google-golang-org-grpc-otelgrpc
+           go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp
+           go-go-opentelemetry-io-otel
+           go-go-opentelemetry-io-otel-exporters-otlp-otlptrace
+           go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracegrpc
+           go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracehttp
+           go-go-opentelemetry-io-otel-sdk
+           go-go-opentelemetry-io-otel-trace
+           go-golang-org-x-net
+           go-golang-org-x-sync
+           go-golang-org-x-sys
+           go-google-golang-org-genproto
+           go-google-golang-org-genproto-googleapis-rpc
+           go-google-golang-org-grpc
+           go-google-golang-org-protobuf
+           go-k8s-io-api
+           go-k8s-io-apimachinery
+           go-k8s-io-apiserver
+           go-k8s-io-client-go
+           go-k8s-io-component-base
+           go-k8s-io-cri-api
+           go-k8s-io-klog-v2
+           go-k8s-io-utils
+           go-tags-cncf-io-container-device-interface
+
+           ;; TODO: Complete packaging.
+           ;; go-github-com-containerd-aufs
+           ;; go-github-com-containerd-imgcrypt
+           #;go-github-com-containerd-zfs))
    (home-page "https://github.com/containerd/containerd")
    (synopsis "Container runtime support daemon")
    (description
@@ -6158,9 +6328,7 @@ robustness, and portability.  It is available as a daemon, which can manage
 the complete container lifecycle of its host system: image transfer and
 storage, container execution and supervision, low-level storage and network
 attachments, etc.")
-    (license license:asl2.0)
-    ;; Don't expose since it's a partial package.
-    (properties '((hidden? . #t)))))
+    (license license:asl2.0)))

 (define-public go-github-com-containerd-continuity
  (package
@@ -7103,6 +7271,155 @@ against various paths.  This is particularly useful when trying to filter
 files based on a .gitignore document.")
    (license license:expat)))

+(define-public go-github-com-creachadair-command
+  (package
+    (name "go-github-com-creachadair-command")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/creachadair/command")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0c2y7i8c7kwsqyi6rmql9jpc2xan8jp2cpxgx615safk6xvc41kp"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/creachadair/command"))
+    (native-inputs
+     (list go-github-com-google-go-cmp))
+    (propagated-inputs
+     (list go-github-com-creachadair-mds))
+    (home-page "https://github.com/creachadair/command")
+    (synopsis "Lightweight subcommand-handling library")
+    (description
+     "This package defines plumbing for command dispatch.  It is based on and
+similar in design to the @code{go} command-line tool.")
+    (license license:bsd-3)))
+
+(define-public go-github-com-creachadair-flax
+  (package
+    (name "go-github-com-creachadair-flax")
+    (version "0.0.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/creachadair/flax")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1r8s0jqayxglnmkffdpkxl72l594ja82wpa9ypxh1v437kv2gqc2"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/creachadair/flax"))
+    (home-page "https://github.com/creachadair/flax")
+    (synopsis "Bind flags to struct fields")
+    (description
+     "This package implements a helper for attaching flags to the fields of
+struct values.")
+    (license license:bsd-3)))
+
+(define-public go-github-com-creachadair-mds
+  (package
+    (name "go-github-com-creachadair-mds")
+    (version "0.25.15")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/creachadair/mds")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1zdidlcbjlx9aw5j3i73c3mxp7366yh66bn7s5a8p1zaw72k035n"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.25
+      #:skip-build? #t
+      #:test-flags
+      #~(list "-skip" (string-join
+                       (list "TestNetwork" ;Needs network
+                             "TestNewHTTPServer"
+                             ;; Broken by read-only FS
+                             "TestDeepPathsWithGlobAndUmask")
+                       "|"))
+      #:import-path "github.com/creachadair/mds"))
+    (native-inputs
+     (list go-github-com-google-go-cmp))
+    (home-page "https://github.com/creachadair/mds")
+    (synopsis "Generic data structures and utility types in Go")
+    (description
+     "This repository defines generic data structures and utility types in Go.
+
+Data structures:
+@itemize
+@item heapq: a heap-structured priority queue
+@item mapset: a basic map-based set implementation
+@item mlink: basic linked sequences (list, queue)
+@item omap: ordered key-value map
+@item queue: an array-based FIFO queue
+@item ring: a circular doubly-linked sequence
+@item stack: an array-based LIFO stack
+@item stree: self-balancing binary-search tree
+@end itemize
+
+Utilities:
+@itemize
+@item cache: an in-memory key/value cache
+@item compare: provides helpers for comparison of values
+@item distinct: a probabilistic distinct-elements counter (CVM)
+@item mbits: helpful functions for manipulating bits and bytes
+@item mdiff: supports creating textual diffs
+@item mnet: provides an in-memory network implementation compatible with the net package
+@item mstr: helpful functions for manipulating strings
+@item mtest: a support library for writing tests
+@item shell: POSIX shell quoting and splitting
+@item slice: helpful functions for manipulating slices
+@item value: helpful functions for basic values and pointers
+@end itemize")
+    (license license:bsd-3)))
+
+(define-public go-github-com-creachadair-msync
+  (package
+    (name "go-github-com-creachadair-msync")
+    (version "0.8.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/creachadair/msync")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1z797dc0s99l7xf8zsbynwh1rjqw2w9119n81kjx39zkwrbmnc2w"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.25
+      #:import-path "github.com/creachadair/msync"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              ;; See: <https://go.dev/blog/synctest>.
+              (setenv "GOEXPERIMENT" "synctest")
+              (setenv "GODEBUG" "asynctimerchan=0"))))))
+    (propagated-inputs
+     (list go-github-com-creachadair-mds))
+    (home-page "https://github.com/creachadair/msync")
+    (synopsis "Synchronization management types in Go")
+    (description
+     "This package defines two types for managing concurrency: @code{throttle},
+which allows calls to a function to be coalesced among multiple concurrent
+goroutines and @code{trigger}, that implements channel-based condition
+variable.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-creack-pty
  (package
    (name "go-github-com-creack-pty")
@@ -8648,6 +8965,7 @@ interact with distribution components.")
    (license license:asl2.0)))

 (define-public go-github-com-docker-docker
+  ;; TODO: Move to (gnu packages docker).
  (package
    (name "go-github-com-docker-docker")
    (version "25.0.7")
@@ -8668,7 +8986,47 @@ interact with distribution components.")
     (list
      #:import-path "github.com/docker/docker"
      #:skip-build? #t
-      #:tests? #f))
+      #:test-subdirs
+      ;; XXX: Remove when all inputs are packaged.
+      #~(list "api/types/strslice"
+              "api/types/time"
+              "api/types/versions"
+              "builder/remotecontext/urlutil"
+              "cli/debug"
+              "daemon/links"
+              "daemon/network"
+              "errdefs"
+              "integration/plugin"
+              "integration/plugin/logging/cmd/discard"
+              "internal/mod"
+              "libnetwork/bitmap"
+              "libnetwork/etchosts"
+              "libnetwork/internal/caller"
+              "libnetwork/ipbits"
+              "libnetwork/options"
+              "libnetwork/portallocator"
+              "pkg/broadcaster"
+              "pkg/capabilities"
+              "pkg/directory"
+              "pkg/dmesg"
+              "pkg/fileutils"
+              "pkg/homedir"
+              "pkg/ioutils"
+              "pkg/longpath"
+              "pkg/meminfo"
+              "pkg/namesgenerator"
+              "pkg/parsers"
+              "pkg/parsers/kernel"
+              "pkg/pidfile"
+              "pkg/plugins/pluginrpc-gen"
+              "pkg/process"
+              "pkg/progress"
+              "pkg/stdcopy"
+              "pkg/stringid"
+              "pkg/useragent"
+              "plugin/v2"
+              "restartmanager"
+              "volume/drivers")))
    (propagated-inputs
     (list go-github-com-containerd-containerd
           go-github-com-containerd-log
@@ -8967,6 +9325,41 @@ sub-interfaces are also provided for cases where the full Channel interface
 cannot be met (for example, @code{InChannel} for write-only channels).")
    (license license:expat)))

+(define-public go-github-com-eapache-go-resiliency
+  (package
+    (name "go-github-com-eapache-go-resiliency")
+    (version "1.7.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/eapache/go-resiliency")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "07a1r3c2spd37k3riy4fxz8v8ibxiprf8a3vw788whz4mlp6gm40"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/eapache/go-resiliency"))
+    (home-page "https://github.com/eapache/go-resiliency")
+    (synopsis "Resiliency patterns for golang")
+    (description
+     "Resiliency patterns for golang.  Based in part on
+@url{https://github.com/Netflix/Hystrix, Hystrix},
+@@url{https://github.com/Shopify/semian, Semian}, and others.
+
+Currently implemented patterns include:
+@itemize
+@item circuit-breaker
+@item semaphore
+@item deadline/timeout
+@item batching
+@item retriable
+@end itemize")
+    (license license:expat)))
+
 (define-public go-github-com-eapache-queue
  (package
    (name "go-github-com-eapache-queue")
@@ -12570,11 +12963,10 @@ single @code{Tree} implementation, optimized for sparse nodes.")
     (list
      #:import-path "github.com/hashicorp/go-immutable-radix/v2"))
    (propagated-inputs
-     (modify-inputs (package-propagated-inputs
-                     go-github-com-hashicorp-go-immutable-radix)
+     (modify-inputs propagated-inputs
       (prepend go-golang-org-x-exp)
       (replace "go-github-com-hashicorp-golang-lru"
-         go-github-com-hashicorp-golang-lru-v2)))))
+                go-github-com-hashicorp-golang-lru-v2)))))

 (define-public go-github-com-hashicorp-go-memdb
  (package
@@ -13298,6 +13690,32 @@ subsystem in Linux.")
 used in other languages but absent in Go package strings.")
    (license license:expat)))

+(define-public go-github-com-huin-goutil
+  (package
+    (name "go-github-com-huin-goutil")
+    (version "0.0.0-20170803182201-1ca381bf3150")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/huin/goutil")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0alhyacsfqic2wxyqn4gvk9wzjl4pkmy8rhvqjk84xsghgx5xf12"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/huin/goutil"))
+    (home-page "https://github.com/huin/goutil")
+    (synopsis "Collection of Go utility code")
+    (description
+     "This package is a collection of miscellaneous Go utility code that is
+potentially useful across multiple projects, and has therefore been factored
+out.")
+    (license license:bsd-2)))
+
 (define-public go-github-com-iancoleman-orderedmap
  (package
    (name "go-github-com-iancoleman-orderedmap")
@@ -16374,6 +16792,29 @@ structure.  It can also produce a much more verbose, one-item-per-line
 representation suitable for computing diffs.")
    (license license:asl2.0)))

+(define-public go-github-com-kodeworks-golang-image-ico
+  (package
+    (name "go-github-com-kodeworks-golang-image-ico")
+    (version "0.0.0-20141118225523-73f0f4cfade9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/Kodeworks/golang-image-ico")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zfcvpf6pdqismq9j8nvismln1dbz2i22d7c00a2ygjxldbmnd3k"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/Kodeworks/golang-image-ico"))
+    (home-page "https://github.com/Kodeworks/golang-image-ico")
+    (synopsis "Golang support for Windows .ico file format")
+    (description
+     "This package provides Golang support for Windows' @code{.ico} file format.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-labstack-gommon
  (package
    (name "go-github-com-labstack-gommon")
@@ -22390,6 +22831,88 @@ without configuration, but if desired, everything can be customized down to the
 smallest detail.")
    (license license:expat)))

+(define-public go-github-com-puzpuzpuz-xsync
+  (package
+    (name "go-github-com-puzpuzpuz-xsync")
+    (version "1.5.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/puzpuzpuz/xsync")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qfmiyk5wypssr30nj5qp4izdav5gbaxf1324i70vjhn5g8g74mb"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/puzpuzpuz/xsync"))
+    (home-page "https://github.com/puzpuzpuz/xsync")
+    (synopsis "Concurrent data structures for Go")
+    (description
+     "This package is an extension for the standard @code{sync} package and
+provides the following concurrent data structures for Go: a concurrent
+counter, concurrent hash table, multiple concurrent queues and @code{mutex}.")
+    (license license:expat)))
+
+(define-public go-github-com-puzpuzpuz-xsync-v2
+  (package
+    (inherit go-github-com-puzpuzpuz-xsync)
+    (name "go-github-com-puzpuzpuz-xsync-v2")
+    (version "2.5.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/puzpuzpuz/xsync")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1almmzvkhyvhdwyhv9jphbhcm5yv45cmv9v39r3rcbkvl212igmz"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/puzpuzpuz/xsync/v2"))))
+
+(define-public go-github-com-puzpuzpuz-xsync-v3
+  (package
+    (inherit go-github-com-puzpuzpuz-xsync-v2)
+    (name "go-github-com-puzpuzpuz-xsync-v3")
+    (version "3.5.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/puzpuzpuz/xsync")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k2ir8ixr5h0rwfd4i0nxlgmcrklld06jcbp5ghxk6hpxrhzs1y8"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/puzpuzpuz/xsync/v3"))))
+
+(define-public go-github-com-puzpuzpuz-xsync-v4
+  (package
+    (inherit go-github-com-puzpuzpuz-xsync-v3)
+    (name "go-github-com-puzpuzpuz-xsync-v4")
+    (version "4.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/puzpuzpuz/xsync")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "04caylbphjgq1qbpd09cg0b8h84y4zznsdfhi20w4f1628fq7077"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/puzpuzpuz/xsync/v4"))))
+
 (define-public go-github-com-quasilyte-go-ruleguard-dsl
  (package
    (name "go-github-com-quasilyte-go-ruleguard-dsl")
@@ -28603,6 +29126,30 @@ designed to work with the MySQL protocol version 4.1 or greater.  It definitely
 works well with MySQL server version 5.0 and 5.1.")
    (license license:bsd-3)))

+(define-public go-github-com-ziutek-telnet
+  (package
+    (name "go-github-com-ziutek-telnet")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/ziutek/telnet")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0w0zn8yhpmhrph41dlf9pn5h1zzhgajxwbx85fk4d0m55xp0r680"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/ziutek/telnet"))
+    (home-page "https://github.com/ziutek/telnet")
+    (synopsis "Telnet interface in Go")
+    (description
+     "This package provides a simple interface for interacting with Telnet
+connections.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-zk-org-pretty
  (package
    (name "go-github-com-zk-org-pretty")
@@ -29757,49 +30304,25 @@ organization}.")
       (list
        #:skip-build? #t
        #:import-path "go4.org"
-        #:test-subdirs
-        #~(list "bytereplacer/..."
-                ;; "cloud/..." ; missing packages
-                "ctxutil/..."
-                "errorutil/..."
-                "fault/..."
-                "jsonconfig/..."
-                "legal/..."
-                "lock/..."
-                "media/..."
-                "must/..."
-                "net/..."
-                "net/throttle/..."
-                "oauthutil/..."
-                "osutil/..."
-                "readerutil/..."
-                "reflectutil/..."
-                "rollsum/..."
-                "sort/..."
-                "strutil/..."
-                "syncutil/..."
-                "testing/..."
-                "testing/functest/..."
-                "types/..."
-                ;; "wkfs/..." ; missing packages
-                "writerutil/..."
-                "xdgdir/...")
+        #:test-flags #~(list "-vet=off")
        #:phases
        #~(modify-phases %standard-phases
            (add-after 'unpack 'remove-examples
              (lambda* (#:key import-path #:allow-other-keys)
                (with-directory-excursion (string-append "src/" import-path)
                  (for-each delete-file
-                            (find-files "." "example.*_test\\.go$"))))))
-        #:test-flags #~(list "-vet=off")))
+                            (find-files "." "example.*_test\\.go$"))))))))
+      (native-inputs
+       ;; XXX: Remove when cycle is fixed.
+       (list go-github-com-envoyproxy-go-control-plane))
      (propagated-inputs
-       (list ;; go-cloud-google-com-go
-             ;; go-cloud-google-com-go-storage
+       (list go-cloud-google-com-go
+             go-cloud-google-com-go-storage
             go-github-com-rwcarlsen-goexif
             go-golang-org-x-net
             go-golang-org-x-oauth2
             go-golang-org-x-sys
-             #; go-google-golang-org-api))
+             go-google-golang-org-api))
      (home-page "https://github.com/go4org/go4")
      (synopsis "Collection of packages for Go programmers")
      (description
@@ -29846,6 +30369,30 @@ for locating directories
@end itemize")
      (license (list license:asl2.0 license:bsd-3)))))

+(define-public go-go4-org-mem
+  (package
+    (name "go-go4-org-mem")
+    (version "0.0.0-20240501181205-ae6ca9944745")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/go4org/mem")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1h2bam1h6xi0lx9s0k44fvd28vkb6rh9vndz3srhwi6axvm8ir0s"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "go4.org/mem"))
+    (home-page "https://go4.org/mem")
+    (synopsis "Cheap read-only memory types in Go")
+    (description
+     "Package mem provides the @code{mem.RO} type that allows you to cheaply
+pass & access either a read-only @code{[]byte} or a @code{string}.")
+    (license license:asl2.0)))
+
 (define-public go-golang-org-rainycape-unidecode
  (let ((commit "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c")
        (revision "1"))
@@ -30438,8 +30985,8 @@ The yaml package supports most of YAML 1.2, but preserves some behavior from
 ;; to build NNCP and remove vendor) dependency for Golang.  Full build depends
 ;; on Bazel <https://bazel.build/>.
 (define-public go-gvisor-dev-gvisor
-  (let ((commit "634ce95eed8d5b8e6b3e2ea30542c34cb30af148")
-        (revision "0"))
+  (let ((commit "9414b50a5633100fd7299a5a7998742575dcb669")
+        (revision "1"))
    (package
      (name "go-gvisor-dev-gvisor")
      (version (git-version "0.0.0" revision commit))
@@ -30451,7 +30998,7 @@ The yaml package supports most of YAML 1.2, but preserves some behavior from
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "1l3si6qlchwgsvaq6lxyvj8iq8n8pqxlayb1hbdf3pynxi52hfkw"))))
+          (base32 "0vqaclb2ignkcs7n463bj349m0xybdsv71i6afhzh8r05hdywzax"))))
      (build-system go-build-system)
      (arguments
       (list
@@ -578,7 +578,10 @@ This package provides the core library and elements.")
              (substitute* "tests/check/meson.build"
                ;; This test causes nondeterministic failures (see:
                ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/895>).
-                ((".*'elements/appsrc.c'.*") ""))
+                ((".*'elements/appsrc.c'.*") "")
+                ;; This one is flaky (see:
+                ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/work_items/5016>).
+                ((".*'elements/inputselector.c'.*") ""))
              ;; Some other tests fail on other architectures.
              #$@(cond
                   ((target-x86-32?)
@@ -766,7 +769,8 @@ model to base your own plug-in on, here it is.")
    (build-system meson-build-system)
    (arguments
     (list
-      #:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled"
+      #:configure-flags #~(list "-Dgpl=enabled"
+                                "-Dsctp-internal-usrsctp=disabled"
                                ;; TODO: Figure out why audiovisualizer test
                                ;; fails on riscv64-linux.
                                #$@(if (target-riscv64?)
@@ -776,6 +780,15 @@ model to base your own plug-in on, here it is.")
      #:phases
      #~(modify-phases %standard-phases
          #$@%common-gstreamer-phases
+          (add-after 'unpack 'patch-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "ext/resindvd/resindvdsrc.c"
+                ;; `g_module_open' is a wrapper above dlopen; pass it the
+                ;; absolute file name of the library to ensure it is always
+                ;; found.
+                (("\"libdvdcss\"")
+                 (format #f "~s"
+                         (search-input-file inputs "lib/libdvdcss.so"))))))
          (add-after 'unpack 'adjust-tests
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
@@ -789,18 +802,18 @@ model to base your own plug-in on, here it is.")

                  ;; The 'elements_shm.test_shm_live' test sometimes times out
                  ;; (see:
-                  ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
+                  ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790>).
                  ((".*'elements/shm\\.c'.*") "")

                  ;; The 'elements_curlhttpsrc' test sometimes times out.
                  ((".*'elements/curlhttpsrc\\.c'.*") "")

                  ;; The 'mxfdemux' test fails for unknown reasons (see:
-                  ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921).
+                  ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921>).
                  ((".*'elements/mxfdemux.c'.*") "")

                  ;; Unexpected critical/warning, see
-                  ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3000>
+                  ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/792>
                  ((".*'elements/netsim\\.c'.*") "")

                  ;; TODO: Figure out why this test fails on riscv64-linux.
@@ -809,30 +822,19 @@ model to base your own plug-in on, here it is.")
                            "'elements/viewfinderbin.c'], true, ],"))
                         '())

-                  ;; This test is flaky on at least some architectures.
+                  ;; This test is flaky.
                  ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
-                  #$@(if (member (%current-system)
-                                 '("aarch64-linux" "riscv64-linux"))
-                         `((("'elements/camerabin\\.c'\\].*],")
-                            "'elements/camerabin.c'], true, ],"))
-                         '())
+                  (("'elements/camerabin\\.c'\\].*],")
+                   "'elements/camerabin.c'], true, ],")

                  ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
                  ((".*elements/dtls\\.c.*") "")

-                  ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921
-                  ((".*elements/mxfdemux\\.c.*") "")
-
                  ;; Unable to create pipeline 'bin.
                  ;; ( vulkanupload ! vulkancolorconvert ! vulkandownload )':
                  ;; no element "vulkanupload"
                  ((".*elements/vkcolorconvert\\.c.*") "")
-                  ((".*elements/vkupload\\.c.*") ""))
-                (substitute* "tests/check/elements/zxing.c"
-                  ;; zxing 1.2.0 seemingly changed the type representation of
-                  ;; the EAN_13 structure; disable it.
-                  ((".*\"EAN_13\".*")
-                   "")))))
+                  ((".*elements/vkupload\\.c.*") "")))))
          (add-before 'check 'pre-check
            (lambda _
              ;; Tests require a running X server.
@@ -1162,9 +1164,19 @@ after their category.")
    (build-system meson-build-system)
    (arguments
     (list #:glib-or-gtk? #t         ; To wrap binaries and/or compile schemas
+           #:configure-flags #~(list "-Dgpl=enabled")
           #:phases
           #~(modify-phases %standard-phases
               #$@%common-gstreamer-phases
+               (add-after 'unpack 'patch-paths
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "ext/dvdread/dvdreadsrc.c"
+                     ;; `g_module_open' is a wrapper above dlopen; pass it the
+                     ;; absolute file name of the library to ensure it is always
+                     ;; found.
+                     (("\"libdvdcss\"")
+                      (format #f "~s"
+                              (search-input-file inputs "lib/libdvdcss.so"))))))
               (add-before 'check 'pre-check
                 (lambda _
                   ;; Tests require a running X server.
@@ -24,7 +24,7 @@
 ;;; Copyright © 2019 Giacomo Leidi <therewasa@fishinthecalculator.me>
 ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2020-2026 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
@@ -387,7 +387,7 @@ applications.")
 (define-public pango
  (package
    (name "pango")
-    (version "1.56.4")
+    (version "1.57.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -396,7 +396,7 @@ applications.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0jnmydds9dmdah4fjj5rr5gmf1imxlxjc0w98if642n98vmsdf67"))))
+                "0dfvlag7jhf4fzraxwhx4s016h2z7igq3knza9vfklkss8igs00a"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -647,7 +647,7 @@ highlighting and other features typical of a source code editor.")
 (define-public gdk-pixbuf
  (package
    (name "gdk-pixbuf")
-    (version "2.44.4")
+    (version "2.44.5")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -655,7 +655,7 @@ highlighting and other features typical of a source code editor.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-                "05xxpl3sd37lsp5qqy01m0w9c14dqfi84x9rawsffyj2y71sm8ck"))
+                "0s5b010jlinmki5iidbj2yip8n2sxc6xc0qmcvpc104v2c4kxfb9"))
              (patches
               (search-patches
                "gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch"))))
@@ -781,7 +781,7 @@ images.")
  (hidden-package
   (package
     (name "at-spi2-core")
-     (version "2.52.0")
+     (version "2.60.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -789,7 +789,7 @@ images.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                 "1azmbzik0gl2s03c9lq3dff3h1iql1zvlwn28yhizl68421zrhqa"))))
+                 "16fb2hv12k2vzh462gbd4qf8ipvnb2ijrc5d7w56dzfqjwd0rrc0"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -987,7 +987,7 @@ application suites.")
  (package
    (inherit gtk+-2)
    (name "gtk+")
-    (version "3.24.51")
+    (version "3.24.52")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -996,10 +996,11 @@ application suites.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "07vw0rani9d65px36fzzj7sprv5r48shyjdgzipkihzqaldd98yh"))
+                "197w1mb5vqm5d07sgdqkg54can7f1p4yjh42zx0y8z6m9p43shck"))
              (patches (search-patches
                        "gtk3-respect-GUIX_GTK3_PATH.patch"
-                        "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
+                        "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"
+                        "gtk3-treeview-test-fix.patch"))))
    ;; There is no "doc" output, because adding gtk-doc here would introduce a
    ;; dependency cycle with itself.
    (outputs '("out" "bin"))
@@ -1075,22 +1076,20 @@ application suites.")
      #~(modify-phases %standard-phases
          (add-after 'unpack 'disable-failing-tests
            (lambda _
-                ;; These tests fail only in the containerized environment, for
-                ;; unknown reasons.
-                (substitute* "testsuite/gtk/meson.build"
-                  ((".*\\['defaultvalue'],.*") "")
-                  ((".*\\['objects-finalize',.*") ""))
-                ;; The 'flipping-icons.ui' and 'gtk-icontheme-sizing.ui' tests
-                ;; fail for unknown reasons (see:
-                ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7679>).
-                (substitute* "testsuite/reftests/meson.build"
-                  (("  'flipping-icons.ui',.*") "")
-                  (("  'gtk-icontheme-sizing.ui',.*") ""))
-                ;; This test fails just on i686-linux, for unknown reasons.
-                #$@(if (target-x86-32?)
-                       #~((substitute* "testsuite/reftests/meson.build"
-                            (("  'linear-gradient.ui',.*") "")))
-                       #~())))
+              (substitute* "testsuite/gtk/meson.build"
+                ((".*\\['defaultvalue'],.*") "")
+                ((".*\\['objects-finalize',.*") ""))
+              ;; The 'flipping-icons.ui' and 'gtk-icontheme-sizing.ui' tests
+              ;; fail for unknown reasons (see:
+              ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7679>).
+              (substitute* "testsuite/reftests/meson.build"
+                (("  'flipping-icons.ui',.*") "")
+                (("  'gtk-icontheme-sizing.ui',.*") ""))
+              ;; This test fails just on i686-linux, for unknown reasons.
+              #$@(if (target-x86-32?)
+                     #~((substitute* "testsuite/reftests/meson.build"
+                          (("  'linear-gradient.ui',.*") "")))
+                     #~())))
          (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
            (assoc-ref glib-or-gtk:%standard-phases
                       'generate-gdk-pixbuf-loaders-cache-file))
@@ -1114,13 +1113,13 @@ application suites.")
                                          "/share/applications")))))))
    (native-search-paths
     (list (search-path-specification
-            (variable "GUIX_GTK3_PATH")
-            (files '("lib/gtk-3.0")))))))
+             (variable "GUIX_GTK3_PATH")
+             (files '("lib/gtk-3.0")))))))

 (define-public gtk
  (package
    (name "gtk")
-    (version "4.20.3")
+    (version "4.22.1")
    (source
     (origin
       (method url-fetch)
@@ -1128,9 +1127,11 @@ application suites.")
                           (version-major+minor version)  "/"
                           name "-" version ".tar.xz"))
       (sha256
-        (base32 "0ly1gqc6ybxv5f2a9hvjp5k6l9mfzy2yv8iy2xqnr9l8628g4wr8"))
+        (base32 "1z2mkmazc2d51jbg3qwwdycycqiwswm88nhw6bxscz8j86f5lyyd"))
       (patches
-        (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
+        (search-patches "gtk4-demo-reproducible.patch"
+                        "gtk4-needs-udmabuf.patch"
+                        "gtk4-respect-GUIX_GTK4_PATH.patch"))
       (modules '((guix build utils)))))
    (build-system meson-build-system)
    (outputs '("out" "bin" "doc"))
@@ -1198,6 +1199,9 @@ application suites.")
                (("[ \t]*'empty-text.node',") "")
                (("[ \t]*'testswitch.node',") "")
                (("[ \t]*'widgetfactory.node',") "")
+                ;; The gtklistitemmanager test is flaky (see:
+                ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/6547>).
+                ((".*'gtklistitemmanager.c',.*") "")
                ;; XXX: Figure out why this fails and report upstream.
                ((".*'memorytexture',.*") "")
                ((".*'yuv-matrix-dmabuf',.*") ""))
@@ -1254,8 +1258,10 @@ application suites.")
              (setenv "XDG_CACHE_HOME" (getcwd))))
          (add-before 'check 'pre-check
            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Tests require a running X server.
-              (system "Xvfb :1 +extension GLX &")
+              ;; Tests require a running X server.  The '-noreset' option is
+              ;; necessary to avoid spurious "Failed to open display" test
+              ;; errors.
+              (system "Xvfb :1 +extension GLX -screen 0 1024x768x24 -noreset &")
              (setenv "DISPLAY" ":1")
              ;; Tests write to $HOME.
              (setenv "HOME" (getcwd))
@@ -1298,6 +1304,7 @@ application suites.")
           docbook-xsl
           gettext-minimal
           `(,glib "bin")
+           glibc-utf8-locales           ;some tests require en_US.UTF-8
           gobject-introspection        ;for building introspection data
           graphene
           gtk-doc/stable               ;for building documentation
@@ -1321,7 +1328,6 @@ application suites.")
    (inputs
     (list colord                       ;for color printing support
           cups                         ;for CUPS print-backend
-           ffmpeg                       ;for ffmpeg media-backend
           fribidi
           gi-docgen
           gstreamer                    ;for gstreamer media-backend
@@ -1365,8 +1371,8 @@ application suites.")
    (native-search-paths
     (list
      (search-path-specification
-       (variable "GUIX_GTK4_PATH")
-       (files '("lib/gtk-4.0")))))
+        (variable "GUIX_GTK4_PATH")
+        (files '("lib/gtk-4.0")))))
    (search-paths native-search-paths)
    (home-page "https://www.gtk.org/")
    (synopsis "Cross-platform widget toolkit")
@@ -2205,7 +2211,7 @@ information.")
 (define-public gtk-doc
  (package
    (name "gtk-doc")
-    (version "1.34.0")
+    (version "1.35.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -2213,7 +2219,7 @@ information.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-                "0746lwxgybc5ss3hzdd0crjjghk0ck0x9jbmz73iig405arp42xj"))
+                "1qi5bgqca1chdcfw7v4h3sw8jg661nmp77d7x658mn6nxlj9y731"))
              (patches
               (search-patches "gtk-doc-respect-xml-catalog.patch"
                               "gtk-doc-mkhtml-test-fix.patch"))))
@@ -2763,6 +2769,43 @@ entire output.  It supports all Layer Shell features including popups and
 popovers.")
    (license license:expat)))

+(define-public xdg-user-dirs-gtk
+  (package
+    (name "xdg-user-dirs-gtk")
+    (version "0.16")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk.git")
+                     (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "11h1164mkajpfrp6mkky2gvx3xd7dw0c9f2785jf4lys4jmmj4c3"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-exec-path
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "update.c"
+                (("xdg-user-dirs-update")
+                 (search-input-file inputs "/bin/xdg-user-dirs-update"))))))))
+    (native-inputs
+     (list gettext-minimal
+           pkg-config))
+    (inputs
+     (list gtk+
+           xdg-user-dirs))
+    (home-page "https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk")
+    (synopsis "Integration of xdg-user-dirs with GTK")
+    (description "This package is a companion to @code{xdg-user-dirs} to
+integrate it with the GNOME desktop and GTK applications.  It gets run during
+login to create default GTK bookmarks files containing the user directories, and
+to rename these directories if the locale changes.")
+    (license license:gpl2+)))
+
 (define-public goocanvas
  (package
    (name "goocanvas")
@@ -7764,8 +7764,8 @@ is an attempt to combine both into something useful.")
      (license license:asl2.0))))

 (define-public guile-knots
-  (let ((commit "f767eca066495e6582e89ba1b91907c0c5657878")
-        (revision "34"))
+  (let ((commit "49996c432a4616e03ecaf01cb42afc5fd78eafd5")
+        (revision "35"))
    (package
    (name "guile-knots")
    (version (git-version "0.1" revision commit))
@@ -7776,7 +7776,7 @@ is an attempt to combine both into something useful.")
                    (commit commit)))
              (sha256
               (base32
-                "18fqmpyrrxy8phxxm5b7d1qhhvc3rsrs243xiinkj2hn2ca1cqi8"))
+                "0i6vk432shy7qmsq1hli71a9kmgf8yy9hx3bck0r9qzsldv1m3m9"))
              (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -23,6 +23,7 @@
 ;;; Copyright © 2025 Eric Bavier <bavier@posteo.net>
 ;;; Copyright © 2025 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2025 James Smith <jsubuntuxp@disroot.org>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1000,22 +1001,21 @@ information can be viewed in real time and/or logged to a file.")
    (source
     (origin
       (method git-fetch)
-       (uri
-        (git-reference
-         (url (string-append "https://github.com/dell/" name))
-         (commit (string-append "v" version))))
+       (uri (git-reference
+              (url "https://github.com/dell/libsmbios")
+              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"))))
    (build-system gnu-build-system)
    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("gettext" ,gettext-minimal)
-       ("libtool" ,libtool)
-       ("pkg-config" ,pkg-config)
-       ("perl" ,perl)
-       ("python" ,python)))
+     (list autoconf
+           automake
+           gettext-minimal
+           libtool
+           pkg-config
+           perl
+           python))
    (inputs
     (list libxml2))
    (arguments
@@ -89,14 +89,14 @@
 (define-public ibus-minimal
  (package
    (name "ibus")
-    (version "1.5.32")
+    (version "1.5.34-rc2")
    (source (origin
      (method git-fetch)
      (uri (git-reference
        (url "https://github.com/ibus/ibus")
        (commit version)))
      (file-name (git-file-name name version))
-      (sha256 (base32 "1rn2xpzi6x57n01rjin4a2h8yy1wdmvadgnglw0p6bdnc31q17a6"))))
+      (sha256 (base32 "1x05dwhi79s1mqgs34srdr2d5fvkyvihqvcnw91630xyf4r76b1h"))))
    (build-system glib-or-gtk-build-system)
    (outputs '("out" "doc"))
    (arguments
@@ -204,7 +204,7 @@
           wayland
           xmodmap))
    (native-inputs
-     (list autoconf
+     (list autoconf-2.72
           automake
           docbook-xml-4.1.2
           `(,glib "bin")               ;for glib-genmarshal
@@ -38,6 +38,7 @@
 ;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -305,7 +306,7 @@ actions.")
 (define-public geeqie
  (package
    (name "geeqie")
-    (version "2.6.1")
+    (version "2.7")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -313,11 +314,12 @@ actions.")
                    (commit (string-append "v" version))))
              (sha256
               (base32
-                "08yr8jqli33rn1zvj9mjvinyzjp2myakxgf8wqqq8yidmm0vvn1p"))
+                "139ffzqqq79d3k5q99r8i1jr9v9vfwv89dkh6vvw1mdnv6b3s9n8"))
              (file-name (git-file-name name version))))
    (build-system meson-build-system)
    (arguments
     (list
+      #:glib-or-gtk? #t
      #:phases
      #~(modify-phases %standard-phases
          ;; Disable test which requires binaries not present
@@ -346,6 +348,7 @@ actions.")
           libwebp))
    (native-inputs
     (list `(,glib "bin") ; glib-gettextize
+           gsettings-desktop-schemas
           intltool
           pkg-config
           python         ; for tests
@@ -924,15 +927,15 @@ with tiling window managers.  Features include:
           ;; That is required for testing.
           xorg-server-for-tests))
    (inputs
-     `(("imlib2" ,imlib2)
-       ("glib" ,glib)
-       ("gtk+" ,gtk+-2)
-       ("lcms" ,lcms)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libtiff" ,libtiff)
-       ("libexif" ,libexif)
-       ("libx11" ,libx11)
-       ("libxext" ,libxext)))
+     (list imlib2
+           glib
+           gtk+-2
+           lcms
+           libjpeg-turbo
+           libtiff
+           libexif
+           libx11
+           libxext))
    (arguments
     `(#:phases
       (modify-phases %standard-phases
@@ -71,11 +71,12 @@
  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
  #:use-module (gnu packages curl)
-  #:use-module (gnu packages compression)
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages fonts)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gcc)
@@ -96,10 +97,11 @@
  #:use-module (gnu packages mcrypt)
  #:use-module (gnu packages mp3)
  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages ocr)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages photo)
-  #:use-module (gnu packages popt)
  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages popt)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-check)
@@ -115,7 +117,6 @@
  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages fonts)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix gexp)
@@ -183,36 +184,81 @@ convert images in more than 100 different formats.")
 (define-public gradia
  (package
    (name "gradia")
-    (version "1.2.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/AlexanderVanhee/Gradia")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "07hal4h3kkjf7la02nqmqgw19sa6hkd130bkfmgwjimkv9zi8z2i"))))
+    (version "1.13.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/AlexanderVanhee/Gradia")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "00s6xj9crj5gkh233q98fmq67f41y877xgrn49cycwb3kybp237n"))))
    (build-system meson-build-system)
    (arguments
-     (list #:glib-or-gtk? #t
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'skip-gtk-update-icon-cache
-                 (lambda _
-                   (substitute* "meson.build"
-                     (("gtk_update_icon_cache: true")
-                      "gtk_update_icon_cache: false")
-                     (("update_desktop_database: true")
-                      "update_desktop_database: false")))))))
-    (inputs (list gtk libadwaita python python-pygobject))
-    (native-inputs
-     (list blueprint-compiler gettext-minimal `(,glib "bin") pkg-config))
+     (list
+      #:imported-modules (append %meson-build-system-modules
+                                 %pyproject-build-system-modules)
+      #:modules '((guix build meson-build-system)
+                  ((guix build pyproject-build-system)
+                   #:prefix py:)
+                  (guix build utils))
+      #:glib-or-gtk? #t
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false")
+                (("update_desktop_database: true")
+                 "update_desktop_database: false"))))
+          (add-after 'unpack 'set-tesseract-and-tessdata-path
+            (lambda _
+              (let* ((tesseract #$(this-package-input "tesseract-ocr"))
+                     (tesseract-bin (string-append tesseract "/bin/tesseract"))
+                     (tessdata (string-append tesseract "/share/tessdata")))
+                (substitute* "meson.build"
+                  (("OCR_TESSERACT_CMD = '/app/bin/tesseract'")
+                   (format #f "OCR_TESSERACT_CMD = '~a'" tesseract-bin))
+                  (("OCR_ORIGINAL_TESSDATA_DIR = '/app/share/tessdata'")
+                   (format #f "OCR_ORIGINAL_TESSDATA_DIR = '~a'" tessdata))))))
+          (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (wrap-program (string-append #$output "/bin/gradia")
+                `("GUIX_PYTHONPATH" =
+                  (,(getenv "GUIX_PYTHONPATH") ,(py:site-packages inputs
+                                                                  outputs)))
+                `("GI_TYPELIB_PATH" =
+                  (,(getenv "GI_TYPELIB_PATH")))
+                `("GDK_PIXBUF_MODULE_FILE" =
+                  (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))
+    (inputs (list bash-minimal
+                  gtk
+                  gtksourceview
+                  libadwaita
+                  libportal
+                  libsoup
+                  python
+                  python-pillow
+                  python-pycairo
+                  python-pygobject
+                  python-pytesseract
+                  tesseract-ocr
+                  webp-pixbuf-loader))
+    (native-inputs (list blueprint-compiler
+                         desktop-file-utils
+                         gettext-minimal
+                         `(,glib "bin")
+                         gobject-introspection
+                         pkg-config))
    (home-page "https://github.com/AlexanderVanhee/Gradia")
    (synopsis "Edit screenshots")
-    (description "Gradia is a GTK 4 application for enhancing and preparing
+    (description
+     "Gradia is a GTK 4 application for enhancing and preparing
 screenshots for blogs, social media, and documentation.  It supports background
 customization, annotation tools (pen, arrow, text, highlight, stamp), padding,
-cropping, and various export formats.")
+cropping, @acronym{OCR, optical character recognition} and various export formats.")
    (license license:gpl3+)))

 (define-public iqa
@@ -2808,7 +2854,7 @@ Format) file format decoder and encoder.")
 (define-public libjxl
  (package
    (name "libjxl")
-    (version "0.11.1")
+    (version "0.11.2")
    (outputs (list "out" "pixbuf-loader"))
    (source
     (origin
@@ -2819,7 +2865,7 @@ Format) file format decoder and encoder.")
             (recursive? #t)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1wfxzrhj8a19z6x47ib1qbmgyg56jsxjs955xcvqhdkrx8l2271r"))
+        (base32 "1c7d0mlxmmjby00hzgwqfyr6nb6lqcgcjsqcdmg2l10rmxiw33rg"))
       (modules '((guix build utils)))
       (snippet
        ;; Delete the bundles that will not be used.
@@ -18,6 +18,7 @@
 ;;; Copyright © 2024 Christian Miller <christian.miller@dadoes.de>
 ;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
+;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -421,8 +422,8 @@ using a mouse.  It is customizable and extensible with plugins and scripts.")
     (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://github.com/SrainApp/srain")
-             (commit version)))
+              (url "https://github.com/SrainApp/srain")
+              (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32 "105z2kbj9ar6zk6i1qrbysrp9vbz692kbl2dwdxcwly0yh4cbd0p"))))
@@ -433,11 +434,11 @@ using a mouse.  It is customizable and extensible with plugins and scripts.")
      #:tests? #f ;there are no tests
      #:glib-or-gtk? #t))
    (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("glib:bin" ,glib "bin")
-       ("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)
-       ("python-sphinx" ,python-sphinx)))
+     (list gettext-minimal
+           `(,glib "bin")
+           pkg-config
+           python-wrapper
+           python-sphinx))
    (inputs
     (list glib-networking
           gsettings-desktop-schemas
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2014-2019, 2021, 2026 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021, 2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017, 2022 Marius Bakke <marius@gnu.org>
@@ -226,6 +226,18 @@ JNI.")
             (setenv "JAVACMD" (search-input-file inputs "/bin/jamvm"))
             (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
             (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
+         ,@(if (target-x86-32?)
+               ;; XXX: On i686 isFile() always seems to return true.  Patching
+               ;; this here is very ugly, but the effects are limited.  None
+               ;; of these changes remain by the time we've built Icedtea and
+               ;; the other JDKs.
+               '((add-after 'unpack 'disable-isFile-checks
+                   (lambda _
+                     (substitute* "src/main/org/apache/tools/ant/util/ResourceUtils.java"
+                       (("destFile = \\(\\(FileProvider\\).*") ""))
+                     (substitute* "src/main/org/apache/tools/ant/taskdefs/Mkdir.java"
+                       (("dir.isFile\\(\\)") "false")))))
+               '())
         (replace 'build
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; Ant complains if this file doesn't exist.
@@ -165,17 +165,18 @@ ascii art drawings that contain characters that resemble lines like @samp{|}
                "017n1w6hds4wrz597jk7v8r6pz0kz5j9xwd240nq7s8hc58d4c2q"))
              (modules '((guix build utils)))
              (snippet
-               '(for-each
-                 delete-file
-                 (find-files "flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/"
-                             ".*")))))
+               ;; Remove pre-built native libraries.
+               '(for-each delete-file
+                          (find-files "." "\\.(dll|dylib|so)$")))))
    (build-system ant-build-system)
    (arguments
     (list
+      #:jdk openjdk17
      #:tests? #false                   ;XXX requires junit5
-      #:jar-name "flatlaf.jar"
-      #:source-dir '(list "flatlaf-core/src/main/java")
-      #:test-dir '(list "flatlaf-core/src/test")
+      #:modules '((guix build ant-build-system)
+                  (guix build java-utils)
+                  (guix build utils)
+                  (sxml simple))
      #:phases
      #~(modify-phases %standard-phases
          (add-before 'configure 'build-native-code
@@ -224,8 +225,58 @@ ascii art drawings that contain characters that resemble lines like @samp{|}
          (add-before 'build 'copy-resources
            (lambda _
              (copy-recursively "flatlaf-core/src/main/resources"
-                                "build/classes"))))))
-    (inputs (list libx11 libxt))
+                                "build/classes")))
+          (add-before 'build 'generate-pom
+            (lambda _
+              (call-with-output-file "pom.xml"
+                (lambda (port)
+                  (sxml->xml
+                   `(*TOP*
+                     (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")
+                     (project
+                      (modelVersion "4.0.0")
+                      (groupId "com.formdev")
+                      (artifactId "flatlaf")
+                      (version ,#$version)))
+                   port)))))
+          (replace 'build
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let* ((jdk (assoc-ref inputs "jdk"))
+                     (src-dir "flatlaf-core/src/main/java")
+                     (java9-dir "flatlaf-core/src/main/java9")
+                     (classes-dir "build/classes")
+                     (classes9-dir "build/classes9")
+                     (jar-file
+                      (string-append "build/flatlaf-" #$version ".jar")))
+                ;; Compile main sources (Java 8 target).
+                (apply invoke "javac"
+                       "--release" "8"
+                       "-d" classes-dir
+                       (find-files src-dir "\\.java$"))
+                ;; Compile Java 9 multi-release sources.
+                (mkdir-p classes9-dir)
+                (apply invoke "javac"
+                       "--release" "9"
+                       "-cp" classes-dir
+                       "-d" classes9-dir
+                       (find-files java9-dir "\\.java$"))
+                ;; Create multi-release JAR.
+                (let ((meta-versions
+                       (string-append classes-dir
+                                      "/META-INF/versions/9")))
+                  (mkdir-p meta-versions)
+                  (copy-recursively classes9-dir meta-versions))
+                (call-with-output-file "build/manifest.mf"
+                  (lambda (port)
+                    (display "Multi-Release: true\n" port)))
+                (invoke "jar" "--create"
+                        "--file" jar-file
+                        "--manifest" "build/manifest.mf"
+                        "-C" classes-dir "."))))
+          (replace 'install
+            (install-from-pom "pom.xml")))))
+    (inputs
+     (list libx11 libxt))
    (home-page "https://www.formdev.com/flatlaf/")
    (synopsis "Flat Look and Feel for Java Swing applications")
    (description "FlatLaf is a cross-platform Look and Feel for Java Swing
@@ -1088,9 +1088,9 @@ wrappers.")
  (origin
    (method git-fetch)
    (uri (git-reference (url "https://github.com/tc39/test262")
-                        (commit "a5e69a1534de88d1eb29b76657d84c8541b72df7")))
+                        (commit "a6f387de323eb9ae56448bdb71c5d315df631ce4")))
    (file-name "test262")
-    (sha256 (base32 "078a7nim0n9x36q7q8yvjwhk4ig29p25b03rr4l7g2b545cky66l"))
+    (sha256 (base32 "09avg4f75rzbmh3hcybdvjij7hbl2m79x6xp1hgl6h8ihfbn33l0"))
    (modules '((guix build utils)))
    (snippet #~(begin
                 (for-each delete-file
@@ -1100,7 +1100,7 @@ wrappers.")
 (define-public quickjs-ng
  (package
    (name "quickjs-ng")
-    (version "0.11.0")
+    (version "0.14.0")
    (source
     (origin
       (method git-fetch)
@@ -1109,11 +1109,7 @@ wrappers.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0mfk32zvvh6c9a9plp6ad07888g795lhdmal3jyaclyn2k5iig9i"))
-       ;; Remove these patches on next release as they will be included.
-       (patches (search-patches
-                 "quickjs-ng-64-bits-precision-on-i686.patch"
-                 "quickjs-ng-fix-atomics.pause-on-32-bit.patch"))))
+        (base32 "05k8niswh0ly5sx0129jdhiinqs84s86b7sv29ff68v3546dl04i"))))
    (arguments
     (list
      #:configure-flags
@@ -1146,6 +1142,23 @@ wrappers.")
                 "")
                (("BUILD_DIR=build")
                 "BUILD_DIR=../build"))))
+          ;; XXX: Unknown test failures in quickjs-ng 1.4.0.
+          ;; Remove for future versions.
+          (add-before 'configure 'skip-failing-tests
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let* ((test262 (assoc-ref inputs "test262"))
+                     (lang-path (in-vicinity test262 "test/language")))
+                (substitute* "test262.conf"
+                  (("# list excluded tests and directories here" all)
+                   (string-join
+                    (cons* all
+                           (map (lambda (f)
+                                  (in-vicinity lang-path f))
+                                '(;; export 'foo' in module /gnu/store is ambiguous
+                                  "module-code/ambiguous-export-bindings/"
+                                  ;; Could not find export 'default'
+                                  "import/import-attributes/text-self.js")))
+                    "\n"))))))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
@@ -485,11 +485,23 @@ to camera devices supported by @code{libgphoto2} using
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kate-" version ".tar.xz"))
       (sha256
-        (base32 "0ah6cy92yir68z25460ccl48i5nrfqswpzil9a7l69h3qxspsk88"))))
+        (base32 "0ah6cy92yir68z25460ccl48i5nrfqswpzil9a7l69h3qxspsk88"))
+       (modules '((guix build utils)))
+       ;; Unbundle SingleApplication.
+       (snippet
+        '(begin
+           (delete-file-recursively "3rdparty/SingleApplication")
+           (with-directory-excursion "apps/kate"
+             (substitute* "CMakeLists.txt"
+               ((".*3rdparty.*") "")
+               ((" -DQAPPLICATION_CLASS=FreeStandingSingleApplication") ""))
+             (substitute* "main.cpp"
+               (("(#include )\"SingleApplication\\/SingleApplication\"" _ keep)
+                (string-append keep "<SingleApplication>"))))))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools xorg-server-for-tests))
-    ;; TODO: Unbundle rapidjson and SingleApplication.
+    ;; TODO: Unbundle rapidjson.
    (inputs
     (list breeze-icons ;; default icon set
           karchive
@@ -515,11 +527,20 @@ to camera devices supported by @code{libgphoto2} using
           libxkbcommon
           plasma-activities
           qtsvg
-           qtwayland))
+           qtwayland
+           single-application))
    (arguments
     (list #:qtbase qtbase
           #:phases
           #~(modify-phases %standard-phases
+               (add-after 'unpack 'link-single-application
+                 (lambda _
+                   (substitute* "apps/kate/CMakeLists.txt"
+                     (("target_link_libraries\\(kate-bin PRIVATE kateprivate"
+                       all)
+                      (string-append all " "
+                                     #$(this-package-input "single-application")
+                                     "/lib/libSingleApplication.a")))))
               (add-after 'unpack 'patch-tests
                 (lambda* (#:key inputs #:allow-other-keys)
                   ;; This test requires a 'bin' diretory under '/usr'.
@@ -24,6 +24,7 @@
  #:use-module (guix packages)
  #:use-module (gnu packages golang-build)
  #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-crypto)
  #:use-module (gnu packages golang-web)
  #:use-module (gnu packages golang-xyz)
  #:use-module (gnu packages prometheus))
@@ -33,6 +34,313 @@
 ;;; Libraries:
 ;;;

+(define-public go-go-etcd-io-etcd-client-v3
+  (package
+    (name "go-go-etcd-io-etcd-client-v3")
+    (version "3.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/etcd-io/etcd")
+             (commit (go-version->git-ref version #:subdir "client"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0d9rjyl5h0xm9isgr8b2fz8528wk3pds71rjl8g08fgsmsa5kicb"))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet #~(begin
+                    (define (delete-all-but directory . preserve)
+                      (with-directory-excursion directory
+                        (let* ((pred (negate (cut member <>
+                                                  (cons* "." ".." preserve))))
+                               (items (scandir "." pred)))
+                          (for-each (cut delete-file-recursively <>) items))))
+                    ;; Replace symlinks to tests with file contents
+                    (for-each
+                     (lambda (f)
+                       (delete-file (string-append "client/v3/" f))
+                       (copy-file (string-append
+                                   "tests/integration/clientv3/examples/" f)
+                                  (string-append "client/v3/" f)))
+                     (list "example_auth_test.go"
+                           "example_cluster_test.go"
+                           "example_kv_test.go"
+                           "example_lease_test.go"
+                           "example_maintenance_test.go"
+                           "example_metrics_test.go"
+                           "example_test.go"
+                           "example_watch_test.go"))
+                    (for-each
+                     (lambda (f)
+                       (delete-file
+                        (string-append "client/v3/concurrency/" f))
+                       (copy-file
+                        (string-append "tests/integration/clientv3/concurrency/" f)
+                        (string-append "client/v3/concurrency/" f)))
+                     (list "example_election_test.go"
+                           "example_mutex_test.go"
+                           "example_stm_test.go"))
+                    ;; Copy sertificates for tests.
+                    (mkdir-p "client/v3/tests/fixtures")
+                    (substitute* "client/v3/yaml/config_test.go"
+                      (("\\.\\./\\.\\./\\.\\./") "../"))
+                    (for-each
+                     (lambda (f)
+                       (copy-file
+                        (string-append "tests/fixtures/" f)
+                        (string-append "client/v3/tests/fixtures/" f)))
+                     (list "server.crt"
+                           "server.key.insecure"
+                           "ca.crt"))
+                    ;; Keep source related to expected import-path.
+                    (delete-all-but "." "client")
+                    (delete-file-recursively "client/pkg")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      ;; TODO: Tests a shaky and fail a lot, check how run unittests.
+      #:tests? #f 
+      #:import-path "go.etcd.io/etcd/client/v3"
+      #:unpack-path "go.etcd.io/etcd"))
+    (native-inputs
+     (list go-github-com-grpc-ecosystem-go-grpc-middleware-providers-prometheus
+           go-github-com-prometheus-client-golang
+           go-github-com-stretchr-testify
+           go-go-etcd-io-etcd-client-pkg-v3
+           go-go-uber-org-zap
+           go-google-golang-org-grpc))
+    (propagated-inputs
+     (list go-github-com-coreos-go-semver
+           go-github-com-dustin-go-humanize
+           go-github-com-grpc-ecosystem-go-grpc-middleware-v2
+           go-go-etcd-io-etcd-api-v3
+           go-sigs-k8s-io-yaml))
+    (home-page "https://github.com/etcd-io/etcd")
+    (synopsis "Golang client for ETCD")
+    (description
+     "This package implements the official Go client for etcd.")
+    (license license:asl2.0)))
+
+(define-public go-go-etcd-io-etcd-server-v3
+  (package
+    (name "go-go-etcd-io-etcd-server-v3")
+    (version "3.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/etcd-io/etcd")
+             (commit (go-version->git-ref version
+                                          #:subdir "server"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0d9rjyl5h0xm9isgr8b2fz8528wk3pds71rjl8g08fgsmsa5kicb"))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet #~(begin
+                    (define (delete-all-but directory . preserve)
+                      (with-directory-excursion directory
+                        (let* ((pred (negate (cut member <>
+                                                  (cons* "." ".." preserve))))
+                               (items (scandir "." pred)))
+                          (for-each (cut delete-file-recursively <>) items))))
+                    (delete-all-but "." "server")
+                    (rename-file "server" "server.tmp")
+                    (mkdir-p "server/v3")
+                    (rename-file "server.tmp" "server/v3")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:tests? #f ;Setup fails
+      #:import-path "go.etcd.io/etcd/server/v3"
+      #:unpack-path "go.etcd.io/etcd"))
+    (propagated-inputs
+     (list go-github-com-coreos-go-semver
+           go-github-com-coreos-go-systemd-v22
+           go-github-com-dustin-go-humanize
+           go-github-com-gogo-protobuf
+           go-github-com-golang-groupcache
+           go-github-com-golang-jwt-jwt-v5
+           go-github-com-golang-protobuf
+           go-github-com-google-btree
+           go-github-com-google-go-cmp
+           go-github-com-grpc-ecosystem-go-grpc-middleware
+           go-github-com-grpc-ecosystem-go-grpc-middleware-providers-prometheus
+           go-github-com-grpc-ecosystem-grpc-gateway-v2
+           go-github-com-jonboulle-clockwork
+           go-github-com-prometheus-client-golang
+           go-github-com-prometheus-client-model
+           go-github-com-soheilhy-cmux
+           go-github-com-spf13-cobra
+           go-github-com-stretchr-testify
+           go-github-com-tmc-grpc-websocket-proxy
+           go-github-com-xiang90-probing
+           go-go-etcd-io-bbolt
+           go-go-etcd-io-etcd-client-v3
+           go-go-etcd-io-etcd-pkg-v3
+           go-go-etcd-io-raft-v3
+           go-go-opentelemetry-io-contrib-instrumentation-google-golang-org-grpc-otelgrpc
+           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-uber-org-zap
+           go-golang-org-x-crypto
+           go-golang-org-x-net
+           go-golang-org-x-time
+           go-google-golang-org-genproto-googleapis-api
+           go-google-golang-org-grpc
+           go-google-golang-org-protobuf
+           go-gopkg-in-natefinch-lumberjack-v2
+           go-sigs-k8s-io-json
+           go-sigs-k8s-io-yaml))
+    (home-page "https://go.etcd.io/etcd")
+    (synopsis "Server package for ETCD")
+    (description
+     "This package provides a server for the ETCD distributed key-value storage
+system.")
+    (license license:asl2.0)))
+
+
+(define-public go-go-etcd-io-etcd-pkg-v3
+  (package
+    (name "go-go-etcd-io-etcd-pkg-v3")
+    (version "3.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/etcd-io/etcd")
+              (commit (go-version->git-ref version
+                                           #:subdir "pkg"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0d9rjyl5h0xm9isgr8b2fz8528wk3pds71rjl8g08fgsmsa5kicb"))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet #~(begin
+                    (define (delete-all-but directory . preserve)
+                      (with-directory-excursion directory
+                        (let* ((pred (negate (cut member <>
+                                                  (cons* "." ".." preserve))))
+                               (items (scandir "." pred)))
+                          (for-each (cut delete-file-recursively <>) items))))
+                    (delete-all-but "." "pkg")
+                    (rename-file "pkg" "pkg.tmp")
+                    (mkdir-p "pkg/v3")
+                    (rename-file "pkg.tmp" "pkg/v3")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:tests? #f       ;TODO: Tests hang, select some subset
+      #:import-path "go.etcd.io/etcd/pkg/v3"
+      #:unpack-path "go.etcd.io/etcd"))
+    (native-inputs
+     (list go-github-com-spf13-cobra
+           go-github-com-spf13-pflag
+           go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-creack-pty
+           go-github-com-dustin-go-humanize
+           go-go-etcd-io-etcd-client-pkg-v3
+           go-go-uber-org-zap
+           go-google-golang-org-grpc))
+    (home-page "https://github.com/etcd-io/etcd")
+    (synopsis "Utility packages for etcd")
+    (description
+     "This package is a collection of utility packages used by etcd without
+being specific to etcd itself.")
+    (license license:asl2.0)))
+
+(define-public go-k8s-io-apiserver
+  (package
+    (name "go-k8s-io-apiserver")
+    (version "0.34.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/kubernetes/apiserver")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06bcbdnlhg1mwky6i1519n1nhlh8rxc9qv7jwqjhc03m2ql3bb8q"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:tests? #f ;TODO: Tests require unpackaged dependencies
+      #:embed-files
+      #~(list "authoring\\.tmpl" "api__v1_openapi\\.json")
+      #:import-path "k8s.io/apiserver"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-blang-semver-v4
+           go-github-com-coreos-go-oidc
+           go-github-com-coreos-go-systemd-v22
+           go-github-com-emicklei-go-restful-v3
+           go-github-com-fsnotify-fsnotify
+           go-github-com-go-logr-logr
+           go-github-com-gogo-protobuf
+           go-github-com-google-btree
+           go-github-com-google-cel-go
+           go-github-com-google-gnostic-models
+           go-github-com-google-go-cmp
+           go-github-com-google-uuid
+           go-github-com-gorilla-websocket
+           go-github-com-grpc-ecosystem-go-grpc-prometheus
+           go-github-com-munnerz-goautoneg
+           go-github-com-mxk-go-flowrate
+           go-github-com-spf13-pflag
+           go-go-etcd-io-etcd-api-v3
+           go-go-etcd-io-etcd-client-pkg-v3
+           go-go-etcd-io-etcd-client-v3
+           go-go-etcd-io-etcd-server-v3
+           go-go-opentelemetry-io-contrib-instrumentation-google-golang-org-grpc-otelgrpc
+           go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp
+           go-go-opentelemetry-io-otel
+           go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracegrpc
+           go-go-opentelemetry-io-otel-metric
+           go-go-opentelemetry-io-otel-sdk
+           go-go-opentelemetry-io-otel-trace
+           go-go-uber-org-zap
+           go-golang-org-x-crypto
+           go-golang-org-x-net
+           go-golang-org-x-sync
+           go-golang-org-x-sys
+           go-golang-org-x-time
+           go-google-golang-org-genproto-googleapis-api
+           go-google-golang-org-grpc
+           go-google-golang-org-protobuf
+           go-gopkg-in-evanphx-json-patch-v4
+           go-gopkg-in-go-jose-go-jose-v2
+           go-gopkg-in-natefinch-lumberjack-v2
+           go-k8s-io-api
+           go-k8s-io-apimachinery
+           go-k8s-io-client-go
+           go-k8s-io-component-base
+           go-k8s-io-klog-v2
+           go-k8s-io-kms
+           go-k8s-io-kube-openapi
+           go-k8s-io-utils
+           go-sigs-k8s-io-apiserver-network-proxy-konnectivity-client
+           go-sigs-k8s-io-json
+           go-sigs-k8s-io-randfill
+           go-sigs-k8s-io-structured-merge-diff-v6
+           go-sigs-k8s-io-yaml))
+    (home-page "https://github.com/kubernetes/apiserver")
+    (synopsis "Library for building a Kubernetes aggregated API server")
+    (description
+     "This package provides a generic library for building a Kubernetes
+aggregated API server.")
+    (license license:asl2.0)))
+
 (define-public go-k8s-io-component-base
  (package
    (name "go-k8s-io-component-base")
@@ -87,6 +395,39 @@
     "This package contains shared code for Kubernetes core components.")
    (license license:asl2.0)))

+(define-public go-sigs-k8s-io-apiserver-network-proxy-konnectivity-client
+  (package
+    (name "go-sigs-k8s-io-apiserver-network-proxy-konnectivity-client")
+    (version "0.34.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/kubernetes-sigs/apiserver-network-proxy")
+              (commit (go-version->git-ref version
+                                           #:subdir "konnectivity-client"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1kh92blfpmrmklxqg5j0p07yz534gjzhm44xj8bh5pad3y5zw5m0"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "sigs.k8s.io/apiserver-network-proxy/konnectivity-client"
+      #:unpack-path "sigs.k8s.io/apiserver-network-proxy"))
+    (native-inputs
+     (list go-go-uber-org-goleak))
+    (propagated-inputs
+     (list go-github-com-prometheus-client-golang
+           go-google-golang-org-grpc
+           go-google-golang-org-protobuf
+           go-k8s-io-klog-v2))
+    (home-page "https://sigs.k8s.io/apiserver-network-proxy")
+    (synopsis "Network proxy for Kubernetes API server")
+    (description
+     "This package provides a network proxy for the Kubernetes API server.")
+    (license license:asl2.0)))
+

 ;;;
 ;;; Executables:
@@ -205,8 +205,7 @@
       (search-patches
        "librewolf-compare-paths.patch"
        "librewolf-use-system-wide-dir.patch"
-        "librewolf-add-store-to-rdd-allowlist.patch"
-        "librewolf-150.0-encoding_rs-rust-fix.patch"))
+        "librewolf-add-store-to-rdd-allowlist.patch"))
      ;; Slim down the tarball by removing unbundled libraries and 75 Mo (800+
      ;; Mo uncompressed) of unused tests.
      ;; TODO: Unbundle security/nss and media/libpng.
@@ -239,23 +238,23 @@
 ;;; but since in Guix only the latest packaged Rust is officially supported,
 ;;; it is a tradeoff worth making.
 ;;; 0: https://firefox-source-docs.mozilla.org/writing-rust-code/update-policy.html
-(define rust-librewolf rust-1.93)
+(define rust-librewolf rust-1.94)

 ;; Update this id with every update to its release date.
 ;; 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 "20260421153818")
+(define %librewolf-build-id "20260428201413")

 (define-public librewolf
  (package
    (name "librewolf")
-    (version "150.0-1")
+    (version "150.0.1-1")
    (source
     (make-librewolf-source
      #:version version
-      #:firefox-hash "151rxzl80dm8jsxl6fwzgbirwq4zpms5adwwnbjcwdd1r3s3vr7v"
-      #:librewolf-hash "0iw9v3zc1fxc93yyhldqarxaypgmbndh2ylsy330kcbpb6p1gnmr"
+      #:firefox-hash "1v3fbwvd0khm3xwsgwcp6wpwmkz0v6fyk37hxj0mqkwjimqgmkra"
+      #:librewolf-hash "0294lsiyvfh93id04xki4bhs8d84vmysqviivxiif0xfzqv65qzp"
      #:l10n firefox-l10n))
    (build-system gnu-build-system)
    (arguments
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2021, 2021-2025 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2021, 2021-2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
@@ -87,6 +87,7 @@
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2025 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
+;;; Copyright © 2026 Simen Endsjø <contact@simendsjo.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -528,10 +529,27 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                        "linux-" version ".tar.xz"))
    (sha256 hash)))

+;; The current "mainline" kernel.
+
+(define-public linux-libre-7.0-version "7.0.3")
+(define-public linux-libre-7.0-gnu-revision "gnu")
+(define deblob-scripts-7.0
+  (linux-libre-deblob-scripts
+   linux-libre-7.0-version
+   linux-libre-7.0-gnu-revision
+   (base32 "0pqhhkpq61rvdiyas28x7kclsz1iribzwsyf81gbic56ci4z2ldv")
+   (base32 "0a7572zw5y3k4gs4p3h5w0s9bhd63pdjxz6vxbr96sq6r8b6k02n")))
+(define-public linux-libre-7.0-pristine-source
+  (let ((version linux-libre-7.0-version)
+        (hash (base32 "074zjl0v901a9hafgpcxyyd395qs7y4kr4fcpgg3ssc8ayzsvv8b")))
+   (make-linux-libre-source version
+                            (%upstream-linux-source version hash)
+                            deblob-scripts-7.0)))
+
 ;; 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.12")
+(define-public linux-libre-6.19-version "6.19.14")
 (define-public linux-libre-6.19-gnu-revision "gnu")
 (define deblob-scripts-6.19
  (linux-libre-deblob-scripts
@@ -541,12 +559,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 "1md8b270pdyk9d8cq0qyr8qmymcijmj3gc39nn394wpr0l94yp6f")))
+        (hash (base32 "11giqsz9qa7s9lm94nn4h1bcb2411crsbfyvzrvhfjmy75kvzs6d")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.19)))

-(define-public linux-libre-6.18-version "6.18.22")
+(define-public linux-libre-6.18-version "6.18.26")
 (define-public linux-libre-6.18-gnu-revision "gnu")
 (define deblob-scripts-6.18
  (linux-libre-deblob-scripts
@@ -556,7 +574,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 "0nazlm6j5blyd4qgl0z6xc3qk00vz3cfvx5mqv18awv5ygx94g52")))
+        (hash (base32 "1v5h0w3s8p5m22jxg992x1jfpwyi80ia70cdgiv47q3n6xfjyxsk")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.18)))
@@ -565,7 +583,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.81")
+(define-public linux-libre-6.12-version "6.12.85")
 (define-public linux-libre-6.12-gnu-revision "gnu")
 (define deblob-scripts-6.12
  (linux-libre-deblob-scripts
@@ -575,12 +593,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 "0iw84bqdbh9dlaqd1bqgldg50riw2b5is7ipqnbp0sll8cv9rc62")))
+        (hash (base32 "1v8a0z6znmr2m26l4744wndaimsh24zz6q4d7m4p8s0ayjcwjnp3")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.12)))

-(define-public linux-libre-6.6-version "6.6.134")
+(define-public linux-libre-6.6-version "6.6.137")
 (define-public linux-libre-6.6-gnu-revision "gnu")
 (define deblob-scripts-6.6
  (linux-libre-deblob-scripts
@@ -590,12 +608,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 "1grp1wqgzjsk6xyl0nvd2hxlxjj0wgz04x544zkz8srp6rxnjy33")))
+        (hash (base32 "1i2npnsnhk41a88vimr521rxg77kljbkqmlyk1zrv7z4ic6ykwcj")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.6)))

-(define-public linux-libre-6.1-version "6.1.168")
+(define-public linux-libre-6.1-version "6.1.170")
 (define-public linux-libre-6.1-gnu-revision "gnu")
 (define deblob-scripts-6.1
  (linux-libre-deblob-scripts
@@ -605,12 +623,12 @@ 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 "0vkp75sfnjvfqxjh6gqcx24h2m6qj6xkwlw6b118cja43vjnz1g0")))
+        (hash (base32 "0i29gilsvl7vx7p6vqg0bc0d40ir1b968hyfjhdfms55g4pr2y5m")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.1)))

-(define-public linux-libre-5.15-version "5.15.202")
+(define-public linux-libre-5.15-version "5.15.204")
 (define-public linux-libre-5.15-gnu-revision "gnu")
 (define deblob-scripts-5.15
  (linux-libre-deblob-scripts
@@ -620,7 +638,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
   (base32 "1s6km2r2mad0wpf7nqn4rqsykw1lm386l1yskmil24239fbva1f1")))
 (define-public linux-libre-5.15-pristine-source
  (let ((version linux-libre-5.15-version)
-        (hash (base32 "1m6d53qx1ah4jwpa8hwjdmq0jn2hf7xmz1li6rwpdqjp97vvvh8b")))
+        (hash (base32 "1kfvfvzhdgjcj1pa2aqks3iah00ilfpp1i9bmbwjr3na0crlrzcv")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-5.15)))
@@ -668,6 +686,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (patches (append (origin-patches source)
                     patches))))

+(define-public linux-libre-7.0-source
+  (source-with-patches linux-libre-7.0-pristine-source
+                       (list %linux-libre-arm-export-__sync_icache_dcache-patch)))
+
 (define-public linux-libre-6.19-source
  (source-with-patches linux-libre-6.19-pristine-source
                       (list %boot-logo-patch
@@ -790,6 +812,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (description "Headers of the Linux-Libre kernel.")
    (license license:gpl2)))

+(define-public linux-libre-headers-7.0
+  (make-linux-libre-headers* linux-libre-7.0-version
+                             linux-libre-7.0-gnu-revision
+                             linux-libre-7.0-source))
+
 (define-public linux-libre-headers-6.19
  (make-linux-libre-headers* linux-libre-6.19-version
                             linux-libre-6.19-gnu-revision
@@ -1176,6 +1203,14 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
 ;;; Generic kernel packages.
 ;;;

+(define-public linux-libre-7.0
+  (make-linux-libre* linux-libre-7.0-version
+                     linux-libre-7.0-gnu-revision
+                     linux-libre-7.0-source
+                     '("x86_64-linux" "i686-linux" "armhf-linux"
+                       "aarch64-linux" "powerpc64le-linux" "riscv64-linux")
+                     #:configuration-file kernel-config))
+
 (define-public linux-libre-6.19
  (make-linux-libre* linux-libre-6.19-version
                     linux-libre-6.19-gnu-revision
@@ -2797,6 +2832,76 @@ kernel modules to control the keyboard on most Tuxedo computers. The @code{tuxed
 module is also needed for the @code{tuxedo-control-center} (short tcc) package.")
    (license license:gpl2+)))

+(define-public evdi
+  (package
+    (name "evdi")
+    (version "1.14.15")                  ;inherited by libevdi
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/DisplayLink/evdi")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "065mfwmb4nw71s0f0ax9si8xpbr1sah1bhxvq1k81yicvi83wsxn"))))
+    (build-system linux-module-build-system)
+    (arguments
+     (list #:tests? #f                  ;no test suite
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'chdir
+                          (lambda _
+                            (chdir "module")))
+                        ;; Looks like the value is only there to detect RHEL
+                        ;; derivatives, so we can safely delete the include.
+                        (add-after 'unpack 'embed-/etc/os-release
+                          (lambda _
+                            (substitute* "module/Makefile"
+                              (("include /etc/os-release") "")))))))
+    (home-page "https://github.com/DisplayLink/evdi")
+    (synopsis
+     "@acronym{EVDI, Extensible Virtual Display Interface} Linux kernel module")
+    (description
+     "The @acronym{EVDI, Extensible Virtual Display Interface} is a Linux kernel
+module that enables management of multiple screens, allowing user-space programs
+to take control over what happens with the image.  It is essentially a virtual
+display for which applications using the @code{libevdi} library can add, remove,
+and receive screen updates.
+
+The EVDI driver uses the standard Linux @acronym{DRM, Direct Rendering Manager}.
+Its displays can be controlled by standard tools such as @command{xrandr} and
+display settings applets in graphical environments.")
+    (license license:gpl2)))
+
+(define-public libevdi
+  (package
+    (inherit evdi)
+    (name "libevdi")
+    (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)
+                        (add-after 'unpack 'chdir
+                          (lambda _
+                            (chdir "library")))
+                        (replace 'install
+                          (lambda* _
+                            (let* ((lib (string-append #$output "/lib")))
+                              (mkdir-p lib)
+                              (install-file "libevdi.so" lib)))))))
+    (inputs (list libdrm))
+    (native-inputs (list pkg-config))
+    (synopsis
+     "@acronym{EVDI, Extensible Virtual Display Interface} user-space library")
+    (description
+     "Libevdi is a library that gives applications easy access to
+@acronym{EVDI, Extensible Virtual Display Interface} devices provided by the
+@code{evdi} driver package.")
+    (license license:lgpl2.1)))
+
 (define-public ec
  (package
    (name "ec")
@@ -4295,6 +4400,42 @@ external rate conversion.")
                   ;; `rate/rate_samplerate.c': LGPL v2.1 or later.
                   license:lgpl2.1+))))

+(define-public snd-rane-sl3
+  (let ((commit "01099892261b55ec5ee814292d840eeb664c1904")
+        (revision "0"))
+    (package
+      (name "snd-rane-sl3")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/nvgeele/snd-rane-sl3")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1j2aan5xmbi8hgkzzwjb7rarqh4g65rg3s1qd1c8x5m6fpqdnvli"))))
+      (build-system linux-module-build-system)
+      (arguments
+       (list
+        #:tests? #f ;No tests.
+        #:phases
+        #~(modify-phases %standard-phases
+            (delete 'configure)
+            (add-before 'build 'change-directory
+              (lambda _
+                (chdir "snd-rane-sl3"))))))
+      (inputs (list linux-libre-headers))
+      (home-page "https://github.com/nvgeele/snd-rane-sl3")
+      (synopsis
+       "Linux ALSA kernel driver for the Rane SL3 USB Audio interface")
+      (description
+       "snd-rane-sl3 provides a native Linux kernel module that
+enables the Rane SL3 to work as a standard ALSA audio device, supporting 6
+channels (3 stereo pairs) of 24-bit PCM audio at 44.1kHz and 48kHz sample
+rates.")
+      (license license:gpl3))))
+
 (define-public iptables
  (package
    (name "iptables")
@@ -10319,7 +10460,6 @@ known as Slingshot.")
                  (cons package extra)
                  '()))))
       (append (list rdma-core libnl)
-               (if-supported rocr-runtime)
               (if-supported psm)
               (if-supported psm2)
               (if-supported libcxi curl json-c))))
@@ -10363,6 +10503,15 @@ applications deal with directly.  It works in conjunction with provider
 libraries, which are often integrated directly into libfabric.")
    (license (list license:bsd-2 license:gpl2)))) ;dual

+;; Note: ROCm support is kept separate to avoid a significant increase in
+;; closure size: <https://codeberg.org/guix/guix/issues/7225>.
+(define-public libfabric-rocm
+  (package/inherit libfabric
+    (name "libfabric-rocm")
+    (inputs (modify-inputs inputs
+              (append rocr-runtime)))
+    (synopsis "Open Fabric Interfaces (with ROCm support)")))
+
 (define-public libfabric-1                        ;needed by Open MPI 4.x
  (package
    (inherit libfabric)
@@ -11386,7 +11535,7 @@ of Linux application development.")
 (define-public wireplumber
  (package
    (name "wireplumber")
-    (version "0.5.12")
+    (version "0.5.14")
    (source
     (origin
       (method git-fetch)
@@ -11396,7 +11545,7 @@ of Linux application development.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1dljz669ywy1lvvn0jh14ymynmbii45q5vay71zajpcg31249dyw"))))
+        (base32 "0rr2vlbwjjhgsk6lk2iwaww21gks2v63f0cs01rh2mdi8jpfz7h2"))))
    (build-system meson-build-system)
    (arguments
     `(#:configure-flags '("-Dsystemd=disabled"
@@ -12119,7 +12268,7 @@ that avoids the usage of older system-wide @file{/sys} interface.")
 (define-public libtracefs
  (package
    (name "libtracefs")
-    (version "1.7.0")
+    (version "1.8.3")
    (source
     (origin
       (method git-fetch)
@@ -12128,25 +12277,16 @@ 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 "0v896n3q0df0nxx5drbwyaqhrqiyxl06rvrdw3gp2r37awa9g1zb"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            (substitute* (list "Makefile" "scripts/utils.mk")
-              (("/bin/(pwd)" _ command) command))))))
-    (build-system gnu-build-system)
+        (base32 "1bc4mwf488nlja64zawjznvb6640vchjb25xa02v53x6qfb1mpmq"))))
+    (build-system meson-build-system)
    (arguments
     (list
-      #:tests? #f                       ; no test suite
-      #:make-flags
-      #~(list
-         (string-append "CC=" #$(cc-for-target))
-         (string-append "pkgconfig_dir=" #$output "/lib/pkgconfig")
-         (string-append "prefix=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure))))        ; no configure script
-    (native-inputs (list pkg-config))
+      #:configure-flags
+      #~(list "-Ddoc=false")))
+    (native-inputs
+     (list bison
+           flex
+           pkg-config))
    (inputs (list libtraceevent))
    (home-page "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/")
    (synopsis "Linux kernel trace file system library")
@@ -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 "bf475c8c53e02a2e0cb29deab4d101d25743bfca")
-        (revision "5"))
+  (let ((commit "14ed6dc733f8c23c1a345ceb11d3f75ee47f7525")
+        (revision "6"))
    (package
      (name "sbcl-coalton")
      (version (git-version "0.0.1" revision commit))
@@ -12995,12 +12995,16 @@ score.  When evaluated, the musical score is rendered to an image.")
               (commit commit)))
         (file-name (git-file-name "cl-coalton" version))
         (sha256
-          (base32 "0zrp2s82n2mxx7knbnbsdj64zar21nnnf8iwzrqzs4g3v6xpyz9z"))))
+          (base32 "024n72lxi8nycy012lqy6zx19lv7jh2ngs1mf559rw8kgwh3k54c"))))
      (build-system asdf-build-system/sbcl)
      (native-inputs
-       (list sbcl-fiasco))
+       (list sbcl-fiasco
+             sbcl-html-entities
+             sbcl-spinneret
+             sbcl-yason))
      (inputs
       (list sbcl-alexandria
+             sbcl-computable-reals
             sbcl-concrete-syntax-tree
             sbcl-eclector
             sbcl-float-features
@@ -13556,10 +13560,10 @@ place outside with-notes.
  (sbcl-package->ecl-package sbcl-compiler-macro-notes))

 (define-public sbcl-computable-reals
-  (let ((commit "fdc73d75e79d0a4ce6d01c822c950ae2eb137d39"))
+  (let ((commit "607a5d5b95387c06f92a661aa5562a7be0f5cad8"))
    (package
      (name "sbcl-computable-reals")
-      (version (git-version "1.1.0" "1" commit))
+      (version (git-version "1.1.0" "2" commit))
      (source
       (origin
         (method git-fetch)
@@ -13568,7 +13572,7 @@ place outside with-notes.
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0f12axi53x14l12dgf4a1lfq3p1fx7fh7sjfc0db3lk88ph9qfwl"))))
+          (base32 "1x8kkdyjil0zzg8fq9b76z12kmfrqwhsxnr6qqnlrg0c8c5bzz9c"))))
      (build-system asdf-build-system/sbcl)
      (home-page "https://github.com/stylewarning/computable-reals")
      (synopsis "Arbitrary-precision, re-computing real-numbers in Common Lisp")
@@ -22847,16 +22851,6 @@ specification}, a toolkit for writing GUIs in Common Lisp.")
 (define-public cl-mcclim
  (sbcl-package->cl-source-package sbcl-mcclim))

-(define-public ecl-mcclim
-  (let ((pkg (sbcl-package->ecl-package sbcl-mcclim)))
-    (package
-      (inherit pkg)
-      (arguments
-       (substitute-keyword-arguments arguments
-         ;; Tests fail with "FUNCTION: Not a valid argument (R1
-         ;; (GENERATE-REGION))."  on ECL.
-         ((#:tests? _ #f) #f))))))
-
 (define-public sbcl-md5
  (package
    (name "sbcl-md5")
@@ -29767,7 +29761,7 @@ the Processing language and shares some of the API.")
  ;; Update together with emacs-slime.
  (package
    (name "sbcl-slime-swank")
-    (version "2.31")
+    (version "2.32")
    (source
     (origin
       (file-name (git-file-name "cl-slime-swank" version))
@@ -29776,7 +29770,7 @@ the Processing language and shares some of the API.")
             (url "https://github.com/slime/slime/")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "0nv99wq2vz053p0rn9953rhmyz4g40zdl01mz7z9xbklxzbsx6x7"))
+        (base32 "0s7m7j7y1p8fb6ncpxcxdrrrxp5aw67xl7wrqy8zjjvwzljbs548"))
       (modules '((guix build utils)))
       (snippet
        ;; The doc folder drags `gawk' into the closure.  Doc is already
@@ -229,42 +229,25 @@ provides some unique features such as CSV log format and wide string support.")
 (define-public multitail
  (package
    (name "multitail")
-    (version "6.5.2")
+    (version "7.1.5")
    (source
     (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/halturin/multitail")
-            (commit (string-append "v" version))))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32 "17hg5qpangyx4m7hp2x4h56mp6w3wsaslg1il39qcpwsffh1rihc"))))
-    (build-system gnu-build-system)
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/folkertvanheusden/multitail")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11kkd2rg3qc7ck5iyha0f8l5lqc1bvwypn80di0h77h7p106blvk"))))
+    (build-system cmake-build-system)
    (arguments
-     `(#:make-flags
-       (list (string-append "CC=" ,(cc-for-target))
-             (string-append "PREFIX=" (assoc-ref %outputs "out"))
-             "SYSCONFDIR=$(PREFIX)/etc")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-broken-build
-           ;; With some luck, you might be able to remove this when updating…
-           (lambda _
-             (substitute* "Makefile"
-               ((" \\*\\.txt") "")
-               ((".*CONFIG_DIR.*") "")
-               (("^install: .*" match)
-                (string-append match
-                               "\t$(INSTALL_DIR) $(DESTDIR)$(SYSCONFDIR)\n")))
-             (substitute* "version"
-               (("(VERSION=).*" _ assign)
-                (string-append assign ,version)))))
-         (add-after 'unpack 'patch-curses-headers
-           (lambda _
-             (substitute* "mt.h"
-               (("ncursesw/") ""))))
-         (delete 'configure))           ; no configure script
-       #:tests? #f)) ; no test suite (make check just runs cppcheck)
+     (list
+      #:tests? #f                       ;no test suite
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-curses-headers
+                     (lambda _
+                       (substitute* "mt.h"
+                         (("ncursesw/") "")))))))
    (inputs (list ncurses))
    (home-page "https://vanheusden.com/multitail/")
    (synopsis "Monitor multiple log files")
@@ -1129,7 +1129,7 @@ Grammars (PEGs).")
 (define (make-lua-luv name lua)
  (package
    (name name)
-    (version "1.43.0-0")
+    (version "1.44.2-0")
    (source (origin
              ;; The release tarball includes the sources of libuv but does
              ;; not include the pkg-config files.
@@ -1140,7 +1140,7 @@ Grammars (PEGs).")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
+                "0jdvsznzha290gnzd66vscsdacd5dapq0scwy4zj64d9wnsv39p7"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                      ; there are none
@@ -57,7 +57,7 @@
 ;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Benjamin Slade <slade@lambda-y.net>
 ;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
-;;; Copyright © 2024, 2025 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024-2026 Zheng Junjie <z572@z572.online>
 ;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -138,6 +138,7 @@
  #:use-module (gnu packages guile-xyz)
  #:use-module (gnu packages haskell-xyz)
  #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages jemalloc)
  #:use-module (gnu packages kerberos)
  #:use-module (gnu packages language)
  #:use-module (gnu packages libbsd)
@@ -148,6 +149,7 @@
  #:use-module (gnu packages libunistring)
  #:use-module (gnu packages libunwind)
  #:use-module (gnu packages linux)
+  #:use-module (gnu packages llvm)
  #:use-module (gnu packages lsof)
  #:use-module (gnu packages lua)
  #:use-module (gnu packages m4)
@@ -158,6 +160,7 @@
  #:use-module (gnu packages networking)
  #:use-module (gnu packages onc-rpc)
  #:use-module (gnu packages openldap)
+  #:use-module (gnu packages nss)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages perl)
@@ -198,6 +201,7 @@
  #: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 emacs)
  #:use-module (guix build-system glib-or-gtk)
@@ -1355,7 +1359,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
 (define-public mu
  (package
    (name "mu")
-    (version "1.14.0")
+    (version "1.14.1")
    (source
     (origin
       (method git-fetch)
@@ -1364,7 +1368,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1fhnnm58ndfd6hzdagrsgcdcm2qlcjlda13vyx5d9lclhxgdn0vf"))))
+        (base32 "0dv27pq2jmgqlzsy2gcmh7vddiwiwd55j299blb9k8g0xhkg8riz"))))
    (build-system meson-build-system)
    (native-inputs
     (list pkg-config
@@ -3910,6 +3914,112 @@ are supported).  @code{bit} is a CGI/SSI program that generates web pages
 on the fly.  Both programs are written in C and are very fast.")
    (license license:expat)))

+(define computed-origin-method (@@ (guix packages) computed-origin-method))
+
+(define-public stalwart
+  (package
+    (name "stalwart")
+    (version "0.16.3")
+    (source
+     (let ((upstream-source
+             (origin
+               (method git-fetch)
+               (uri (git-reference
+                      (url "https://github.com/stalwartlabs/stalwart")
+                      (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1wcs9inwv8iv4qrayp9730wzmmpp4bna6jnpdz29ygb5c0lf2b29")))))
+       (origin
+         (method computed-origin-method)
+         (file-name (git-file-name name version))
+         (sha256 #f)
+         (uri
+          (delay
+            (with-imported-modules '((guix build utils))
+              #~(begin
+                  (use-modules (guix build utils))
+                  (set-path-environment-variable
+                   "PATH" '("bin")
+                   (list #+python-minimal))
+                  (copy-recursively #+upstream-source "upstream-source")
+                  (with-directory-excursion "upstream-source"
+                    (for-each make-file-writable (find-files "crates" "\\.rs"))
+                    (invoke "python3" "resources/scripts/ossify.py" "crates")
+                    (substitute* "crates/main/Cargo.toml"
+                      ((", \"enterprise\"")
+                       ""))
+                    (substitute* "crates/common/Cargo.toml"
+                      (("git =.*/opentelemetry-rust\"")
+                       "version = \"0.31.0\"")))
+                  (copy-recursively "upstream-source" #$output))))))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:install-source? #f
+      ;; TODO: Currently, if the test is enabled, it will attempt to link
+      ;; the foundationdb library. However, we haven't packaged it yet,
+      ;; so for now, skip tests.
+      #:tests? #f
+      #:features ''("s3" "postgres" "rocks" "sqlite")
+      #:cargo-install-paths ''("crates/main")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'setenv
+            (lambda* (#:key inputs #:allow-other-keys)
+              (setenv "LIBZ_SYS_STATIC" "0")
+              ;; jemalloc needs unbundling for tikv-jemallocator-sys
+              ;; This flag is needed when not using the bundled jemalloc.
+              ;; https://github.com/tikv/jemallocator/issues/19
+              (setenv
+               "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1")
+              (setenv "JEMALLOC_OVERRIDE"
+                      (search-input-file inputs "/lib/libjemalloc.so")))))))
+    (native-inputs (list clang pkg-config))
+    (inputs (cons* bzip2
+                   jemalloc
+                   librdkafka
+                   lz4
+                   rocksdb
+                   snappy
+                   sqlite
+                   zlib
+                   openssl
+                   `(,zstd "lib")
+                   (cargo-inputs 'stalwart)))
+    (home-page "https://stalw.art")
+    (synopsis "All in one Mail and Collaboration server")
+    (description
+     "Stalwart is an mail and collaboration server with JMAP, IMAP4, POP3, SMTP,
+CalDAV, CardDAV and WebDAV support and a wide range of modern features.")
+    (license license:agpl3)))
+
+(define-public stalwart-cli
+  (package
+    (name "stalwart-cli")
+    (version "1.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/stalwartlabs/cli")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0rbhzd8m48fm5q8vlzkla5zxrypkbvsi8i1bplkm1ndp0bwiqdvz"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:install-source? #f))
+    (native-inputs (list nss-certs-for-test))
+    (inputs (cargo-inputs 'stalwart-cli))
+    (home-page "https://stalw.art")
+    (synopsis "Stalwart Command Line Interface")
+    (description
+     "A schema-driven command line tool for administering Stalwart Mail and
+Collaboration Server over its JMAP API.")
+    (license license:agpl3)))
+
 (define-public swaks
  (package
    (name "swaks")
@@ -22,7 +22,7 @@
 ;;; Copyright © 2017, 2019, 2022 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Dave Love <me@fx@gnu.org>
-;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018-2022, 2024-2026 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
 ;;; Copyright © 2018 Nadya Voronova <voronovank@gmail.com>
 ;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com>
@@ -458,7 +458,8 @@ 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"))
+       (patches (search-patches "cvc5-reproducible-build.patch"
+                                "cvc5-symfpu-compatibility.patch"))
       (sha256
        (base32 "0ynz7di4dyyiiydgmf0z9dc2jl7nm44xi0amch29rcgznwr4wy5m"))))
    (build-system cmake-build-system)
@@ -745,6 +746,54 @@ complete with events and to-dos.")
      (home-page "https://codeberg.org/dgoodmaniii/dozenal")
      (license license:gpl3+))))

+(define-public drat-trim
+  (package
+    (name "drat-trim")
+    (version "05.22.2023")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/marijnheule/drat-trim")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "084miqj57xr7c74y649acm5xjkddpjn4ybfh469jcbakzp8w0pdi"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no tests
+      #:make-flags
+      #~(list (string-join
+                (list "FLAGS=-DLONGTYPE"
+                      ;; _POSIX_C_SOURCE required for getc_unlocked(3).
+                      "-D_POSIX_C_SOURCE=200809")
+                " "))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'always-pass-flags
+            (lambda _
+              (substitute* "Makefile"
+                ;; Ensure that drat-trim and gapless target also respect FLAGS.
+                (("-std=c99 -O2")
+                 "-std=c99 $(FLAGS) -O2"))))
+          (delete 'configure) ;no configure script
+          (replace 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((bin (string-append #$output "/bin")))
+                (for-each (lambda (exec)
+                            (install-file exec bin))
+                          '("drat-trim"
+                            "lrat-check"))))))))
+    (synopsis "Proof checker for unsatisfiability of propositional formulas")
+    (description
+     "The proof checker DRAT-trim can be used to check whether a propositional
+formula in the DIMACS format is unsatisfiable.  Given a propositional formula and
+a clausal proof, DRAT-trim validates that the proof is a certificate of
+unsatisfiability of the formula.")
+    (home-page "https://www.cs.utexas.edu/~marijn/drat-trim/")
+    (license license:expat)))
+
 (define-public dsfmt
  (package
    (name "dsfmt")
@@ -2475,6 +2524,9 @@ similar to MATLAB, GNU Octave or SciPy.")
                   ;; "--enable-doxygen"
                   "--enable-dot"
                   "--enable-netcdf-4"
+                   #$@(if (or (target-x86-32?) (target-arm32?))
+                          '("CFLAGS=-Wno-error=incompatible-pointer-types")
+                          '())
                   (string-append "--with-plugin-dir=" #$output "/lib/hdf5-plugins"))
           #:phases
           #~(modify-phases %standard-phases
@@ -2486,7 +2538,15 @@ similar to MATLAB, GNU Octave or SciPy.")
                     (("testurl.sh") ""))
                   (substitute* "nczarr_test/Makefile.in"
                     (("/bin/bash")
-                      (search-input-file inputs "bin/bash")))))
+                      (search-input-file inputs "bin/bash")))
+                   ;; This test fails on 32 bit platforms.
+                   #$@(if (or (target-x86-32?) (target-arm32?))
+                          '((substitute* '("ncdump/tst_netcdf4_4.sh"
+                                           "ncdump/tst_nccopy4.sh")
+                              (("#!/bin/sh" m) (string-append m "\nexit 0\n")))
+                            (substitute* "ncdump/Makefile.in"
+                              (("tst_netcdf4_4.log") "")))
+                          '())))
               (add-before 'configure 'fix-source-date
                 (lambda _
                   ;; As we ${SOURCE_DATE_EPOCH} evaluates to "1" in the build
@@ -3995,6 +4055,64 @@ addition it can be used as a module in Python for plotting.  It supports
 vector and bitmap output, including PDF, Postscript, SVG and EMF.")
    (license license:gpl2+)))

+(define-public voro++
+  (package
+    (name "voro++")
+    (version "0.4.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/chr1shr/voro")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0rxyb662w9y3xadyxz2x7gvc7mafbhl13szdc55fsk5sygpdlkv5"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags #~(list (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)        ;no configure
+          (replace 'check
+            ;; There is no test suite but the project provides a verity of
+            ;; examples to check performance, target "all" build each example
+            ;; (basic, walls, custom, extra, degenerate, and interface), see
+            ;; detailed description in "examples/README".
+            ;;
+            ;; Running timing example only:
+            ;; These codes and scripts can be used to test the code's
+            ;; performance. The program timing_test.cc creates a container
+            ;; with 100000 particles, and then times the computation of all
+            ;; the cells in the container, using the dummy function
+            ;; compute_all_cells().
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion "examples/timing"
+                  (invoke "perl" "timing_test.pl"))))))))
+    (native-inputs
+     (list perl))
+    (home-page "https://math.lbl.gov/voro++/")
+    (synopsis "C++ library for the computation of the Voronoi diagram")
+    (description
+     "Voro++ is a software library for carrying out three-dimensional
+computations of the Voronoi tessellation.  A distinguishing feature of the
+Voro++ library is that it carries out cell-based calculations, computing the
+Voronoi cell for each particle individually.  It is particularly well-suited
+for applications that rely on cell-based statistics, where features of Voronoi
+cells (eg. volume, centroid, number of faces) can be used to analyze a system
+of particles.
+
+Voro++ comprises of several C++ classes that can be built as a static library.
+A command-line utility is also provided that can use most features of the
+code.  The direct cell-by-cell construction makes the library particularly
+well-suited to handling special boundary conditions and walls.  It employs
+algorithms that are tolerant for numerical precision errors, it exhibits high
+performance, and it has been successfully employed on very large particle
+systems.")
+    (license license:bsd-3)))
+
 (define-public maxflow
  (package
    (name "maxflow")
@@ -8314,8 +8432,11 @@ s-expression-based format.")
   (license license:gpl3+)))

 (define-public symfpu
-  (let ((commit "22d993d880f66b2e470c3928e0e61bdf61419702")
-        (revision "0"))
+  ;; Currently, we use the "experimental" branch of the symfpu repository.  The
+  ;; default "master" branch hasn't been updated in ~7 years and both bitwuzla
+  ;; and cvc5 require fixes from the "experimental" branch.
+  (let ((commit "aeaa3fa62730148c855f5a9e0a9b7040d48e0b7e")
+        (revision "1"))
    (package
      (name "symfpu")
      (version (git-version "0" revision commit))
@@ -8327,7 +8448,7 @@ s-expression-based format.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "1h20zzkyi225290kc6mzg8i4dwkj0p1vlwfgc9ycs61snlyd8gr8"))))
+          (base32 "0wj9pwr2jiliy4rw4nvy51427dwhwj86azi14qc5vzsdb44c6fdx"))))
      (build-system copy-build-system)
      (arguments
       (list
@@ -8369,7 +8490,7 @@ operations.")
 (define-public bitwuzla
  (package
    (name "bitwuzla")
-    (version "0.8.2")
+    (version "0.9.0")
    (source
     (origin
       (method git-fetch)
@@ -8378,21 +8499,16 @@ operations.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0nakqz29cfkn91yvx1xzsk50rlqbiihslflbjanv4lflcl2zx6mz"))))
+        (base32 "012h3fj25f5zk9qy353vqn5jpp26db45xjbxi7ns02pkhlm46f6x"))))
    (build-system meson-build-system)
    (arguments
     `(#:configure-flags '("-Dtesting=enabled" "-Ddefault_library=shared"
-                           "-Dkissat=true")
-       #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'make-git-optional
-                    (lambda _
-                      (substitute* "src/meson.build"
-                        (("run_command\\('git',")
-                         "run_command('sh', '-c', 'git',")))))))
+                           "-Dkissat=true")))
    (native-inputs (list googletest pkg-config))
-    (inputs (list cadical
+    (inputs (list cadical-2.1
                  gmp
                  kissat
+                  mpfr
                  symfpu))
    (synopsis "SMT solver optimized for the theory of bit-vectors")
    (description
@@ -8679,7 +8795,7 @@ reduction.")
 (define-public mcrl2
  (package
    (name "mcrl2")
-    (version "202307.1")
+    (version "202507.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -8687,9 +8803,9 @@ reduction.")
                    version ".tar.gz"))
              (sha256
               (base32
-                "147002dl3gq2jsk5gcmvw7hj3mfxrpgxwcfda5mfrj26rcxw48fc"))))
+                "08w7v2dx1s164q3vc5lzf864nlxrf8s0kgsa26mmkgfqfqcwdgjj"))))
    (inputs
-     (list boost glu mesa qtbase-5))
+     (list boost glu mesa qtbase))
    (build-system cmake-build-system)
    (arguments (list #:tests? #f))
    (synopsis "Toolset for the mCRL2 formal specification language")
@@ -9660,6 +9776,7 @@ researchers and developers alike to get started on SAT.")
         "1snimig4cp97p570nin2i38my72zvwypldyhr125i1z6cd9pa046"))))
    (build-system gnu-build-system)
    (inputs (list xz gzip lzip bzip2 p7zip))
+    (native-inputs (list drat-trim))
    (arguments
     (list
      #:test-target "test"
@@ -686,6 +686,35 @@ components.")
               (base32
                "0cqa072fz55j5xyvixqv8vbd7jsbhb1cd14bzjvm0hbv2wpd9npf"))))))

+(define-public java-jvnet-parent-pom-1
+  (hidden-package
+    (package
+      (name "java-jvnet-parent-pom-1")
+      (version "1")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append "https://repo1.maven.org/maven2/net/java/"
+                                    "jvnet-parent/" version "/jvnet-parent-"
+                                    version ".pom"))
+                (sha256
+                 (base32
+                  "1gv37n9aid7fdhwd0h4py024w8by56cchg3b4sg5vrk82a0l0518"))))
+      (build-system ant-build-system)
+      (arguments
+       (list
+         #:tests? #f
+         #:phases
+         #~(modify-phases %standard-phases
+             (delete 'unpack)
+             (delete 'configure)
+             (delete 'build)
+             (replace 'install
+               (install-pom-file #$(package-source this-package))))))
+      (home-page "https://mvnrepository.com/artifact/net.java/jvnet-parent")
+      (synopsis "java.net parent pom")
+      (description "This package contains the java.net parent pom file.")
+      (license license:asl2.0))))
+
 (define-public java-jvnet-parent-pom-3
  (hidden-package
    (package
@@ -2839,7 +2839,7 @@ implementation of an MQTT version client class.")
 (define-public psi-plus
  (package
    (name "psi-plus")
-    (version "1.5.1484")
+    (version "1.5.2115")
    (source
     (origin
       (method git-fetch)
@@ -2853,7 +2853,7 @@ implementation of an MQTT version client class.")
        `(begin
           (delete-file-recursively "3rdparty")))
       (sha256
-        (base32 "1jsm39nzzbqkp3zc0xqx7jid6p4q1ra28xad38wjr2l1jb8qjn24"))))
+        (base32 "14za9rh7nszv5px5a2w43ysi9977zws8a5mxsh7wc8ksr693faz2"))))
    (build-system qt-build-system)
    (arguments
     `(#:tests? #f                      ; No target
@@ -2910,19 +2910,13 @@ implementation of an MQTT version client class.")
                "qite/qiteaudio.h")
               (("qiteaudiorecorder.h")
                "qite/qiteaudiorecorder.h"))))
-         (add-after 'install 'wrap-env
+         (add-after 'install 'wrap-executable
           (lambda* (#:key outputs #:allow-other-keys)
             (let ((out (assoc-ref outputs "out")))
-               (for-each
-                (lambda (name)
-                  (let ((file (string-append out "/bin/" name))
-                        (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
-                        (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
-                    (wrap-program file
-                      `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
-                      `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
-                '("psi-plus")))))
-         (add-after 'wrap-env 'glib-or-gtk-compile-schemas
+               (wrap-program (string-append out "/bin/psi-plus")
+                 `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
+                 `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))))))
+         (add-after 'wrap-executable 'glib-or-gtk-compile-schemas
           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
         (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
@@ -2945,6 +2939,7 @@ implementation of an MQTT version client class.")
           libgcrypt
           libgpg-error
           libidn
+           libomemo-c
           libotr
           libsignal-protocol-c
           tidy-html
@@ -2964,11 +2959,11 @@ implementation of an MQTT version client class.")
           libxcb
           libxscrnsaver
           zlib))
-    (home-page "https://psi-plus.com/")
+    (home-page "https://psi-im.com/")
    (synopsis "Qt-based XMPP Client")
    (description
-     "Psi+ is a spin-off of Psi XMPP client.  It is a powerful XMPP client
-designed for experienced users.")
+     "Psi+ is a powerful XMPP client designed for experienced users.
+It's a spin-off of the Psi XMPP client.")
    (license license:gpl2+)))

 (define-deprecated-package psi
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2014-2025 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2017 Dave Love <fx@gnu.org>
@@ -432,7 +432,7 @@ software vendors, application developers and computer science researchers.")
  (package/inherit openmpi-5
    (name "openmpi-rocm")
    (arguments
-     (substitute-keyword-arguments (package-arguments openmpi-5)
+     (substitute-keyword-arguments arguments
       ((#:configure-flags flags '())
        #~(cons* (string-append "--with-rocm="
                                #$(this-package-input "rocm-hip-runtime"))
@@ -440,7 +440,9 @@ software vendors, application developers and computer science researchers.")
    (inputs (modify-inputs (package-inputs openmpi-5)
              ;; XXX: This might break openmpi-5 for architectures where ROCm
              ;; is not supported.
-              (append rocm-hip-runtime)))
+              (append rocm-hip-runtime)
+              (replace "ucx" ucx-rocm)
+              (replace "libfabric" libfabric-rocm)))
    (synopsis "MPI-3 implementation (with ROCm support)")))

 (define-public openmpi-c++
@@ -171,6 +171,7 @@
  #:use-module (gnu packages lua)
  #:use-module (gnu packages machine-learning)
  #:use-module (gnu packages man)
+  #:use-module (gnu packages maths)
  #:use-module (gnu packages messaging)
  #:use-module (gnu packages mp3)
  #:use-module (gnu packages mpd)
@@ -224,6 +225,7 @@
  #:use-module (gnu packages xiph)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages wine)
  #:use-module ((srfi srfi-1) #:select (last)))

 (define-public alsa-scarlett-gui
@@ -5355,6 +5357,132 @@ includes instruments based on audio samples and various soft sythesizers.  It
 can receive input from a MIDI keyboard.")
    (license license:gpl2+)))

+;; This version tracks the latest commit from master branch.
+(define-public lmms-next
+  (let ((commit "83313e737d3137f7939f3daa9063a94a1ac01f7c")
+        (revision "0"))
+    (package/inherit lmms
+      (name "lmms-next")
+      (version (git-version "1.3.0-alpha.1" revision commit))
+      (source
+       (origin
+         (inherit (package-source lmms))
+         (uri (git-reference
+                (url "https://github.com/LMMS/lmms")
+                (commit commit)
+                ;; Clone recursively only for the optional plugins.  The 3rd
+                ;; party libraries will be deleted by the snippet.
+                (recursive? #t)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1mpp449rvn9f10bcxhpmxfinvj3jdv4s6qjhlp0sj9l783pv3h69"))
+         (modules '((guix build utils)))
+         (snippet
+          '(begin
+             ;; Delete the bundled 3rd party libraries.
+             (for-each delete-file-recursively
+               (list "plugins/CarlaBase/carla"
+                     "plugins/OpulenZ/adplug"
+                     "plugins/Xpressive/exprtk"
+                     "src/3rdparty"))
+             ;; Do not check submodules.
+             (substitute* "CMakeLists.txt"
+               ((".*CheckSubmodules.*") "")
+               ;; Do not use the bundled weakjack.
+               (("JACK libraries\" ON") "JACK libraries\" OFF"))
+             (substitute* "src/CMakeLists.txt"
+               ;; Do not add 3rd party libraries.
+               ((".*3rdparty.*") "")
+               ;; Use adplug and ringbuffer from the system.
+               (("\\$\\{EXTRA_LIBRARIES\\}" all)
+                (string-append all
+                               "\n\tadplug"
+                               "\n\tringbuffer")))
+             (with-directory-excursion "plugins"
+               ;; Use carla from the system.
+               (substitute* "CarlaBase/Carla.h"
+                 (("#include <CarlaDefines")
+                  "#include <carla/includes/CarlaDefines")
+                 (("#include <CarlaNative")
+                  "#include <carla/includes/CarlaNative")
+                 (("#include <CarlaBackend") "#include <carla/CarlaBackend")
+                 (("#include <CarlaUtils") "#include <carla/CarlaUtils"))
+               (with-directory-excursion "OpulenZ"
+                 ;; Do not use the bundled adplug.
+                 (substitute* "CMakeLists.txt"
+                   ((".*adplug .*") "")
+                   ((".*adplug/.*") "")
+                   (("^\\)") "")
+                   (("\\.png\"") ".png\"\n)"))
+                 ;; Use adplug from the system.
+                 (substitute* "OpulenZ.cpp"
+                   (("<opl\\.h>") "<adplug/opl.h>")
+                   (("<temuopl\\.h>") "<adplug/temuopl.h>")
+                   (("<mididata\\.h>") "<adplug/mididata.h>")))
+               ;; Do not use the bundled hiir.
+               (substitute* "SlewDistortion/CMakeLists.txt"
+                 (("TARGET_LINK_LIBRARIES\\(slewdistortion hiir\\)") ""))
+               ;; Do not use the bundled exprtk.
+               (substitute* "Xpressive/CMakeLists.txt"
+                 ((".*\\(exprtk .*") "")
+                 ((".*xpressive exprtk.*") "")))
+             ;; Avoid "invalid conversion from 'const unsigned char*' to
+             ;; 'unsigned char*'" error.
+             (substitute* "plugins/OpulenZ/OpulenZ.cpp"
+               (("unsigned char \\*inst") "const unsigned char *inst"))))))
+      (arguments
+       (substitute-keyword-arguments arguments
+         ((#:qtbase _ #f) qtbase)
+         ((#:configure-flags flags)
+          #~(cons* "-DWANT_QT6=ON" (delete "-DWANT_QT5=ON" #$flags)))
+         ((#:phases phases)
+          #~(modify-phases #$phases
+              (delete 'unpack-rpmalloc)
+              (replace 'fix-carla-export
+                ;; Taken from NixOS package definition.
+                (lambda _
+                  (substitute* "plugins/CarlaBase/Carla.h"
+                    (("CARLA_EXPORT")
+                     "CARLA_API_EXPORT"))))))))
+      (native-inputs
+       (modify-inputs native-inputs
+         (delete "rpmalloc")
+         (replace "qttools" qttools)))
+      (inputs
+       (modify-inputs inputs
+         (delete "qtx11extras")
+         (replace "carla" carla-2.6)
+         (replace "qtwayland" qtwayland)
+         (replace "sdl12-compat" sdl2)
+         (append adplug
+                 exprtk
+                 hiir
+                 libxml2
+                 lilv
+                 lv2
+                 perl
+                 perl-list-moreutils
+                 perl-xml-parser
+                 qtsvg
+                 ringbuffer
+                 suil)))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "LV2_PATH")
+              (files '("lib/lv2"))))))))
+
+(define-public lmms-next-with-vst
+  (package/inherit lmms-next
+    (name "lmms-next-with-vst")
+    (arguments
+     (substitute-keyword-arguments arguments
+       ((#:configure-flags flags)
+        #~(cons* (string-append "-DWINE_LOCATIONS=" #$(wine-for-system))
+                 (delete "-DWANT_VST=OFF" #$flags)))))
+    (inputs
+     (modify-inputs inputs
+       (append (wine-for-system))))))
+
 (define-public stargate
  (package
    (name "stargate")
@@ -7465,31 +7593,6 @@ standalone JACK application.")
    ;; Expat or CC0
    (license (list license:expat license:cc0))))

-(define-public regrader
-  (package
-    (inherit vl1-emulator)
-    (name "regrader")
-    (version "1.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/linuxmao-org/regrader")
-             (commit (string-append "v" version))
-             ;; bundles a specific commit of the DISTRHO plugin framework
-             (recursive? #t)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0gl4d5lf2afqknz22jz7hh7029sc9v1xrz6nbz9dlv42bwc0cvl0"))))
-    (home-page "https://github.com/linuxmao-org/regrader")
-    (synopsis "Delay effect plugin")
-    (description
-     "Regrader is a delay effect where the repeats degrade in resolution.
-This is an unofficial port of the Regrader plugin created by Igorski.  It
-is available as an LV2 plugin and a standalone JACK application.")
-    (license license:expat)))
-
 (define-public fogpad
  (package
    (inherit vl1-emulator)
@@ -591,7 +591,7 @@ Android, and ChromeOS.")
 (define-public libnice
  (package
    (name "libnice")
-    (version "0.1.22")
+    (version "0.1.23")
    (source
     (origin
       (method git-fetch)
@@ -601,7 +601,7 @@ Android, and ChromeOS.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0ik45q1qlr04llr2ssm6zb73840dmn31q303k3qrcpgj0jp578hg"))))
+         "0zqnqhcm1rx5axbzd448yi6j4bq4kykiqb4wihs2p8h1k49nkyjh"))))
    (build-system meson-build-system)
    (outputs '("out" "doc"))
    (arguments
@@ -614,23 +614,25 @@ Android, and ChromeOS.")
          (add-after 'unpack 'disable-failing-tests
            (lambda _
              (substitute* "tests/meson.build"
+                ;; This test is flaky (see:
+                ;; <https://gitlab.freedesktop.org/libnice/libnice/-/work_items/210>).
+                ((".*'test-send-recv',.*") "")
                ;; ‘test-set-port-range.c:66:main: assertion failed:
                ;; (nice_agent_gather_candidates (agent, stream1))’
                (("'test-set-port-range'" all)
                 (string-append "# " all))
                ;; The following test is disabled as it fails in a
                ;; nondeterministic fashion (see:
-                ;; https://gitlab.freedesktop.org/libnice/libnice/-/issues/151).
+                ;; <https://gitlab.freedesktop.org/libnice/libnice/-/issues/151>).
                (("'test-bsd'" all)
                 (string-append "# " all))
-                ;; The test-new-trickle fails with GLib 2.83.0 (see:
-                ;; https://gitlab.freedesktop.org/libnice/libnice/-/issues/198).
-                (("'test-new-trickle'" all)
-                 (string-append "# " all)))
+                ;; This test uses getaddrinfo, which cannot resolve in the
+                ;; build environment.
+                ((".*'test-slow-resolving',.*") ""))
              (substitute* "stun/tests/meson.build"
                ;; test-bind.c:234: bad_responses: Assertion `len >= 20'
                ;; failed (see:
-                ;; https://gitlab.freedesktop.org/libnice/libnice/-/issues/150).
+                ;; <https://gitlab.freedesktop.org/libnice/libnice/-/issues/150>).
                (("'bind', ")
                 ""))))
          (add-after 'install 'move-docs
@@ -2041,7 +2043,7 @@ of the same name.")
 (define-public wireshark
  (package
    (name "wireshark")
-    (version "4.6.4")
+    (version "4.6.5")
    (source
     (origin
       (method git-fetch)
@@ -2050,7 +2052,7 @@ of the same name.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05jivnnlmbbhc6b3r7zdahiw22fvb9r6pg4pc83ascnja49xlyq6"))))
+        (base32 "0cws5gaxkbdwqjawkwfr3iz39vdd0m0m0q7h2z4fzdv6lrp8ys31"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -2139,62 +2141,6 @@ replies, fping will send out a ping packet and move on to the next target in a
 round-robin fashion.")
    (license license:expat)))

-(define-public gandi-cli
-  (package
-    (name "gandi-cli")
-    (version "1.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri name version))
-       (sha256
-        (base32 "1h36jahbp7273wn3yd747kbiwjc0bm3sja67bcxdsd54ln0vyndg"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      #~(list "--pyargs" "gandi.cli")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'embed-store-file-names
-            (lambda _
-              (substitute* (list "gandi/cli/modules/cert.py"
-                                 "gandi/cli/tests/commands/test_certificate.py")
-                (("openssl") (which "openssl")))))
-          (add-after 'install 'install-documentation
-            ;; The included man page may be outdated but we install it anyway,
-            ;; since it's mentioned in 'gandi --help' and better than nothing.
-            (lambda _
-              (let* ((man1 (string-append #$output "/share/man/man1")))
-                (mkdir-p man1)
-                (with-output-to-file (string-append man1 "/gandi.1")
-                  (lambda _
-                    (invoke "rst2man.py" "gandicli.man.rst")))))))))
-    (native-inputs
-     (list python-docutils-0.19
-           python-pytest
-           python-pytest-cov
-           python-setuptools
-           python-wheel))
-    (inputs
-     (list openssl
-           python-click-7
-           python-ipy
-           python-pyyaml
-           python-requests))
-    (propagated-inputs
-     (list openssh))
-    (home-page "https://cli.gandi.net")
-    (synopsis "Command-line interface to the Gandi.net Web API")
-    (description
-     "This package provides a command-line client (@command{gandi}) to buy,
-manage, and delete Internet resources from Gandi.net such as domain names,
-virtual machines, and certificates.")
-    (license license:gpl3+)))
-
-(define-deprecated-package gandi.cli
-  gandi-cli)
-
 (define-public go-sctp
  ;; docker-libnetwork-cmd-proxy requires this exact commit.
  ;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.conf.
@@ -3404,7 +3350,7 @@ speedtest.net.")
 (define-public librespeed-cli
  (package
    (name "librespeed-cli")
-    (version "1.0.12")
+    (version "1.0.13")
    (source
     (origin
       (method git-fetch)
@@ -3413,7 +3359,7 @@ speedtest.net.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "08x09b3j2qvhnwy8lrbfxqh1lbs64wyqlr4jj6m31b5r2zy90dly"))))
+        (base32 "0zgwdz955vlyy1yricgcbdlbxxh1z08xpbhxa8zs64bsg68mv8j3"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -3437,6 +3383,7 @@ speedtest.net.")
     (list go-github-com-briandowns-spinner
           go-github-com-go-ping-ping
           go-github-com-gocarina-gocsv
+           go-github-com-prometheus-community-pro-bing
           go-github-com-sirupsen-logrus
           go-github-com-urfave-cli-v2
           go-golang-org-x-sys))
@@ -313,7 +313,7 @@ functional, imperative and object-oriented styles of programming.")
    (source (origin
              (method url-fetch)
              (uri (string-append
-                    "http://caml.inria.fr/pub/distrib/ocaml-"
+                    "https://caml.inria.fr/pub/distrib/ocaml-"
                    (version-major+minor version)
                    "/ocaml-" version ".tar.xz"))
              (sha256
@@ -373,7 +373,7 @@ functional, imperative and object-oriented styles of programming.")
    (source (origin
              (method url-fetch)
              (uri (string-append
-                    "http://caml.inria.fr/pub/distrib/ocaml-"
+                    "https://caml.inria.fr/pub/distrib/ocaml-"
                    (version-major+minor version)
                    "/ocaml-" version ".tar.xz"))
              (patches (search-patches
@@ -421,7 +421,7 @@ patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%"
    (source (origin
              (method url-fetch)
              (uri (string-append
-                    "http://caml.inria.fr/pub/distrib/ocaml-"
+                    "https://caml.inria.fr/pub/distrib/ocaml-"
                    (version-major+minor version)
                    "/ocaml-" version ".tar.xz"))
              (sha256
@@ -31,6 +31,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
@@ -46,13 +47,16 @@
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages image)
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-science)
+  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages qt)
  #:use-module (gnu packages scanner)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages image))
+  #:use-module (gnu packages xml))

 (define-public ocrad
  (package
@@ -75,6 +79,60 @@ feature extraction method.  It can read images in PBM, PGM or PPM formats and
 it produces text in 8-bit or UTF-8 formats.")
    (license license:gpl3+)))

+(define-public python-pytesseract
+  (package
+    (name "python-pytesseract")
+    (version "0.3.13")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/madmaze/pytesseract")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16arn7ygk7ain5j5ayjcy10y6yhwfcc090i3r8q553m89rr1w0w1"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(map (lambda (name)
+               (string-append "--deselect=tests/pytesseract_test.py::" name))
+             ;; These tests cannot find generated files
+             '("test_image_to_pdf_or_hocr[pdf]"
+               "test_run_and_get_multiple_output[extensions0]"
+               "test_run_and_get_multiple_output[extensions1]"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-tesseract-path
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "pytesseract/pytesseract.py"
+                (("tesseract_cmd = 'tesseract'")
+                 (format #f "tesseract_cmd = '~a'"
+                         (search-input-file inputs "/bin/tesseract"))))))
+          (add-before 'check 'set-tessdata-prefix
+            (lambda _
+              (setenv "TESSDATA_PREFIX"
+                      ;; needs "fra" language
+                      (string-append #$(this-package-native-input
+                                        "tesseract-ocr-tessdata-fast")
+                                     "/share/tessdata")))))))
+    (native-inputs (list python-numpy
+                         python-packaging
+                         python-pandas
+                         python-pytest
+                         python-setuptools
+                         tesseract-ocr
+                         tesseract-ocr-tessdata-fast))
+    (inputs (list tesseract-ocr))
+    (propagated-inputs (list python-pandas python-pillow))
+    (home-page "https://github.com/madmaze/pytesseract")
+    (synopsis "Python wrapper for Google's Tesseract-OCR")
+    (description
+     "This package provides @command{pytesseract} and Python wrapper library
+for Google's Tesseract-@acronym{OCR, optical character recognition}.")
+    (license license:asl2.0)))
+
 (define-public tesseract-ocr-tessdata-fast
  (package
    (name "tesseract-ocr-tessdata-fast")
@@ -802,7 +802,7 @@ high-performance computing} clusters.")
 (define-public toys
  (package
    (name "toys")
-    (version "0.1.0")
+    (version "0.1.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -811,7 +811,7 @@ high-performance computing} clusters.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "169jxh5knp5f2y9wbnc454jjdvvyqb5r0ydv3qkpm332vr0cl6p9"))))
+                "05zkvjs3wkwdswl4irkqaxgdassiji5pq8qaqcrzscvp24vkjjja"))))
    (build-system guile-build-system)
    (arguments
     (list
@@ -838,11 +838,8 @@ high-performance computing} clusters.")
                         (append (list ,@load-compiled-path)
                                 %load-compiled-path))))
              (substitute* "guix/extensions/toys.scm"
-                (("^\\(define-module \\(guix extensions toys\\)")
-                 (string-append
-                  (with-output-to-string
-                    (lambda () (write search-paths-header)))
-                  "\n(define-module (guix extensions toys)")))))
+                ((";;@load-paths@")
+                 (with-output-to-string (lambda () (write search-paths-header)))))))
          (add-after 'set-load-paths-in-entry-point 'register-guix-extension
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((ext-path (string-append #$output "/share/guix/extensions")))
@@ -1204,8 +1201,8 @@ transactions from C or Python.")
    (license license:gpl2+)))

 (define-public bffe
-  (let ((commit "723fd5ea6af1b14c215baf80524c8ff4b21fcc82")
-        (revision "17"))
+  (let ((commit "d6c90f217595674c7910a858edcb735f88d3a14f")
+        (revision "18"))
    (package
      (name "bffe")
      (version (git-version "0" revision commit))
@@ -1216,7 +1213,7 @@ transactions from C or Python.")
                      (commit commit)))
                (sha256
                 (base32
-                  "1sd62arq80kkfjnynivrp7jh8j359965ank8sglq1wgfdah9k8ii"))
+                  "0f7i68k6l5ylg8nch54xw4bxn0hayx2ng9j5dvwvai1vi887vmbj"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
      (native-inputs
@@ -82,7 +82,7 @@
 (define-public parallel
  (package
    (name "parallel")
-    (version "20260322")
+    (version "20260422")
    (outputs '("out" "doc"))
    (source
     (origin
@@ -90,7 +90,7 @@
      (uri (string-append "mirror://gnu/parallel/parallel-"
                          version ".tar.bz2"))
      (sha256
-       (base32 "1q7g5f13nlwichgh0dk8w5fqjnfnxvwxk6rjy0fd5l7l6blq0ikn"))
+       (base32 "1fq7v60x9jm8mg19qn8n0sfhrygccmw6mncwyjr1g8kfsrjz2k36"))
      (snippet
       '(begin
          (use-modules (guix build utils))
@@ -734,7 +734,7 @@ single-instruction multiple-data (SIMD) intrinsics.")
              (substitute* "src/include/pmix_config.h"
                (("#define PMIX_CONFIGURE_CLI .*")
                 "#define PMIX_CONFIGURE_CLI \"[scrubbed]\"\n")))))))
-    (inputs (list libevent `(,hwloc "lib") zlib))
+    (inputs (list libevent `(,hwloc "lib") munge zlib))
    (native-inputs
     (list autoconf
           automake
@@ -0,0 +1,32 @@
+From 5eed2d2ca7c13c08ca7eb92fc4a78c30ca4b6b3d Mon Sep 17 00:00:00 2001
+From: Hellseher <sharlatanus@gmail.com>
+Date: Sat, 18 Apr 2026 08:26:29 +0000
+Subject: [PATCH] Remove CUDA error handling from network.c
+
+Removed error handling for CUDA compilation check.
+
+Fixes: https://github.com/Deyht/CIANNA/issues/4
+---
+ src/network.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/src/network.c b/src/network.c
+index d454f64..5a9497c 100644
+--- a/src/network.c
+++ b/src/network.c
+@@ -155,15 +155,6 @@ CIANNA V-1.0.1.2 stable build (04/2026), by D.Cornu\n\
+ 		init_cuda(networks[network_number]);
+ 	#endif
+ 	
+-	#ifndef CUDA
+-	if(comp_int == C_CUDA)
+-	{
+-		printf("\n ERROR: compute method set to CUDA while CIANNA was not compiled for it.\n");
+-		printf(" Install Nvidia CUDA and recompile CIANNA with the appropriate option.\n\n");
+-		exit(EXIT_FAILURE);
+-	}
+-	#endif
+-	
+ 	#ifndef BLAS
+ 	if(comp_int == C_BLAS)
+ 	{
@@ -0,0 +1,165 @@
+Ensures that cvc5 is compatible with our version of SymFPU.
+
+Taken from: https://github.com/cvc5/cvc5/commit/2ed457049cf52bd0f21a6332c1be487d82bf5678
+
+diff --git a/cmake/FindSymFPU.cmake b/cmake/FindSymFPU.cmake
+index 765ee8d36..05a86e9ee 100644
+--- a/cmake/FindSymFPU.cmake
+++ b/cmake/FindSymFPU.cmake
+@@ -29,8 +29,8 @@ if(NOT SymFPU_FOUND_SYSTEM)
+   include(ExternalProject)
+   include(deps-helper)
+ 
+-  set(SymFPU_COMMIT "e6ac3af9c2c574498ea171c957425b407625448b")
+-  set(SymFPU_CHECKSUM "823aa663fcc2f6844ae5e9ea83ceda4ed393cdb3dadefce9b3c7c41cd0f4f702")
+  set(SymFPU_COMMIT "227a7246b8ce513b393cc2645d6d65d3490ea1de")
+  set(SymFPU_CHECKSUM "ff22e37dbc133120ada5760878974811737bec65b12a8883f92b1ed9e3f96e99")
+ 
+   ExternalProject_Add(
+     SymFPU-EP
+diff --git a/src/theory/fp/fp_word_blaster.cpp b/src/theory/fp/fp_word_blaster.cpp
+index 7f2086c35..3efb0eeed 100644
+--- a/src/theory/fp/fp_word_blaster.cpp
+++ b/src/theory/fp/fp_word_blaster.cpp
+@@ -119,6 +119,23 @@ CVC5_SYM_ITE_DFN(traits::ubv);
+ 
+ #undef CVC5_SYM_ITE_DFN
+ 
+#define CVC5_SYM_ITE_BOOL_DFN(T)                                   \
+  template <>                                                      \
+  struct ite<bool, T>                                              \
+  {                                                                \
+    static const T iteOp(const bool& cond, const T& l, const T& r) \
+    {                                                              \
+      return cond ? l : r;                                         \
+    }                                                              \
+  }
+
+CVC5_SYM_ITE_BOOL_DFN(traits::rm);
+CVC5_SYM_ITE_BOOL_DFN(traits::prop);
+CVC5_SYM_ITE_BOOL_DFN(traits::sbv);
+CVC5_SYM_ITE_BOOL_DFN(traits::ubv);
+
+#undef CVC5_SYM_ITE_BOOL_DFN
+
+ template <>
+ traits::ubv orderEncode<traits, traits::ubv>(const traits::ubv& b)
+ {
+@@ -564,6 +581,13 @@ symbolicBitVector<isSigned> symbolicBitVector<isSigned>::modularAdd(
+   return *this + op;
+ }
+ 
+template <bool isSigned>
+symbolicBitVector<isSigned> symbolicBitVector<isSigned>::modularSubtract(
+    const symbolicBitVector<isSigned>& op) const
+{
+  return *this - op;
+}
+
+ template <bool isSigned>
+ symbolicBitVector<isSigned> symbolicBitVector<isSigned>::modularNegate() const
+ {
+diff --git a/src/theory/fp/fp_word_blaster.h b/src/theory/fp/fp_word_blaster.h
+index 6ce365382..8179ceb32 100644
+--- a/src/theory/fp/fp_word_blaster.h
+++ b/src/theory/fp/fp_word_blaster.h
+@@ -242,6 +242,8 @@ class symbolicBitVector : public nodeWrapper
+   symbolicBitVector<isSigned> modularDecrement() const;
+   symbolicBitVector<isSigned> modularAdd(
+       const symbolicBitVector<isSigned>& op) const;
+  symbolicBitVector<isSigned> modularSubtract(
+      const symbolicBitVector<isSigned>& op) const;
+   symbolicBitVector<isSigned> modularNegate() const;
+ 
+   /*** Comparisons ***/
+diff --git a/src/util/floatingpoint_literal_symfpu_traits.cpp b/src/util/floatingpoint_literal_symfpu_traits.cpp
+index af56c2b87..181069427 100644
+--- a/src/util/floatingpoint_literal_symfpu_traits.cpp
+++ b/src/util/floatingpoint_literal_symfpu_traits.cpp
+@@ -223,6 +223,13 @@ wrappedBitVector<isSigned> wrappedBitVector<isSigned>::modularAdd(
+   return *this + op;
+ }
+ 
+template <bool isSigned>
+wrappedBitVector<isSigned> wrappedBitVector<isSigned>::modularSubtract(
+    const wrappedBitVector<isSigned>& op) const
+{
+  return *this - op;
+}
+
+ template <bool isSigned>
+ wrappedBitVector<isSigned> wrappedBitVector<isSigned>::modularNegate() const
+ {
+diff --git a/src/util/floatingpoint_literal_symfpu_traits.h b/src/util/floatingpoint_literal_symfpu_traits.h
+index 78fc69a18..b49ef3a2a 100644
+--- a/src/util/floatingpoint_literal_symfpu_traits.h
+++ b/src/util/floatingpoint_literal_symfpu_traits.h
+@@ -199,6 +199,8 @@ class wrappedBitVector : public BitVector
+   wrappedBitVector<isSigned> modularDecrement() const;
+   wrappedBitVector<isSigned> modularAdd(
+       const wrappedBitVector<isSigned>& op) const;
+  wrappedBitVector<isSigned> modularSubtract(
+      const wrappedBitVector<isSigned>& op) const;
+   wrappedBitVector<isSigned> modularNegate() const;
+ 
+   /** Bit-vector equality. */
+diff --git a/test/regress/cli/CMakeLists.txt b/test/regress/cli/CMakeLists.txt
+index 915a19e09..35ff58bc7 100644
+--- a/test/regress/cli/CMakeLists.txt
+++ b/test/regress/cli/CMakeLists.txt
+@@ -949,12 +949,15 @@ set(regress_0_tests
+   regress0/fp/issue6164.smt2
+   regress0/fp/issue7002.smt2
+   regress0/fp/issue7569.smt2
+  regress0/fp/issue9505.smt2
+   regress0/fp/issue9854.smt2
+   regress0/fp/issue9858.smt2
+   regress0/fp/issue9864.smt2
+   regress0/fp/issue9966.smt2
+   regress0/fp/issue9972.smt2
+   regress0/fp/issue9972-2.smt2
+  regress0/fp/issue11139.smt2
+  regress0/fp/issue12335.smt2
+   regress0/fp/issuepr650.smt2
+   regress0/fp/proj-issue329-prereg-context.smt2
+   regress0/fp/proj-issue477-fp-set-comprehension.smt2
+diff --git a/test/regress/cli/regress0/fp/issue11139.smt2 b/test/regress/cli/regress0/fp/issue11139.smt2
+new file mode 100644
+index 000000000..f4c00360e
+--- /dev/null
+++ b/test/regress/cli/regress0/fp/issue11139.smt2
+@@ -0,0 +1,9 @@
+; COMMAND-LINE: --check-models
+; EXPECT: sat
+(set-logic QF_FP)
+(declare-const FP_VAR_a (_ FloatingPoint 11 53))
+(declare-const FP_VAR_b (_ FloatingPoint 11 53))
+(assert ( = (fp #b0 #b00000000000 #b0000000000000000000000000000000000000000000000000000)
+(fp.div RTN (fp.fma RTP FP_VAR_a FP_VAR_a 
+(fp #b0 #b00000000000 #b0000000000000000000000000000000000000000000000000000)) FP_VAR_b)))
+(check-sat)
+diff --git a/test/regress/cli/regress0/fp/issue12335.smt2 b/test/regress/cli/regress0/fp/issue12335.smt2
+new file mode 100644
+index 000000000..bc2580a89
+--- /dev/null
+++ b/test/regress/cli/regress0/fp/issue12335.smt2
+@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic FP)
+(declare-const x Float32)
+(declare-const a Float32)
+(assert (forall ((V Float32) (A Float32)) (or (not (fp.lt V x)) (not (fp.eq a a)) (not (fp.gt A (fp (_ bv0 1) (_ bv0 8) (_ bv0 23)))) (not (fp.eq (fp.div RNE A V) (fp (_ bv0 1) (_ bv0 8) (_ bv0 23)))))))
+(assert (fp.geq a (fp (_ bv0 1) (_ bv0 8) (_ bv0 23))))
+(check-sat)
+diff --git a/test/regress/cli/regress0/fp/issue9505.smt2 b/test/regress/cli/regress0/fp/issue9505.smt2
+new file mode 100644
+index 000000000..05674b8ff
+--- /dev/null
+++ b/test/regress/cli/regress0/fp/issue9505.smt2
+@@ -0,0 +1,6 @@
+; COMMAND-LINE: --fp-exp
+; EXPECT: sat
+(set-logic QF_FP)
+(declare-fun m () (_ FloatingPoint 4 12))
+(assert (fp.eq (fp (_ bv0 1) (_ bv0 8) (_ bv0 23)) ((_ to_fp 8 24) roundNearestTiesToEven (fp.rem m (fp (_ bv0 1) (_     bv9 4) (_ bv1536 11))))))
+(check-sat)
@@ -0,0 +1,32 @@
+From 158304fb31177304d41fe495f8c1cca1fb5cff70 Mon Sep 17 00:00:00 2001
+From: xenodium <8107219+xenodium@users.noreply.github.com>
+Date: Wed, 25 Mar 2026 12:37:17 +0000
+Subject: [PATCH] Fixing test
+
+---
+ tests/agent-shell-tests.el | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/agent-shell-tests.el b/tests/agent-shell-tests.el
+index f602912d..9263e051 100644
+--- a/tests/agent-shell-tests.el
+++ b/tests/agent-shell-tests.el
+@@ -1233,14 +1233,16 @@ code block content
+                        test-buffer))
+                     ((symbol-function 'shell-maker--process) (lambda () fake-process))
+                     ((symbol-function 'shell-maker-finish-output) #'ignore)
+                    ((symbol-function 'agent-shell--handle) #'ignore)
+                     (agent-shell-file-completion-enabled nil))
+             (let* ((shell-buffer (agent-shell--start :config config
+                                                      :no-focus t
+                                                      :new-session t))
+                    (subs (map-elt (buffer-local-value 'agent-shell--state shell-buffer)
+                                   :event-subscriptions)))
+-              (should (= 1 (length subs)))
+-              (should (eq 'turn-complete (map-elt (car subs) :event))))))
+              (should (seq-find (lambda (sub)
+                                  (eq 'turn-complete (map-elt sub :event)))
+                                subs)))))
+       (remove-hook 'agent-shell-mode-hook hook-fn)
+       (when (process-live-p fake-process)
+         (delete-process fake-process))
@@ -1,92 +0,0 @@
-From 8d651d7247c4e8cf07ba805712cdb09e8095dd89 Mon Sep 17 00:00:00 2001
-Message-ID: <8d651d7247c4e8cf07ba805712cdb09e8095dd89.1773006315.git.dannym@friendly-machines.com>
-From: Danny Milosavljevic <dannym@friendly-machines.com>
-Date: Sun, 8 Mar 2026 21:44:05 +0000
-Subject: [PATCH] Scope native-comp trampoline disabling to spy-on only
-See: <https://github.com/jorgenschaefer/emacs-buttercup/pull/257>
-
-buttercup-with-cleanup disabled native-comp-enable-subr-trampolines
-for the entire spec execution.  This was a workaround for Emacs
-bug#61880, where trampoline compilation fails when spy-on redefines
-primitives that the trampoline compiler itself depends on (e.g.
-file-exists-p).
-
-However, disabling trampolines globally has the side effect that fset
-overrides of C primitives become invisible to natively compiled code.
-This breaks shut-up's message override when called indirectly through
-native-compiled functions like display-message-or-buffer (from
-simple.eln), because without a trampoline, the native code calls the C
-primitive directly, bypassing the fset'd function.
-
-Move the trampoline disabling from buttercup-with-cleanup into
-buttercup--spy-on-and-call-replacement, scoping it to just the fset
-call that installs the spy.  This avoids the trampoline compilation
-issue while allowing other fset overrides (e.g. from shut-up or
-cl-letf) to work correctly with native-compiled callers.
---
- buttercup.el | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/buttercup.el b/buttercup.el
-index 07e003f..417786d 100644
--- a/buttercup.el
-+++ b/buttercup.el
-@@ -1293,12 +1293,23 @@ responsibility to ensure ARG is a command."
-       (error "Spies can only be created in `before-each' or `it'"))))
- 
- 
-+(defvar native-comp-enable-subr-trampolines)
-+(defvar comp-enable-subr-trampolines)
-+
- (defun buttercup--spy-on-and-call-replacement (spy fun)
-   "Replace the function in symbol SPY with a spy calling FUN."
-   (let ((orig-function (and (fboundp spy) (symbol-function spy))))
-     (when (buttercup--add-cleanup (lambda ()
-                                   (fset spy orig-function)))
-      (fset spy (buttercup--make-spy fun)))))
-+      ;; Disable subr trampoline generation around the fset call.
-+      ;; Redefining certain primitives causes trampoline compilation
-+      ;; to fail because the trampoline compiler itself depends on
-+      ;; primitives that may have just been redefined.
-+      ;; See <https://github.com/jorgenschaefer/emacs-buttercup/issues/230>
-+      ;; and <https://debbugs.gnu.org/61880>.
-+      (let ((native-comp-enable-subr-trampolines nil)
-+            (comp-enable-subr-trampolines nil))
-+        (fset spy (buttercup--make-spy fun))))))
- 
- (defun buttercup--make-spy (fun)
-   "Create a new spy function wrapping FUN and tracking every call to itself."
-@@ -1343,24 +1354,13 @@ responsibility to ensure ARG is a command."
- Should always be set to a value that is not `listp', except while
- in a `buttercup-with-cleanup' environment.")
- 
-(defvar native-comp-enable-subr-trampolines)
-(defvar comp-enable-subr-trampolines)
-
- (defmacro buttercup-with-cleanup (&rest body)
-   "Execute BODY, cleaning spys and the rest afterwards."
-  `(,@(if (fboundp 'with-suppressed-warnings)
-          '(with-suppressed-warnings ((obsolete comp-enable-subr-trampolines)))
-        '(progn))
-     (let ((buttercup--cleanup-functions nil)
-           ;; Redefining certain primitive's trampolines will cause problems,
-           ;; see https://github.com/jorgenschaefer/emacs-buttercup/issues/230 and
-           ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61880
-           (comp-enable-subr-trampolines nil)
-           (native-comp-enable-subr-trampolines nil))
-       (unwind-protect (progn ,@body)
-         (dolist (fun buttercup--cleanup-functions)
-           (ignore-errors
-             (funcall fun)))))))
-+  `(let ((buttercup--cleanup-functions nil))
-+     (unwind-protect (progn ,@body)
-+       (dolist (fun buttercup--cleanup-functions)
-+         (ignore-errors
-+           (funcall fun))))))
- 
- (defun buttercup--add-cleanup (function)
-   "Register FUNCTION for cleanup in `buttercup-with-cleanup'."
-
-base-commit: cc5a2ab7c7f18aaaf525fac61fe59bae5ad018dd
-- 
-2.52.0
@@ -1,6 +1,3 @@
-Pretend that stat's mtime is broken, so that the fontconfig cache does not
-depend upon modification time to determine if a cache is stale.
-
 diff --git a/src/fcstat.c b/src/fcstat.c
 index 9b54e2b4..76d7780e 100644
 --- a/src/fcstat.c
@@ -10,6 +7,6 @@ index 9b54e2b4..76d7780e 100644
 FcIsFsMtimeBroken (const FcChar8 *dir)
 {
 +    return FcTrue;
-     int fd = FcOpen ((const char *) dir, O_RDONLY);
+     int fd = FcOpen ((const char *)dir, O_RDONLY);
 
-     if (fd != -1)
+     if (fd != -1) {
--- a/Show More
+++ b/Show More