gnu: webrtc-audio-processing: Build with abseil-cpp.

The webrtc was silently disabled in 'pipewire' package. * gnu/packages/linux.scm (webrtc-audio-processing) [inputs]: Move abseil-cpp from here... [propagated-inputs]: ...to here. Merges: guix/guix!8723 Co-authored-by: Sughosha <sughosha@disroot.org> Change-Id: Ieaf93939db4913116d45a16099ccfcb3f4318493
gnu: libgme: Update to 0.6.5.
2026-07-08 01:34:04 +02:00 · 2026-05-29 16:32:57 +05:30 · 2026-05-11 17:50:57 +05:30 · 2026-04-20 00:42:55 +02:00 · 2026-04-20 00:42:55 +02:00 · 2026-04-20 00:42:55 +02:00
345 changed files with 52263 additions and 26723 deletions
@@ -141,6 +141,7 @@
   (eval . (put 'substitute* 'scheme-indent-function 1))
   (eval . (put 'match-record 'scheme-indent-function 3))
   (eval . (put 'match-record-lambda 'scheme-indent-function 2))
+   (eval . (put 'with-fluids 'scheme-indent-function 2))

   ;; TODO: Contribute these to Emacs' scheme-mode.
   (eval . (put 'let-keywords 'scheme-indent-function 3))
@@ -28,7 +28,13 @@ Tick a box by changing it from [ ] to [x].
  - [ ] i586-gnu

 - Package **update**
-  - Closure size increase after update (`./pre-inst-env guix size PACKAGE`).
+  - Closure size increase.
+```console
+$ guix size PACKAGE | tail -n1 # before
+total: ...
+$ ./pre-inst-env guix size PACKAGE | tail -n1 # after
+total: ...
+```
  - Build status of direct dependents (`./pre-inst-env guix build -k -P1 PACKAGE ...`):
 ```text

@@ -23,6 +23,8 @@
   (name "cbaines"))
  ("3CE4 6455 8A84 FDC6 9DB4  0CFB 090B 1199 3D9A EBB5"
   (name "civodul"))
+  ("838A FE0D 55DC 074E 360F  943A 84B6 9CE6 F3F6 B767"
+   (name "cnx"))
  ("CCB8 1842 F9D7 058E CD67  377A BF5C DF4D F6BF 6682"
   (name "csantosb"))
  ("510A 8628 E2A7 7678 8F8C  709C 4BC0 2592 5FF8 F4D3"
@@ -68,6 +68,7 @@ guix/discovery\.scm                                @guix/core
 guix/docker\.scm                                   @guix/core
 guix/download\.scm                                 @guix/core
 guix/elf\.scm                                      @guix/core
+guix/fossil-download\.scm                          @guix/core
 guix/ftp-client\.scm                               @guix/core
 guix/gexp\.scm                                     @guix/core
 guix/git-authenticate\.scm                         @guix/core
@@ -239,6 +240,7 @@ tests/guix-home\.sh                                @guix/home
 tests/home-import\.scm                             @guix/home
 tests/home-services\.scm                           @guix/home

+gnu/packages/fabric-management\.scm                @guix/hpc
 gnu/packages/mpi\.scm                              @guix/hpc
 gnu/packages/oneapi\.scm                           @guix/hpc
 gnu/packages/opencl\.scm                           @guix/hpc
@@ -347,7 +349,6 @@ guix/scripts/import/pypi\.scm                      @guix/python
 tests/import/pypi\.scm                             @guix/python
 tests/toml\.scm                                    @guix/python

-gnu/ci\.scm                                        @guix/qa-packages
 gnu/packages/benchmark\.scm                        @guix/qa-packages
 gnu/packages/check\.scm                            @guix/qa-packages
 gnu/packages/ci\.scm                               @guix/qa-packages
@@ -484,6 +485,7 @@ gnu/services/version-control\.scm                  @guix/vcs
 gnu/tests/version-control\.scm                     @guix/vcs
 guix/build/bzr\.scm                                @guix/vcs
 guix/build/cvs\.scm                                @guix/vcs
+guix/build/fossil\.scm                             @guix/vcs
 guix/build/git\.scm                                @guix/vcs
 guix/build/hg\.scm                                 @guix/vcs
 guix/build/svn\.scm                                @guix/vcs
@@ -104,6 +104,7 @@ MODULES =					\
  guix/discovery.scm				\
  guix/android-repo-download.scm		\
  guix/bzr-download.scm            		\
+  guix/fossil-download.scm			\
  guix/git-download.scm				\
  guix/hg-download.scm				\
  guix/hash.scm					\
@@ -236,6 +237,7 @@ MODULES =					\
  guix/build/asdf-build-system.scm		\
  guix/build/bzr.scm				\
  guix/build/copy-build-system.scm		\
+  guix/build/fossil.scm				\
  guix/build/git.scm				\
  guix/build/hg.scm				\
  guix/build/glib-or-gtk-build-system.scm	\
@@ -802,17 +804,17 @@ EXTRA_DIST +=						\
  etc/manifests/upgrade.scm				\
  scripts/guix.in					\
  tests/cve-sample.json					\
-  tests/keys/civodul.pub				\
-  tests/keys/dsa.pub					\
-  tests/keys/ed25519-2.pub				\
-  tests/keys/ed25519-2.sec				\
-  tests/keys/ed25519-3.pub				\
-  tests/keys/ed25519-3.sec				\
-  tests/keys/ed25519.pub				\
-  tests/keys/ed25519.sec				\
-  tests/keys/rsa.pub					\
-  tests/keys/signing-key.pub				\
-  tests/keys/signing-key.sec				\
+  tests/keys/openpgp/civodul.pub			\
+  tests/keys/openpgp/dsa.pub				\
+  tests/keys/openpgp/ed25519-2.pub			\
+  tests/keys/openpgp/ed25519-2.sec			\
+  tests/keys/openpgp/ed25519-3.pub			\
+  tests/keys/openpgp/ed25519-3.sec			\
+  tests/keys/openpgp/ed25519.pub			\
+  tests/keys/openpgp/ed25519.sec			\
+  tests/keys/openpgp/rsa.pub				\
+  tests/keys/openpgp/signing-key.pub			\
+  tests/keys/openpgp/signing-key.sec			\
  tests/test.drv					\
  $(TESTS)

@@ -17,6 +17,11 @@ Please send Guix bug reports to bug-guix@gnu.org.
 * Changes in 1.6.0 (since 1.5.0)
 ** Distribution
 *** GNOME updated to version 48
+*** New service for Fossil SCM
+*** TeX Live updated to 2026.1
+
+** Programming interfaces
+*** New (guix fossil-download) module, for fetching Fossil repositories

 * Changes in 1.5.0 (since 1.4.0)
 ** Package management
@@ -73,8 +73,8 @@ then
 	# Copy the keys so that the secret key has the right permissions (the
 	# daemon errors out when this is not the case.)
 	mkdir -p "$GUIX_CONFIGURATION_DIRECTORY"
-	cp "@abs_top_srcdir@/tests/keys/signing-key.sec"	\
-	   "@abs_top_srcdir@/tests/keys/signing-key.pub"	\
+	cp "@abs_top_srcdir@/tests/keys/openpgp/signing-key.sec"	\
+	   "@abs_top_srcdir@/tests/keys/openpgp/signing-key.pub"	\
 	   "$GUIX_CONFIGURATION_DIRECTORY"
 	chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec"
    fi
@@ -1276,9 +1276,7 @@ definition in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm}:
  ;; Standard build phases, as a list of symbol/procedure pairs.
  (let-syntax ((phases (syntax-rules ()
                         ((_ p ...) `((p . ,p) ...)))))
-    (phases separate-from-pid1
-            set-GUIX_GCC_MANGLE_PREFIX_MAP set-SOURCE-DATE-EPOCH
-            set-paths install-locale unpack
+    (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack
            bootstrap
            patch-usr-bin-file
            patch-source-shebangs configure patch-generated-file-shebangs
@@ -1300,7 +1298,7 @@ Or from the REPL:
 (add-to-load-path "/path/to/guix/checkout")
 ,use (guix build gnu-build-system)
 (map car %standard-phases)
-@result{} (separate-from-pid1 set-GUIX_GCC_MANGLE_PREFIX_MAP set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files make-dynamic-linker-cache install-license-files reset-gzip-timestamps compress-documentation)
+@result{} (set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files make-dynamic-linker-cache install-license-files reset-gzip-timestamps compress-documentation)
@end lisp

 If you want to know more about what happens during those phases, consult the
@@ -2658,9 +2658,11 @@ 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 only supports ext4, btrfs, JFS, F2FS, and XFS file systems.  In
-particular, code that reads file system UUIDs and labels only works for these
-file system types.}.  For the ESP, if you have one and assuming it is
+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:

@example
@@ -8735,6 +8737,52 @@ The example below denotes a version of gnu-standards to fetch:

@end deftp

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

@@ -19146,6 +19194,10 @@ swap file is encrypted because the entire device is encrypted.
@xref{Swap Space}, or @xref{Preparing for Installation,,Disk
 Partitioning}, for an example.

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

@end defvar

@@ -27015,6 +27067,32 @@ Deprecated option.
@end deftp


+@c %end of fragment
+
+@defvar gardenhostd-service-type
+Type for the service that runs gardenhostd, a partial implementation of
+the systemd-hostnamed daemon.  It provides the org.freedesktop.hostname1
+D-Bus interface, which helps applications like gnome-control-center
+retrieve and modify the system’s hostname, as well as set a pretty
+hostname for display.
+
+The value for this service is a @code{<gardenhostd-configuration>} object.
+@end defvar
+
+@c %start of fragment
+
+@deftp {Data Type} gardenhostd-configuration
+Available @code{gardenhostd-configuration} fields are:
+
+@table @asis
+@item @code{gardenhostd} (default: @code{gardenhostd}) (type: package)
+The gardenhostd package to use.
+
+@end table
+
+@end deftp
+
+
@c %end of fragment

@defvar accountsservice-service-type
@@ -36561,13 +36639,14 @@ in @code{Nginx}.  It is used to generate cat avatar from a seed, for instance
 the hash of a user's email address.

@deffn {Procedure} cat-avatar-generator-service @
-       [#:cache-dir "/var/cache/cat-avatar-generator"] @
+       [#:cache-dir "/var/cache/cat-avatar-generator/"] @
       [#:package cat-avatar-generator] @
       [#:configuration (nginx-server-configuration)]
 Returns an nginx-server-configuration that inherits @code{configuration}.  It
 extends the nginx configuration to add a server block that serves @code{package},
 a version of cat-avatar-generator.  During execution, cat-avatar-generator will
-be able to use @code{cache-dir} as its cache directory.
+be able to use @code{cache-dir} as its cache directory, which must end
+with a slash, be created manually, and be writable by php-fpm.
@end deffn

 A simple setup for cat-avatar-generator can look like this:
@@ -44243,10 +44322,11 @@ behind a reverse proxy and serve repositories from a custom location.
 (service fossil-service-type
         (fossil-configuration
          (repository "/srv/museum")
-          (repo-list? #t)
+          (list-repositories? #t)
          (base-url "https://museum.example")
-          (socket-file "/var/run/fossil.sock")
-          (compress? #f)))
+          (compress? #f)
+          (https? #t)
+          (socket-file "/var/run/fossil.sock")))
@end lisp

@deftp {Data Type} fossil-configuration
@@ -48392,9 +48472,10 @@ A string denoting the name service (@pxref{Services in the NSS
 configuration,,, libc, The GNU C Library Reference Manual}).

 Note that name services listed here must be visible to nscd.  This is
-achieved by passing the @code{#:name-services} argument to
-@code{nscd-service} the list of packages providing the needed name
-services (@pxref{Base Services, @code{nscd-service}}).
+achieved by providing the list of packages implementing the needed
+services via the @code{name-services} field of the
+@code{nscd-configuration} record to be used with the @code{nscd-service-type}
+service (@pxref{Base Services, @code{nscd-configuration}}).

@item reaction
 An action specified using the @code{lookup-specification} macro
@@ -48837,49 +48918,56 @@ This option in enabled by default.  In some cases involving the
 in RAM, it can be handy to disable the option by setting it to
@code{#f}.

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

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

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

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

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

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

@end deftp
@@ -46,7 +46,8 @@
 (entry (commit "a7c8e68dc51144a6d3981b770aca9c4897fc7c0c")
        (title
         (en "Records can refer to inherited values of thunked fields")
-         (de "Vererbung in Verbundsobjekten erlaubt Verweise auf geerbte Werte verzögert ausgewerteter Felder"))
+         (de "Vererbung in Verbundsobjekten erlaubt Verweise auf geerbte Werte verzögert ausgewerteter Felder")
+         (pt "Registros podem referir-se a valores herdados de campos ainda não evaluados (thunks)"))
        (body
         (en "A new feature has been added to records—the facility used when
 defining packages, services, operating systems, and many other things—that,
@@ -114,7 +115,42 @@ Verbundstypen aus, die mit @code{define-record-type*} erstellt wurden:
 und so weiter.

 Hinweis: das ist eine inkompatible Änderung. Die neu eingeführte Bindung –
-@code{inputs} im obigen Beispiel – kann gleichnamige Bindungen überschatten.")))
+@code{inputs} im obigen Beispiel – kann gleichnamige Bindungen überschatten.")
+         (pt "Um novo recurso foi adicionado aos registros - a ferramenta
+usada quando se definem pacotes, serviços, sistemas operacionais, e muitas
+outras coisas - que, quando herdados de outro registro, te permitem referir
+aos valores de campos herdados.  Durante a definição de variantes de pacotes,
+você pode encontrar este padrão:
+
+@lisp
+(package
+  (inherit gdb)
+  (inputs (modify-inputs (package-inputs gdb)
+            (delete \"guile\"))))
+@end lisp
+
+Agora isto pode ser escrito desta forma:
+
+@lisp
+(package
+  (inherit gdb)
+  (inputs (modify-inputs inputs ;<- Note a modificação
+            (delete \"guile\"))))
+@end lisp
+
+Dentro do corpo de @code{inputs}, o identificador @code{inputs} agora está
+atrelado ao @dfn{valor herdado} - id est, ap valor que este campo herda de
+@code{gdb}.  O mesmo mecanismo pode ser empregado ao modificar outros campos
+da entrada ou ao campo @code{arguments}.  É menos verboso mas também
+@uref{https://issues.guix.gnu.org/50335, é mais preciso}.
+
+Esta mudança se aplica aos campos \"thunk-ados\" de todos os tipos de registro
+produzidos por @code{define-record-type*}: @code{package}, @code{origin},
+@code{operating-system}, @code{home-environment}, e assim por diante.
+
+Note que esta é uma modificação incompatível: as ligações introduzidas
+recentemente - @code{inputs} no exemplo acima - podem sombrear ligações de
+mesmo nome.")))

 (entry (commit "b52ce9041ad58aeababd2d50d3e72bc23dffff60")
        (title
@@ -565,6 +565,7 @@ challenges"))
              "guix/docker.scm"
              "guix/download.scm"
              "guix/elf.scm"
+              "guix/fossil-download.scm"
              "guix/ftp-client.scm"
              "guix/gexp.scm"
              "guix/git-authenticate.scm"
@@ -786,7 +787,8 @@ the haskell-build-system."
  (team 'hpc
        #:name "High-performance computing team"
        #:description "High-performance computing (HPC) related packages."
-        #:scope (list "gnu/packages/mpi.scm"
+        #:scope (list "gnu/packages/fabric-management.scm"
+                      "gnu/packages/mpi.scm"
                      "gnu/packages/oneapi.scm"
                      "gnu/packages/opencl.scm"
                      "gnu/packages/parallel.scm"
@@ -991,8 +993,7 @@ perl-build-system as well as the rakudo-build-system."
        #:description
        "Quality assurance software (CI/CD, testing, analysis;
 no direct relation to Guix's QA)."
-        #:scope (list "gnu/ci.scm"
-                      "gnu/packages/benchmark.scm"
+        #:scope (list "gnu/packages/benchmark.scm"
                      "gnu/packages/check.scm"
                      "gnu/packages/ci.scm"
                      "gnu/packages/code.scm"
@@ -1214,6 +1215,7 @@ the \"texlive\" importer."
                      "gnu/tests/version-control.scm"
                      "guix/build/bzr.scm"
                      "guix/build/cvs.scm"
+                      "guix/build/fossil.scm"
                      "guix/build/git.scm"
                      "guix/build/hg.scm"
                      "guix/build/svn.scm")))
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2026 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This manifest lists all MPI-related packages: useful for 'guix refresh',
+;; 'guix build', etc.
+
+(use-modules (guix)
+             (gnu packages fabric-management)
+             (gnu packages linux)
+             (gnu packages mpi)
+             (gnu packages parallel))
+
+;; The packages below are what constitutes the MPI stack: helper libraries,
+;; interconnect drivers, and MPI implementations.
+(packages->manifest
+ (list cassini-headers
+       cxi-driver
+       hwloc
+       libcxi
+       libfabric
+       mpich
+       openmpi-5
+       openpmix
+       opensm
+       prrte
+       psm
+       psm2
+       rdma-core
+       ucx))
@@ -26,7 +26,6 @@

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

          ;; When STORE-DIRECTORY-PREFIX is defined, prepend it the linux and
          ;; initrd paths, to allow booting from a Btrfs subvolume.
+
+          ;; When the store is on an encrypted device, inject GRUB's
+          ;; (proc)/luks_script into the initrd as /etc/luks_script so the
+          ;; initrd can use the already-decrypted master key to open LUKS
+          ;; volumes without prompting for the password a second time.
          #~(format port "menuentry ~s {
  ~a
  linux ~a ~a
-  initrd ~a ~a
+  initrd ~a ~a ~a
 }~%"
                    #$label
                    #$(grub-root-search device linux)
                    #$linux (string-join (list #$@arguments))
+                    (or #$luks-script-initrd "")
                    (or #$extra-initrd "")
                    #$initrd)))
       (multiboot-kernel
@@ -464,7 +473,7 @@ menuentry ~s {
          ;; Other type of devices aren't implemented.
          #~()))
    (let ((devices (map crypto-device->cryptomount store-crypto-devices))
-          (modules #~(format port "insmod luks~%insmod luks2~%")))
+          (modules #~(format port "insmod procfs~%insmod luks~%insmod luks2~%")))
      (if (null? devices)
          devices
          (cons modules devices))))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2018, 2020-2022, 2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@@ -1455,9 +1455,14 @@ corresponds to the symbols listed in FLAGS."
               (raise c)))
            ((system-error? c)
             (format (current-error-port)
-                     "could not mount partition ~a: ~a~%"
+                     "could not mount partition '~a': ~a~%"
                     (file-system-device fs)
-                     (exception-message c))
+                     (string-trim-both
+                      (call-with-output-string
+                        (lambda (port)
+                          (print-exception port #f
+                                           (exception-kind c)
+                                           (exception-args c))))))
             (unless (file-system-mount-may-fail? fs)
               (raise c))))
      (let* ((type    (file-system-type fs))
@@ -81,7 +81,10 @@ entry will be expired even if it has been accessed recently.")
   "Maximum time a cache entry for SSH keys is valid, in seconds.")
  (extra-content
   (raw-configuration-string "")
-   "Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}."))
+   "Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}.")
+  (shepherd-requirement
+   (list-of-symbols '())
+   "List of services that should be started before this service."))

 (define (home-gpg-agent-configuration-file config)
  "Return the @file{gpg-agent.conf} file for @var{config}."
@@ -104,7 +107,7 @@ entry will be expired even if it has been accessed recently.")
 (define (home-gpg-agent-shepherd-services config)
  "Return the possibly-empty list of Shepherd services for @var{config}."
  (match-record config <home-gpg-agent-configuration>
-    (gnupg ssh-support?)
+    (gnupg ssh-support? shepherd-requirement)
    ;; 'gpg-agent' is started on demand by GnuPG's programs, but it has to be
    ;; started explicitly when OpenSSH support is enabled (info "(gnupg) Agent
    ;; Options").
@@ -119,15 +122,21 @@ entry will be expired even if it has been accessed recently.")
                             #:socket-directory-permissions #o700))))
          (list (shepherd-service
                 (provision '(gpg-agent ssh-agent))
+                 (requirement shepherd-requirement)
                 (modules '((shepherd support)))  ;for '%user-runtime-dir'
-                 (start #~(make-systemd-constructor
-                           (list #$(file-append gnupg "/bin/gpg-agent")
-                                 "--supervised" "--enable-ssh-support")
-                           (list #$(endpoint "ssh" "S.gpg-agent.ssh")
-                                 #$(endpoint "browser" "S.gpg-agent.browser")
-                                 #$(endpoint "extra" "S.gpg-agent.extra")
-                                 ;; #$(endpoint "scdaemon" "S.scdaemon")
-                                 #$(endpoint "std" "S.gpg-agent"))))
+                 (start
+                  #~(lambda args
+                      ((make-systemd-constructor
+                        (list #$(file-append gnupg "/bin/gpg-agent")
+                              "--supervised" "--enable-ssh-support")
+                        (list #$(endpoint "ssh" "S.gpg-agent.ssh")
+                              #$(endpoint "browser" "S.gpg-agent.browser")
+                              #$(endpoint "extra" "S.gpg-agent.extra")
+                              ;; #$(endpoint "scdaemon" "S.scdaemon")
+                              #$(endpoint "std" "S.gpg-agent"))
+                        ;; Inherit graphical session environment.
+                        #:environment-variables (environ))
+                       args)))
                 (stop #~(make-systemd-destructor))
                 (documentation "Start 'gpg-agent', the GnuPG passphrase
 agent, with support for handling OpenSSH material."))))
@@ -19,6 +19,7 @@
 (define-module (gnu home services niri)
  #:use-module (gnu home services)
  #:use-module (gnu home services shepherd)
+  #:use-module (gnu home services desktop)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages glib)
@@ -40,14 +41,15 @@

 (define (home-niri-shepherd-service config)
  "Return a shepherd service that runs Niri, a scrollable tiling Wayland
-compositor.  The service starts Niri in a DBus session with appropriate
-environment variables set for a Wayland desktop session."
+compositor.  The service starts Niri with appropriate environment variables
+set for a Wayland desktop session."
  (list (shepherd-service
          (documentation "Run Niri scrollable tiling Wayland compositor.")
          (provision '(niri))
+          (requirement '(dbus))
          (start #~(make-forkexec-constructor
                    (list #$(file-append bash "/bin/bash") "-l"
-                          "-c" "exec dbus-run-session niri --session")
+                          "-c" "exec niri --session")
                    #:environment-variables
                    (append (list #$@(niri-configuration-environment-variables config))
                            '("DESKTOP_SESSION=niri"
@@ -66,6 +68,8 @@ environment variables set for a Wayland desktop session."
   (extensions
    (list (service-extension home-shepherd-service-type
                             home-niri-shepherd-service)
+          (service-extension home-dbus-service-type
+                             (const '()))
          (service-extension home-profile-service-type
                             (lambda (config)
                               (list dbus
@@ -56,6 +56,7 @@
 # Copyright © 2022 Alex Griffin <a@ajgrf.com>
 # Copyright © 2022 ( <paren@disroot.org>
 # Copyright © 2022, 2026 jgart <jgart@dismail.de>
+# Copyright © 2022-2023, 2025-2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 # Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
 # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
 # Copyright © 2023 Andy Tai <atai@atai.org>
@@ -75,7 +76,6 @@
 # Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 # Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 # Copyright © 2025 bdunahu <bdunahu@operationnull.com>
-# Copyright © 2025 Nikita Mitasov <me@ch4og.com>
 #
 # This file is part of GNU Guix.
 #
@@ -217,6 +217,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/convmv.scm			\
  %D%/packages/codex.scm				\
  %D%/packages/coq.scm				\
+  %D%/packages/coreboot.scm			\
  %D%/packages/cpio.scm				\
  %D%/packages/cpp.scm 				\
  %D%/packages/cppi.scm				\
@@ -424,6 +425,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/kde-utils.scm			\
  %D%/packages/kerberos.scm			\
  %D%/packages/kodi.scm				\
+  %D%/packages/kubernetes.scm	        	\
  %D%/packages/language.scm			\
  %D%/packages/lc0.scm			\
  %D%/packages/lean.scm				\
@@ -738,6 +740,8 @@ GNU_SYSTEM_MODULES =				\
  %D%/services/cgit.scm			\
  %D%/services/ci.scm				\
  %D%/services/configuration.scm		\
+  %D%/services/configuration/environment-variables.scm		\
+  %D%/services/configuration/utils.scm		\
  %D%/services/containers.scm   		\
  %D%/services/cuirass.scm			\
  %D%/services/cups.scm				\
@@ -1035,6 +1039,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/azr3.patch				\
  %D%/packages/patches/azr3-remove-lash.patch			\
  %D%/packages/patches/barony-fix-textures.patch		\
+  %D%/packages/patches/bam-python3-compat.patch		\
  %D%/packages/patches/bash-completion-directories.patch	\
  %D%/packages/patches/bash-linux-pgrp-pipe.patch		\
  %D%/packages/patches/basis-universal-unbundle-libs.patch	\
@@ -1064,7 +1069,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/binutils-loongson-workaround.patch	\
  %D%/packages/patches/binutils-mingw-w64-deterministic.patch	\
  %D%/packages/patches/binutils-2.41-fix-cross.patch		\
-  %D%/packages/patches/binutils-reproducible-tar.patch		\
  %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch	\
  %D%/packages/patches/bmake-run-check-separately.patch	\
  %D%/packages/patches/boolector-find-googletest.patch	\
@@ -1171,6 +1175,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/curlftpfs-fix-memory-leak.patch		\
  %D%/packages/patches/curlftpfs-fix-no_verify_hostname.patch	\
  %D%/packages/patches/cursynth-wave-rand.patch			\
+  %D%/packages/patches/cvc5-reproducible-build.patch		\
  %D%/packages/patches/cvs-CVE-2017-12836.patch		\
  %D%/packages/patches/cyrus-sasl-fix-time-h.patch              \
  %D%/packages/patches/d-feet-drop-unused-meson-argument.patch	\
@@ -1320,7 +1325,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/flatpak-fix-fonts-icons.patch	\
  %D%/packages/patches/flatpak-fix-icon-validation.patch	\
  %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch	\
-  %D%/packages/patches/flex-fix-make-dependencies.patch         \
  %D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch	\
  %D%/packages/patches/fluxbox-1.3.7-gcc.patch			\
  %D%/packages/patches/fmt-9-overspecified-tests.patch	\
@@ -1378,7 +1382,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/gcc-fix-texi2pod.patch			\
  %D%/packages/patches/gcc-hurd-split-stack.patch 		\
  %D%/packages/patches/gcc-libstdc++-newer-gcc.patch		\
-  %D%/packages/patches/gcc-mangle-guix-store.patch		\
  %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch		\
  %D%/packages/patches/gcc-4.9-inline.patch		\
  %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch		\
@@ -1446,6 +1449,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/ghc-basement-fix-32-bit.patch		\
  %D%/packages/patches/ghc-testsuite-dlopen-pie.patch		\
  %D%/packages/patches/ghc-testsuite-grep-compat.patch		\
+  %D%/packages/patches/ghc-testsuite-recomp015-execstack.patch	\
  %D%/packages/patches/ghc-aeson-encodeDouble.patch		\
  %D%/packages/patches/ghc-basement-fix-32bit.patch		\
  %D%/packages/patches/ghc-bytestring-handle-ghc9.patch	\
@@ -1487,7 +1491,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/glibc-cross-objdump.patch		\
  %D%/packages/patches/glibc-dl-cache.patch			\
  %D%/packages/patches/glibc-guix-locpath.patch			\
-  %D%/packages/patches/glibc-fix-path-attribute-in-getconf.patch \
  %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch	\
  %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch	\
  %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch	\
@@ -1654,7 +1657,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/inkscape-libxml2.patch		\
  %D%/packages/patches/instead-use-games-path.patch		\
  %D%/packages/patches/intltool-perl-compatibility.patch	\
-  %D%/packages/patches/inetutils-hurd64.patch			\
  %D%/packages/patches/insight-toolkit-fix-build.patch			\
  %D%/packages/patches/irrlicht-use-system-libs.patch		\
  %D%/packages/patches/irrlicht-link-against-needed-libs.patch	\
@@ -1686,7 +1688,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/jfsutils-gcc-compat.patch		\
  %D%/packages/patches/jfsutils-include-systypes.patch		\
  %D%/packages/patches/john-the-ripper-jumbo-with-gcc-11.patch	\
-  %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch		\
  %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch		\
  %D%/packages/patches/jsonnet-include-cstdint-for-gcc-13-builds.patch	\
  %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch	\
@@ -1697,6 +1698,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/libcss-check-format.patch		\
  %D%/packages/patches/libeb-gcc-14.patch			\
  %D%/packages/patches/libextractor-tidy-support.patch		\
+  %D%/packages/patches/libfossil-skip-amalgamation.patch	\
  %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch	\
@@ -1743,7 +1745,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/kissfft-tflite-micro.patch               \
  %D%/packages/patches/kitty-fix-wayland-protocols.patch	\
  %D%/packages/patches/kmod-module-directory.patch		\
-  %D%/packages/patches/kmscon-runtime-keymap-switch.patch	\
+  %D%/packages/patches/kmscon-8-runtime-keymap-switch.patch	\
  %D%/packages/patches/knot-remove-runtime-deps.patch		\
  %D%/packages/patches/kobodeluxe-paths.patch			\
  %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
@@ -1758,6 +1760,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
  %D%/packages/patches/laby-make-install.patch			\
  %D%/packages/patches/laby-use-tmpdir-from-runtime.patch	\
+  %D%/packages/patches/ldc-i686-int128-alignment.patch 		\
  %D%/packages/patches/ldns-drill-examples.patch		\
  %D%/packages/patches/leela-zero-gtest.patch			\
  %D%/packages/patches/less-hurd-path-max.patch			\
@@ -1811,7 +1814,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch	\
  %D%/packages/patches/libquicktime-ffmpeg.patch 		\
  %D%/packages/patches/libsepol-versioned-docbook.patch		\
-  %D%/packages/patches/libskk-fix-invalid-escape.patch		\
  %D%/packages/patches/libsoup-auth-digest-fix-crash.patch      \
  %D%/packages/patches/libsoup-deadlock-in-add_listener_in_thread.patch \
  %D%/packages/patches/libsoup-fix-merge-of-ranges.patch        \
@@ -1828,6 +1830,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/libtiff-CVE-2022-34526.patch		\
  %D%/packages/patches/libtirpc-CVE-2021-46828.patch		\
  %D%/packages/patches/libtirpc-hurd.patch			\
+  %D%/packages/patches/libtool-grep-compat.patch		\
+  %D%/packages/patches/libtool-skip-tests2.patch		\
  %D%/packages/patches/libtree-fix-check-non-x86.patch		\
  %D%/packages/patches/libusb-0.1-disable-tests.patch		\
  %D%/packages/patches/libusb-for-axoloti.patch			\
@@ -1977,8 +1981,10 @@ dist_patch_DATA =						\
  %D%/packages/patches/netsurf-y2038-tests.patch		\
  %D%/packages/patches/netsurf-longer-test-timeout.patch	\
  %D%/packages/patches/nhc98-c-update.patch			\
+  %D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch	\
  %D%/packages/patches/nix-dont-build-html-doc.diff		\
  %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch	\
+  %D%/packages/patches/neovim-tree-sitter-grammar-path.patch	\
  %D%/packages/patches/network-manager-plugin-ownership.patch	\
  %D%/packages/patches/network-manager-plugin-path.patch	\
  %D%/packages/patches/newlib-getentropy.patch			\
@@ -2109,6 +2115,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-random2-getrandbits-test.patch		\
  %D%/packages/patches/python-pillow-use-zlib-1.3.patch	\
  %D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch	\
+  %D%/packages/patches/python-pynvim-fix-test-command-error.patch	\
  %D%/packages/patches/python-pypytools-python-3-fixes.patch	\
  %D%/packages/patches/python-pyreadstat-link-libiconv.patch	\
  %D%/packages/patches/python-sip-include-dirs.patch	\
@@ -2251,6 +2258,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-werkzeug-tests.patch		\
  %D%/packages/patches/qdigidoc-bundle-config-files.patch       \
  %D%/packages/patches/qdigidoc-bundle-tsl-files.patch          \
+  %D%/packages/patches/qdigidoc-fix-icon.patch                  \
  %D%/packages/patches/qemu-build-info-manual.patch		\
  %D%/packages/patches/qemu-fix-agent-paths.patch 		\
  %D%/packages/patches/qemu-fix-test-virtio-version.patch       \
@@ -2335,7 +2343,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/rapidcheck-fix-libs.patch		\
  %D%/packages/patches/ratpoison-shell.patch			\
  %D%/packages/patches/retroarch-unbundle-spirv-cross.patch	\
-  %D%/packages/patches/rct-add-missing-headers.patch		\
  %D%/packages/patches/readline-link-ncurses.patch		\
  %D%/packages/patches/renpy-python-3.11-compat.patch			\
  %D%/packages/patches/renpy-fix-integer-slots.patch			\
@@ -2345,7 +2352,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/r-sapa-lapack.patch			\
  %D%/packages/patches/ripperx-missing-file.patch		\
  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
-  %D%/packages/patches/rtags-separate-rct.patch			\
  %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch	\
  %D%/packages/patches/racket-chez-scheme-bin-sh.patch		\
  %D%/packages/patches/racket-launcher-config-dir.patch		\
@@ -2378,12 +2384,12 @@ dist_patch_DATA =						\
  %D%/packages/patches/ruby-flores-fix-deprecations.patch	\
  %D%/packages/patches/ruby-latex-decode-fix-test.patch		\
  %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
-  %D%/packages/patches/ruby-pg-fix-connect-timeout.patch	\
  %D%/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch \
  %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch	\
  %D%/packages/patches/rust-1.70-fix-rustix-build.patch	\
  %D%/packages/patches/rust-1.78-unwinding-fix.patch		\
  %D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch	\
+  %D%/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch	\
  %D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-timeout.patch	\
@@ -2469,6 +2475,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/t4k-common-libpng16.patch		\
  %D%/packages/patches/tao-add-missing-headers.patch		\
  %D%/packages/patches/tao-fix-parser-types.patch		\
+  %D%/packages/patches/tao-synth-include-string-you-use.patch		\
  %D%/packages/patches/tar-remove-wholesparse-check.patch	\
  %D%/packages/patches/tar-skip-unreliable-tests.patch		\
  %D%/packages/patches/taskwarrior-link-taskchampion-cpp-with-sqlite3.patch \
@@ -2517,10 +2524,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
  %D%/packages/patches/unity-test-set-subdir-correctly.patch		\
  %D%/packages/patches/unity-test-support-int64.patch		\
+  %D%/packages/patches/ungoogled-chromium-custom-compiler.patch 	\
+  %D%/packages/patches/ungoogled-chromium-empty-parsed-rustc-args.patch	\
  %D%/packages/patches/ungoogled-chromium-extension-search-path.patch	\
  %D%/packages/patches/ungoogled-chromium-RUNPATH.patch		\
  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\
-  %D%/packages/patches/ungoogled-chromium-unbundle-icu-target.patch     \
  %D%/packages/patches/unknown-horizons-python-3.8-distro.patch	\
  %D%/packages/patches/unknown-horizons-python-3.9.patch	\
  %D%/packages/patches/unknown-horizons-python-3.10.patch	\
@@ -2621,6 +2629,17 @@ dist_patch_DATA =						\
  %D%/packages/patches/yggdrasil-extra-config.patch	\
  %D%/packages/patches/ypsilon-Use-GNU-toolchain-as-default.patch	\
  %D%/packages/patches/zabbix-agent2-test-timezone-fix.patch	\
+  %D%/packages/patches/zed-0.225.10-add-message-notification-action.patch \
+  %D%/packages/patches/zed-0.225.10-add-guix-container-support.patch	\
+  %D%/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch	\
+  %D%/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch		\
+  %D%/packages/patches/zed-0.225.10-disable-dlopen.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-test-db-isolation.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-workspace-race.patch	\
+  %D%/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch	\
+  %D%/packages/patches/zed-0.225.10-remove-patch-crates-io.patch	\
+  %D%/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch	\
  %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch	\
  %D%/packages/patches/zig-0.9-fix-runpath.patch		\
  %D%/packages/patches/zig-0.9-riscv-support.patch		\
@@ -518,8 +518,9 @@ return its return value."
                (location->string (package-location pkg))))
     (match (package-superseded pkg)
       ((? package? new)
-        (info (G_ "package '~a' has been superseded by '~a'~%")
-              (package-name pkg) (package-name new))
+        (unless (assoc-ref (package-properties pkg) 'supress-supersession-info?)
+          (info (G_ "package '~a' has been superseded by '~a'~%")
+                (package-name pkg) (package-name new)))
        new)
       (#f
        pkg)))
@@ -43,7 +43,7 @@
 (define-public acl
  (package
    (name "acl")
-    (version "2.3.2")
+    (version "2.3.1")
    (source
     (origin
      (method url-fetch)
@@ -51,7 +51,7 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "0z1gi82zc2xcbchfagd7apn2s7camaagj8y6hmysl1wpcanxnasz"))))
+        "1bqi7hj0xkpivwg7lx5cv3yvs9ks1i6azvpgbvfpzcq1i736233n"))))
    (build-system gnu-build-system)
    (arguments
     `(#:modules ((ice-9 ftw)
@@ -1302,14 +1302,14 @@ re-executing them as necessary.")
 (define-public inetutils
  (package
    (name "inetutils")
-    (version "2.5")
+    (version "2.7")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/inetutils/inetutils-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "0q1257ci22g2jbdiqs00mharc1lqkbibdlkhj23f3si6qjxkn17s"))))
+                "11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1340,17 +1340,7 @@ re-executing them as necessary.")
                             "\\\""))
      ;; On some systems, 'libls.sh' may fail with an error such as:
      ;; "Failed to tell switch -a apart from -A".
-      #:parallel-tests? #f
-      #:phases (if (target-hurd64?)
-                   #~(modify-phases %standard-phases
-                       (add-after 'unpack 'apply-hurd64-patch
-                         (lambda _
-                           (let ((patch
-                                  #$(local-file
-                                     (search-patch
-                                      "inetutils-hurd64.patch"))))
-                             (invoke "patch" "--force" "-p1" "-i" patch)))))
-                   #~%standard-phases)))
+      #:parallel-tests? #f))
    (inputs
     (list coreutils
           shadow                     ;for login (used in telnetd and rlogind)
@@ -1373,7 +1363,7 @@ hostname.")
 (define-public shadow
  (package
    (name "shadow")
-    (version "4.13")
+    (version "4.19.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1381,7 +1371,7 @@ hostname.")
                    "download/" version "/shadow-" version ".tar.xz"))
              (sha256
               (base32
-                "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))
+                "0crbcfdp7ayyii33srinwd0yr27dkx9mbzglx1d0mvhr1z28xclw"))))
    (build-system gnu-build-system)
    (arguments
     `(;; Assume System V `setpgrp (void)', which is the default on GNU
@@ -1390,7 +1380,9 @@ hostname.")
       '(,@(if (target-hurd?)
             '()
             '("--with-libpam"))
-          "shadow_cv_logdir=/var/log"
+         "--disable-logind" ;; no systemd
+         "--without-libbsd" ;; no libbsd
+         "shadow_cv_logdir=/var/log"
          "ac_cv_func_setpgrp_void=yes")
       #:phases
       (modify-phases %standard-phases
@@ -1426,15 +1418,8 @@ hostname.")
             ;; The top-level Makefile.am wrongfully has "SUBDIRS += man"
             ;; under "if ENABLE_REGENERATE_MAN", even though prebuilt man
             ;; pages are available.  Thus, install them manually.
-             (invoke "make" "-C" "man" "install")))
-         (add-after 'install-man-pages 'remove-groups
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Remove `groups', which is already provided by Coreutils.
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (man (string-append out "/share/man")))
-               (delete-file (string-append bin "/groups"))
-               (for-each delete-file (find-files man "^groups\\."))))))))
+             (invoke "make" "-C" "man" "install"))))))
+    (native-inputs (list pkg-config))
    (inputs
     (append (if (target-hurd?)
                 '()
@@ -3156,7 +3141,7 @@ track changes in important system configuration files.")
 (define-public libcap-ng
  (package
    (name "libcap-ng")
-    (version "0.9")
+    (version "0.9.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3165,12 +3150,20 @@ track changes in important system configuration files.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0izrrh2kmhi6dcy5iqcccmx90nwlaqcglhc60sl8n5ds8il14pi8"))))
+                "13iy7dddcslpmmdhybgvfcgznsvpaa4r3fp9ldlpkq592lw8yyva"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:configure-flags
-       (list "--disable-static"
-             "--without-python")))
+     (list
+      #:configure-flags
+      #~(list "--disable-static"
+              "--without-python")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-configure-ac
+            (lambda _
+              (substitute* "configure.ac"
+                (("linux/sock_diag.h" all)
+                 (string-append all " \\"))))))))
    (inputs
     (list libbpf))
    (native-inputs
@@ -4988,16 +4981,16 @@ Python loading in HPC environments.")
  (let ((real-name "inxi"))
    (package
      (name "inxi-minimal")
-      (version "3.3.31-2")
+      (version "3.3.40-1")
      (source
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/smxi/inxi")
+               (url "https://codeberg.org/smxi/inxi")
               (commit version)))
         (file-name (git-file-name real-name version))
         (sha256
-          (base32 "1fca5minalpmizbxh5kmjiv8xrl7k6g91zn8d84fxmbhsk8vn3kk"))))
+          (base32 "0ivj0dcx7d2hmmkhyql156sb08385rzw640z9kyq4cv1n8ndz58s"))))
      (build-system trivial-build-system)
      (inputs
       (list bash-minimal
@@ -5023,8 +5016,8 @@ Python loading in HPC environments.")
           (copy-recursively (assoc-ref %build-inputs "source")
                             ,(string-append real-name "-" version))
           (with-directory-excursion ,(string-append real-name "-" version)
-             (with-fluids ((%default-port-encoding #f))
-               (substitute* "inxi" (("/usr/bin/env perl") (which "perl"))))
+             (patch-shebang "inxi" (list (dirname (search-input-file
+                                                    %build-inputs "bin/perl"))))
             (let ((bin (string-append %output "/bin")))
               (install-file "inxi" bin)
               (wrap-program (string-append bin "/inxi")
@@ -5039,7 +5032,8 @@ Python loading in HPC environments.")
                                   ((member name '("util-linux"))
                                    (string-append (store-append "/bin") ":"
                                                   (store-append "/sbin")))
-                                   ((member name '("dmidecode" "iproute2"))
+                                   ((member name '("dmidecode" "iproute2" "lvm2"
+                                                   "mdadm"))
                                    (store-append "/sbin"))
                                   (else (store-append "/bin")))))))
                           %build-inputs)))
@@ -5067,6 +5061,7 @@ support forum.  It runs with the @code{/exec} command in most IRC clients.")
    (name "inxi")
    (inputs
     `(("dmidecode" ,dmidecode)
+       ("eudev" ,eudev)
       ("file" ,file)
       ("bind:utils" ,isc-bind "utils") ; dig
       ("gzip" ,gzip)
@@ -5092,11 +5087,14 @@ support forum.  It runs with the @code{/exec} command in most IRC clients.")
       ("perl-time-hires" ,perl-time-hires)
       ("lvm2" ,lvm2)                   ; lvs
       ("mdadm" ,mdadm)
+       ("wayland-utils" ,wayland-utils)
       ;; TODO: Add more inputs:
       ;; ipmi-sensors
       ;; hddtemp
       ;; perl-xml-dumper
       ;; ipmitool
+       ;; wlr-randr
+       ;; vulkan-tools
       ,@(package-inputs inxi-minimal)))))

 (define-public pscircle
@@ -5602,69 +5600,61 @@ representation to stdout.")
 (define-public hosts
  (package
    (name "hosts")
-    (version "3.6.3")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/xwmx/hosts")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1ni4z89kxzgwm26hhx908g04f2h0fypy7lgfa0rvsz8d0wslgcsn"))))
-    (build-system trivial-build-system)
+    (version "3.6.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/xwmx/hosts")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1kzd4lxlflam87dhbx1jx7bj6v6sa4f2024mfxj2768kp9qapraj"))))
+    (build-system copy-build-system)
+    (native-inputs
+     (list bats)) ;for tests
    (inputs
-     `(("bats" ,bats) ;for test
-       ("awk" ,gawk)
-       ("bash" ,bash)
-       ("coreutils" ,coreutils)
-       ("diffutils" ,diffutils)
-       ("grep" ,grep)
-       ("ncurses" ,ncurses) ;tput
-       ("sed" ,sed)))
+     (list gawk
+           bash-minimal
+           coreutils
+           diffutils
+           grep
+           ncurses ;for tput
+           sed))
    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         ;; copy source
-         (copy-recursively (assoc-ref %build-inputs "source") ".")
-         ;; patch-shebang phase
-         (setenv "PATH"
-                 (string-append (assoc-ref %build-inputs "bash") "/bin"
-                                ":" (assoc-ref %build-inputs "awk") "/bin"
-                                ":" (assoc-ref %build-inputs "coreutils") "/bin"
-                                ":" (assoc-ref %build-inputs "diffutils") "/bin"
-                                ":" (assoc-ref %build-inputs "grep") "/bin"
-                                ":" (assoc-ref %build-inputs "ncurses") "/bin"
-                                ":" (assoc-ref %build-inputs "sed") "/bin"
-                                ":" "/run/privileged/bin"
-                                ":" (getenv "PATH")))
-         (substitute* "hosts"
-           (("#!/usr/bin/env bash")
-            (string-append "#!" (which "bash")
-                           "\nPATH=" (getenv "PATH"))))
-         ;; check phase
-         (setenv "TERM" "linux") ;set to tty for test
-         (invoke (search-input-file %build-inputs "/bin/bats")
-                 "test")
-         ;; install phase
-         (install-file "hosts" (string-append %output "/bin"))
-         (let ((bash-completion
-                (string-append %output "/etc/bash_completion.d")))
-           (mkdir-p bash-completion)
-           (copy-file "etc/hosts-completion.bash"
-                      (string-append bash-completion "/hosts")))
-         (let ((zsh-completion
-                (string-append %output "/share/zsh/site-functions")))
-           (mkdir-p zsh-completion)
-           (copy-file "etc/hosts-completion.zsh"
-                      (string-append zsh-completion "/_hosts")))
-         (let ((doc (string-append %output "/share/doc/" ,name "-" ,version)))
-           (mkdir-p doc)
-           (install-file "LICENSE" doc)
-           (install-file "README.md" doc))
-         #t)))
+     (list
+      #:install-plan
+      #~'(("hosts" "bin/hosts")
+          ("etc/hosts-completion.bash" "/etc/bash_completion.d/hosts")
+          ("etc/hosts-completion.zsh" "/share/zsh/site-functions/_hosts")
+          ("README.md"
+           #$(string-append "/share/doc/" name "-" version "/README.md")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-hosts
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "test/test_helper.bash"
+                (("export _HOSTS=.*")
+                 (string-append "export _HOSTS=" #$output "/bin/hosts")))
+              (substitute* (cons* "hosts"
+                            ;; *.bash and *.bats.
+                            (find-files "test" "\\.bat?sh?.*$"))
+                (("\\btput\\b") (search-input-file inputs "bin/tput"))
+                (("\\bsed\\b") (search-input-file inputs "bin/sed"))
+                (("\\bawk\\b") (search-input-file inputs "bin/awk"))
+                (("\\bgrep\\b") (search-input-file inputs "bin/grep"))
+                (("\\bdiff\\b") (search-input-file inputs "bin/diff"))
+                (("\\bcp\\b") (search-input-file inputs "bin/cp"))
+                (("\\bchmod\\b") (search-input-file inputs "bin/chmod")))))
+          (add-after 'install 'check
+            (lambda* (#:key tests? inputs #:allow-other-keys)
+              (if tests?
+                  (begin
+                    (delete-file "hosts") ;Ensure installed hosts is checked.
+                    (setenv "PATH" "") ;Ensure substitutions were correct.
+                    (setenv "TERM" "linux") ;Set to tty for test.
+                    (invoke (search-input-file inputs "/bin/bats")
+                            "test"))))))))
    (home-page "https://github.com/xwmx/hosts/")
    (synopsis "Script for editing a foreign distro's @file{/etc/hosts} file")
    (description "Hosts is a command line program for managing
@@ -1,9 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,160 +17,20 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

-(define-public adns
-  (package
-    (name "adns")
-    (version "1.6.1")
-    (source (origin
-              (method url-fetch)
-              (uri (list (string-append "mirror://gnu/adns/adns-"
-                                        version ".tar.gz")
-                         (string-append
-                           "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-"
-                           version ".tar.gz")))
-              (sha256
-               (base32
-                "1k81sjf0yzv6xj35vcxp0ccajxrhhmyly7a57xlbs1kmkdwb6f3i"))))
-    (build-system gnu-build-system)
-    (arguments
-     ;; Make sure the programs under bin/ fine libadns.so.
-     '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
-                                              (assoc-ref %outputs "out")
-                                              "/lib"))
+(define-deprecated/public-alias adns
+  (@ (gnu packages dns) adns))

-       ;; XXX: Tests expect real name resolution to work.
-       #:tests? #f))
-    (native-inputs
-     (list m4))
-    (home-page "https://www.gnu.org/software/adns/")
-    (synopsis "Asynchronous DNS client library and utilities")
-    (description
-     "GNU adns is a C library that provides easy-to-use DNS resolution
-functionality.  The library is asynchronous, allowing several concurrent
-calls.  The package also includes several command-line utilities for use in
-scripts.")
-    (license gpl3+)))
+(define-deprecated/public-alias c-ares
+  (@ (gnu packages dns) c-ares))

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

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

-(define-public c-ares-for-node-bootstrap
-  (hidden-package
-   (package
-     (inherit c-ares)
-     (version "1.18.1")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append
-                     "https://c-ares.haxx.se/download/c-ares-" version
-                     ".tar.gz"))
-               (sha256
-                (base32
-                 "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
-
-;; gRPC requires a c-ares built with CMake in order to get the .cmake modules.
-;; We can not build c-ares itself with CMake because that would introduce a
-;; circular dependency through nghttp2.
-;; XXX: It would be nice if we could extract the modules somehow and make them
-;; work with the "normal" c-ares package instead of building a whole new library.
-(define-public c-ares/cmake
-  (hidden-package
-   (package
-     (inherit c-ares)
-     (build-system cmake-build-system)
-     (arguments
-      `(;; XXX: Tests require name resolution (the normal variant runs no tests).
-        #:tests? #f)))))
+(define-deprecated/public-alias c-ares/cmake
+  (@ (gnu packages dns) c-ares/cmake))
@@ -370,7 +370,7 @@ This package includes the following programs:
           libjpeg-turbo
           perl
           python
-           v4l-utils-minimal))
+           v4l-utils))
    (propagated-inputs
     ;; These are in 'requires' field of .pc files.
     (list glib gtk+))
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2022, 2023, 2024, 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2016-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016, 2018, 2019, 2021, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017, 2020-2022 Efraim Flashner <efraim@flashner.co.il>
@@ -406,7 +406,7 @@ precision.")
 (define-public giac
  (package
    (name "giac")
-    (version "2.0.0-10")
+    (version "2.0.0-21")
    (source
     (origin
       (method url-fetch)
@@ -418,7 +418,7 @@ precision.")
              "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/"
              "stable/main/source/giac_" version ".tar.gz"))
       (sha256
-        (base32 "1lzb0jjmkg5ml1qfl0m00qqng4sxgfqwrbq10gpkp4b301k2ckv1"))))
+        (base32 "1j6bip76hhqvycapf7xy26y0b8g5zzx4gwkfsr7bf6m2h71a2zry"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -765,7 +765,7 @@ file system.")
       (sha256
        (base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
    (build-system pyproject-build-system)
-    (inputs (list python-requests python-argcomplete python-urllib3
+    (propagated-inputs (list python-requests python-argcomplete python-urllib3
                  python-looseversion gnupg))
    (native-inputs (list python-setuptools python-wheel python-requests-cache
                         python-defusedxml))
@@ -773,8 +773,7 @@ file system.")
     (list $SSL_CERT_FILE))
    (arguments
     (list
-      #:test-flags
-      #~(list "-k" "test_*")
+      #:test-backend #~'unittest
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-tests
@@ -793,11 +792,7 @@ file system.")
            (lambda _
              (substitute* "sdkmanager.py"
                (("gpgv")
-                 (string-append #$(this-package-input "gnupg") "/bin/gpgv")))))
-          (replace 'check
-            (lambda* (#:key tests? test-flags #:allow-other-keys)
-              (when tests?
-                (apply invoke "python" "-m" "unittest" test-flags)))))))
+                 (string-append #$(this-package-input "gnupg") "/bin/gpgv"))))))))
    (home-page "https://gitlab.com/fdroid/sdkmanager")
    (synopsis "Replacement for Android sdkmanager written in Python")
    (description
@@ -1182,14 +1177,16 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
 (define-public fdroidserver
  (package
    (name "fdroidserver")
-    (version "2.4.2")
+    (version "2.4.3")
    (source
     (origin
-       (method url-fetch)
-       (uri (pypi-uri "fdroidserver" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://gitlab.com/fdroid/fdroidserver")
+              (commit version)))
+       (file-name (git-file-name name version))
       (sha256
-        (base32
-         "06xybginrwi5c7bw000wz5s5hzi0aqrxskzwh8qc6wv463w2djax"))))
+        (base32 "1745fqxr2qfrls4wr6x9w1262b9pxmw9yvzd9b71ya2qmj74q17n"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1200,22 +1197,17 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
            (lambda _
              (setenv "HOME" "/tmp"))))))
    (propagated-inputs
-     (list python-androguard
+     (list python-platformdirs
+           python-androguard
           python-apache-libcloud
-           python-argcomplete
           python-asn1crypto
           python-clint
           python-defusedxml
-           python-docker
           python-gitpython
-           python-mwclient
           python-oscrypto
           python-paramiko
           python-pillow
-           python-platformdirs
           python-puremagic
-           python-pyasn1
-           python-pyasn1-modules
           python-pyyaml
           python-qrcode
           python-requests
@@ -1387,6 +1379,7 @@ mounted via FUSE.")
       (uri (git-reference
             (url "https://github.com/anestisb/android-simg2img")
             (commit version)))
+       (file-name (git-file-name name version))
       (sha256
        (base32
         "0drwvqxbhajka580j93z8ldckhjlpr0i84nh20krdpxcp54xvldh"))))
@@ -33,9 +33,8 @@
       ;; The URI does not appear to be easily guessable.  For
       ;; example, you cannot download version "9100g" simply
       ;; by replacing "9100h" in the URI.
-       (uri (list (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
-                                 "distfiles/31/anthy-9100h.tar.gz")
-                  "https://osdn.dl.osdn.net/anthy/37536/anthy-9100h.tar.gz"))
+       (uri (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
+                           "distfiles/31/anthy-9100h.tar.gz"))
       (sha256
        (base32 "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
    (build-system gnu-build-system)
@@ -30,20 +30,26 @@
  #:use-module (guix packages)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
  #:use-module (gnu packages java)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages readline)
-  #:use-module (gnu packages sqlite))
+  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages xorg))

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

 (define-public appimage-type2-runtime
-  (let ((revision "0")
+  (let ((revision "1")
        ;; No releases, just the latest commit.
-        (commit "47b665594856b4e8928f8932adcf6d13061d8c30"))
+        (commit "caf24f9f712084686bfc24a70b75e50df0aefb9c"))
    (package
      (name "appimage-type2-runtime")
      (version (git-version "continuous" revision commit))
@@ -44,16 +46,16 @@
                (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0954crhlbapxis96g1s0vfpf78ybr64zvjalak387ksxj560g44x"))))
+          (base32 "17z0byws3dp375wcyq5xwy5npqy7hslqw21n677dp38z4f940nzv"))))
      (build-system gnu-build-system)
      (arguments
       (list
        #:tests? #f                     ; No tests
        #:make-flags
-        #~(list "-Csrc/runtime" "runtime-fuse3"
+        #~(list "-Csrc/runtime" "runtime"
                (string-append "CC=" #$(cc-for-target))
                (string-append
-                 "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse/"
+                 "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse3/"
                 " -DGIT_COMMIT='\"" "guix-" #$version "\"'"
                 " -D_FILE_OFFSET_BITS=64"
                 " -static"
@@ -64,17 +66,22 @@
          (ice-9 binary-ports))
        #:phases
        #~(modify-phases %standard-phases
+            (add-after 'unpack 'use-pkgconfig-flags
+              (lambda _
+                (substitute* "src/runtime/Makefile"
+                  (("-lmimalloc")
+                   "$(pkg-config --cflags mimalloc)"))))
            (delete 'configure)
            (replace 'install
              (lambda _
-                (install-file "src/runtime/runtime-fuse3"
+                (install-file "src/runtime/runtime"
                              (string-append #$output "/bin"))))
            ;; Must be after all elf reliant phases.  Used to identify the
            ;; executable as an AppImage as per the specification.
            (add-after 'make-dynamic-linker-cache 'set-magic-bytes
              (lambda _
                (let ((port (open (string-append #$output
-                                                 "/bin/runtime-fuse3")
+                                                 "/bin/runtime")
                                  (logior O_WRONLY))))
                  (seek port 8 SEEK_SET)
                  (put-bytevector port #vu8(#x41 #x49 #x02))
@@ -84,9 +91,12 @@
              (this-package-input "fuse")
              (gexp-input (this-package-input "zstd") "static")
              (gexp-input (this-package-input "zlib") "static"))))
+      (native-inputs (list pkg-config))
      ;; Only needed at build time.
-      (inputs (list squashfuse-for-appimage
-                    fuse-for-appimage
+      (inputs (list `(,fuse "out")
+                    `(,fuse "static")
+                    mimalloc
+                    squashfuse-for-appimage
                    `(,zstd "static")
                    `(,zlib "static")))
      (synopsis "Runtime for executing AppImages")
@@ -34,14 +34,14 @@
 (define-public apr
  (package
    (name "apr")
-    (version "1.7.4")
+    (version "1.7.6")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://apache/apr/apr-"
                                 version ".tar.bz2"))
             (sha256
              (base32
-               "0xsmqgjiyw3s6va5dm86djnjzg9r0qc1zsldwz4sd8pkhglqsr7w"))
+               "0cpbbmng9ir8rjl9nxwljkzmrkpk4b1nsj8vg4ssfpapsa90s0s9"))
             (patches
              (search-patches "apr-skip-getservbyname-test.patch"))
             (patch-flags '("-p0"))))
@@ -42,7 +42,7 @@
 ;;; Copyright © 2022 Andy Tai <atai@atai.org>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
 ;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
-;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2023, 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com>
@@ -62,6 +62,7 @@
 ;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;; Copyright © 2026 Noé Lopez <noelopez@free.fr>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
+;;; Copyright © 2026 Daniel Martins <email@danielfm.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -395,6 +396,7 @@ displays a histogram of the roundtrip time jitter.")
                                  "webrtc-audio-processing-x86-no-sse.patch"))))))
               #~%standard-phases)))
    (native-inputs (list pkg-config))
+    (propagated-inputs (list abseil-cpp))
    (inputs (list abseil-cpp))
    (synopsis "WebRTC's Audio Processing Library")
    (description "WebRTC-Audio-Processing library based on Google's
@@ -545,15 +547,17 @@ synth (like DX7) or FM chip.")
 (define-public libgme
  (package
    (name "libgme")
-    (version "0.6.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://bitbucket.org/mpyne/game-music-emu/"
-                                  "downloads/game-music-emu-" version
-                                  ".tar.xz"))
-              (sha256
-               (base32
-                "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"))))
+    (version "0.6.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/libgme/game-music-emu")
+         (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "093pz3avnj6a230bqbwwzqlzcjxnxidfxipnn7zirwp3h396szff"))))
    (build-system cmake-build-system)
    (arguments
     '(#:tests? #f                                ;no check target
@@ -562,7 +566,7 @@ synth (like DX7) or FM chip.")
       ;; header file names in libgme.so, meaning that libgme retains a
       ;; reference to GCC.  Disable UBSAN to avoid that.
       #:configure-flags '("-DENABLE_UBSAN=OFF")))
-    (home-page "https://bitbucket.org/mpyne/game-music-emu")
+    (home-page "https://github.com/libgme/game-music-emu/wiki")
    (synopsis "Video game music file playback library")
    (description
     "Game-music-emu is a collection of video game music file emulators that
@@ -2316,13 +2320,13 @@ object library.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "1jds2l3cb96b02jxd7lmrjjl9s7mylnrvg6fpw0j8c141bk8vyg3"))))
+                  "1jds2l3cb96b02jxd7lmrjjl9s7mylnrvg6fpw0j8c141bk8vyg3"))
+                (patches
+                 (search-patches "tao-synth-include-string-you-use.patch"))))
      (build-system cmake-build-system)
      (arguments (list #:tests? #false))  ;there are no tests
      (inputs
       (list glfw freeglut))
-      (native-inputs
-       (list gcc-7))
      (home-page "https://github.com/lucasw/tao_synth")
      (synopsis "Sound synthesis with physical models")
      (description "Tao is a software package for sound synthesis using physical
@@ -3438,7 +3442,7 @@ from being able to mix multiple JACK audio streams.")
            (commit (string-append "v" version))))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "08ji4lg24flzi6g3yaavfq8hz3kr98q2ripk5m4qk9z172qxbbc9"))))
+       (base32 "0fvnvr74q5khxlj5sylfnkblydmwgdbvj04mhdqw0zzmfqwignhd"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -3703,6 +3707,44 @@ compensation, (de)interleaving, and byte-swapping
    ;; original developer.
    (license license:expat)))

+(define-public rtcqs
+  (package
+    (name "rtcqs")
+    (version "0.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://codeberg.org/rtcqs/rtcqs")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1kc3niyaq4m8di68832pgfb1b0m54q5gm68dwlzwwilgxi61ifzc"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no test suite
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-gui
+            (lambda _
+              (substitute* "pyproject.toml"
+                (("\"FreeSimpleGUI\",?")
+                 "")
+                (("rtcqs_gui = \"rtcqs\\.rtcqs_gui:main\"")
+                 ""))
+              (delete-file "src/rtcqs/rtcqs_gui.py")
+              (delete-file "src/rtcqs/rtcqs_qt_gui.py"))))))
+    (native-inputs (list python-setuptools))
+    (home-page "https://codeberg.org/rtcqs/rtcqs")
+    (synopsis "Linux audio real-time performance analyzer")
+    (description
+     "rtcqs analyzes a Linux system to detect possible bottlenecks that could
+have a negative impact on real-time audio performance.  It checks kernel
+configuration, IRQ priorities, CPU governor, swappiness, and other settings
+relevant to low-latency audio work.")
+    (license license:expat)))
+
 (define-public rtosc
  (package
    (name "rtosc")
@@ -6358,6 +6400,59 @@ It is currently fairly complete for PCM devices, and has some support for
 mixers.")
    (license license:psfl)))

+(define-public python-pyo
+  (package
+    (name "python-pyo")
+    (version "1.0.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/belangeo/pyo")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1igz75kv94dav28rzz19gckgfgdli05q5ghadlvm03ia7xd9l5zm"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+     ;; TODO: collecting ... Fatal Python error: Segmentation fault
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'sanity-check 'set-HOME
+            (lambda _
+              (setenv "HOME" "/tmp"))))))
+    (native-inputs
+     (list python-pytest
+           python-setuptools))
+    (inputs
+     (list liblo
+           libsndfile
+           portaudio
+           portmidi))
+    (propagated-inputs
+     (list python-wxpython))
+    (home-page "https://github.com/belangeo/pyo")
+    (synopsis "Python module to build digital signal processing program")
+    (description
+     "pyo is a Python module containing classes for a wide variety of audio
+signal processing types.
+
+With pyo, user will be able to include signal processing chains directly in
+Python scripts or projects, and to manipulate them in real time through the
+interpreter.  Tools in pyo module offer primitives, like mathematical
+operations on audio signal, basic signal processing (filters, delays,
+synthesis generators, etc.), but also complex algorithms to create sound
+granulation and others creative audio manipulations.
+
+pyo supports OSC protocol (Open Sound Control), to ease communications between
+softwares, and MIDI protocol, for generating sound events and controlling
+process parameters.  pyo allows creation of sophisticated signal processing
+chains with all the benefits of a mature, and widely used, general programming
+language.")
+    (license license:lgpl3+)))
+
 (define-public ldacbt
  (package
    (name "ldacbt")
@@ -7990,6 +8085,7 @@ Home Page}.")
             (commit version)
             ;; For test files.
             (recursive? #true)))
+       (file-name (git-file-name name version))
       (sha256
        (base32 "065x43hx670rjrclxi4hiqxscllb16v9s7myjvg7rd5pd3y0k7sg"))))
    (build-system pyproject-build-system)
@@ -8120,7 +8216,7 @@ and DSD streams.")
 (define-public qpwgraph
  (package
    (name "qpwgraph")
-    (version "0.9.9")
+    (version "1.0.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -8129,7 +8225,7 @@ and DSD streams.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "03001pvcbvr206k00751232gm50x1icf086z8c5hiakl2ym79gwl"))))
+                "0l3fflfpwkqy4iif8ifzzr3yy39ahzqdixx5g3rhj3zzbaysj73h"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f))                ; no tests
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2012-2018, 2020-2022, 2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org>
@@ -157,7 +157,7 @@ know anything about Autoconf or M4.")
       (base32
        "0niz4852fgyavfh3gr4h4kzalk01nk70v6vfsja6r3ap349mr25s"))))))

-(define-public autoconf autoconf-2.72)
+(define-public autoconf autoconf-2.69)

 (define-public autoconf-2.68
  (package (inherit autoconf)
@@ -438,14 +438,14 @@ Makefile, simplifying the entire process for the developer.")
 (define-public automake
  (package/inherit automake-1.16.5
    (name "automake")
-    (version "1.18.1")
+    (version "1.17")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/automake/automake-"
                                  version ".tar.xz"))
              (sha256
               (base32
-                "11v8ckqx7z8hv4mq9dnhg58cwnssaa7l9136yndbhlc34xis72hn"))
+                "146rkdcwri2dkwn3pjrjs9v0wm4xyav9vvq4yw5vj4qy87yc2849"))
              (patches
               (search-patches "automake-skip-amhello-tests.patch"))))
    (arguments
@@ -483,14 +483,16 @@ Makefile, simplifying the entire process for the developer.")
 (define-public libtool
  (package
    (name "libtool")
-    (version "2.5.4")
+    (version "2.4.7")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/libtool/libtool-"
                                  version ".tar.xz"))
              (sha256
               (base32
-                "0xb64rhambx6mhxwr613xgyad7ybs5hgmpmd9gccf2vbcrh5h7zq"))))
+                "0pb3l4x37k6fj1lwnpzws55gi3pxl0hx56jm4bzmbrkw0mzj2zsg"))
+              (patches (search-patches "libtool-skip-tests2.patch"
+                                       "libtool-grep-compat.patch"))))
    (build-system gnu-build-system)
    (propagated-inputs (list m4))
    (native-inputs
@@ -504,59 +506,43 @@ Makefile, simplifying the entire process for the developer.")
           autoconf-wrapper))   ; others on 'autom4te'

    (arguments
-     (list ;; Libltdl is provided as a separate package, so don't install it here.
-           #:configure-flags #~'("--disable-ltdl-install")
+     `(;; Libltdl is provided as a separate package, so don't install it here.
+       #:configure-flags '("--disable-ltdl-install")

-           ;; The 'libtool' script refers to the toolchain; tolerate it.
-           #:disallowed-references '()
+       ;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
+       ;; <http://hydra.gnu.org/build/181662>.
+       ;; Also, do not run tests when cross compiling
+       #:tests? ,(not (or (%current-target-system)
+                          (string-prefix? "mips64"
+                                          (%current-system))))

-           ;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
-           ;; <http://hydra.gnu.org/build/181662>.
-           ;; Also, do not run tests when cross compiling
-           #:tests? (not (or (%current-target-system)
-                             (string-prefix? "mips64"
-                                             (%current-system))))
-
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'skip-some-tests-on-extra-archs
-                 (lambda _
-                   (with-directory-excursion "tests"
-                     (substitute* '("demo.at" "testsuite")
-                       (("hppa\\*\\|amd64\\*\\|x86_64\\*\\|s390\\*"
-                         all)
-                        (string-append all "|arm*|mips*|riscv*"))))))
-               (add-before 'check 'pre-check
-                 (lambda* (#:key inputs native-inputs parallel-tests?
-                           #:allow-other-keys)
-                   ;; Run the test suite in parallel, if possible.
-                   (setenv "TESTSUITEFLAGS"
-                           (string-append
-                            "-j"
-                            (if parallel-tests?
-                                (number->string (parallel-job-count))
-                                "1")))
-                   ;; Patch references to /bin/sh.
-                   (let ((/bin/sh (search-input-file (or native-inputs inputs)
-                                                     "bin/sh")))
-                     (substitute* "tests/testsuite"
-                       (("/bin/sh")
-                        /bin/sh)))))
-               ;; These files may be copied into source trees by libtoolize,
-               ;; therefore they must not point to store file names that would be
-               ;; leaked with tarballs generated by make dist.
-               (add-after 'install 'restore-build-aux-shebang
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (let* ((out (assoc-ref outputs "out"))
-                          (dir (string-append out
-                                              "/share/libtool/build-aux")))
-                     (for-each (lambda (file)
-                                 (format #t "restoring shebang on `~a'~%"
-                                         file)
-                                 (substitute* file
-                                   (("^#!.*/bin/sh")
-                                    "#!/bin/sh")))
-                               (find-files dir))))))))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'pre-check
+           (lambda* (#:key inputs native-inputs parallel-tests? #:allow-other-keys)
+             ;; Run the test suite in parallel, if possible.
+             (setenv "TESTSUITEFLAGS"
+                     (string-append
+                      "-j"
+                      (if parallel-tests?
+                        (number->string (parallel-job-count))
+                        "1")))
+           ;; Patch references to /bin/sh.
+           (let ((/bin/sh (search-input-file (or native-inputs inputs) "bin/sh")))
+             (substitute* "tests/testsuite"
+               (("/bin/sh") /bin/sh)))))
+         ;; These files may be copied into source trees by libtoolize,
+         ;; therefore they must not point to store file names that would be
+         ;; leaked with tarballs generated by make dist.
+         (add-after 'install 'restore-build-aux-shebang
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (dir (string-append out "/share/libtool/build-aux")))
+               (for-each (lambda (file)
+                           (format #t "restoring shebang on `~a'~%" file)
+                           (substitute* file
+                             (("^#!.*/bin/sh") "#!/bin/sh")))
+                         (find-files dir))))))))

    (synopsis "Generic shared library support tools")
    (description
@@ -547,7 +547,7 @@ remain fully idle, saving power and producing less noise.")
         "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"))))
    (build-system gnu-build-system)
    (inputs
-     (list librsync-0.9))
+     (list librsync))
    (arguments
     `(#:make-flags `("CFLAGS=-fcommon"
                      ,(string-append "PREFIX=" (assoc-ref %outputs "out"))
@@ -24,7 +24,6 @@
 ;;; Copyright © 2022, 2026 John Kehayias <john@guixotic.coop>
 ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
 ;;; Copyright © 2024, 2025 Zheng Junjie <z572@z572.online>
-;;; Copyright © 2025 Nikita Mitasov <me@ch4og.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -120,14 +119,14 @@ command-line arguments, multiple languages, and so on.")
 (define-public grep
  (package
   (name "grep")
-   (version "3.12")
+   (version "3.11")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/grep/grep-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "1f87i907dzw31xy1xr8xjj6z9979qq3bwmypvkm35rlh1ryb4j96"))
+              "1avf4x8skxbqrjp5j2qr9sp5vlf8jkw2i5bdn51fl3cxx3fsxchx"))
            (patches (search-patches "grep-timing-sensitive-test.patch"))))
   (build-system gnu-build-system)
   (native-inputs (list perl))                   ;some of the tests require it
@@ -248,49 +247,47 @@ implementation offers several extensions over the standard utility.")
   (build-system gnu-build-system)
   ;; Note: test suite requires ~1GiB of disk space.
   (arguments
-    (append
-     (cond
-      ((target-hurd?)
-       '(#:make-flags
-         (list (string-append
-                "TESTSUITEFLAGS= -k '"
-                "!sparse"
-                ",!renamed dirs in incrementals"
-                ",!--exclude-tag option in incremental pass"
-                ",!incremental dumps with -C"
-                ",!incremental dumps of nested directories"
-                ",!incremental restores with -C"
-                ",!concatenated incremental archives (renames)"
-                ",!renamed directory containing subdirectories"
-                ",!renamed subdirectories"
-                ",!chained renames"
-                ",!Directory"
-                "'"))))
-      ;; 'storing sparse files > 8G' fails on powerpc-linux, likely
-      ;; due to the small HDD and RAM present on these devices.
-      ((target-ppc32?)
-       '(#:make-flags (list (string-append "TESTSUITEFLAGS= -k "
-                                           "'!tricky time stamps"
-                                           ",!storing sparse files > 8G'"))))
-      ;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
-      ;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
-      ;; skipping the test for this release on 32-bit systems.
-      ((not (target-64bit?))
-       '(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
-      (else '()))
-     ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
-     (if (target-hurd32?)
-         (list #:configure-flags #~(list "--disable-year2038"))
-         '())
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-shell-file-name
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Do not use "/bin/sh" to run programs.
-              (substitute* "src/system.c"
-                (("/bin/sh")
-                 (search-input-file inputs "bin/sh")))))))))
+    `(,@(cond
+          ((target-hurd?)
+           '(#:make-flags
+             (list (string-append
+                     "TESTSUITEFLAGS= -k '"
+                     "!sparse"
+                     ",!renamed dirs in incrementals"
+                     ",!--exclude-tag option in incremental pass"
+                     ",!incremental dumps with -C"
+                     ",!incremental dumps of nested directories"
+                     ",!incremental restores with -C"
+                     ",!concatenated incremental archives (renames)"
+                     ",!renamed directory containing subdirectories"
+                     ",!renamed subdirectories"
+                     ",!chained renames"
+                     ",!Directory"
+                     "'"))))
+          ;; 'storing sparse files > 8G' fails on powerpc-linux, likely
+          ;; due to the small HDD and RAM present on these devices.
+          ((target-ppc32?)
+           '(#:make-flags (list (string-append "TESTSUITEFLAGS= -k "
+                                               "'!tricky time stamps"
+                                               ",!storing sparse files > 8G'"))))
+          ;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
+          ;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
+          ;; skipping the test for this release on 32-bit systems.
+          ((target-32bit?)
+           '(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
+          (else '()))
+      ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
+      ,@(if (target-hurd32?)
+            (list #:configure-flags ''("--disable-year2038"))
+            '())
+      #:phases (modify-phases %standard-phases
+                 (add-before 'build 'set-shell-file-name
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     ;; Do not use "/bin/sh" to run programs.
+                     (let ((bash (assoc-ref inputs "bash")))
+                       (substitute* "src/system.c"
+                         (("/bin/sh")
+                          (string-append bash "/bin/sh")))))))))

   ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able
   ;; to refer to the target Bash.
@@ -309,8 +306,41 @@ standard utility.")
   (license gpl3+)
   (home-page "https://www.gnu.org/software/tar/")))

+;;; TODO: Replace/merge with 'patch' on core-updates.
+(define-public patch/pinned
+  (hidden-package
+   (package
+     (name "patch")
+     (version "2.7.6")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "mirror://gnu/patch/patch-"
+                                   version ".tar.xz"))
+               (sha256
+                (base32
+                 "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"))
+               (patches (search-patches "patch-hurd-path-max.patch"))))
+     (build-system gnu-build-system)
+     (arguments
+      ;; Work around a cross-compilation bug whereby libpatch.a would provide
+      ;; '__mktime_internal', which conflicts with the one in libc.a.
+      (if (%current-target-system)
+          `(#:configure-flags '("gl_cv_func_working_mktime=yes"))
+          '()))
+     (native-inputs (list ed))
+     (synopsis "Apply differences to originals, with optional backups")
+     (description
+      "Patch is a program that applies changes to files based on differences
+laid out as by the program \"diff\".  The changes may be applied to one or more
+files depending on the contents of the diff file.  It accepts several
+different diff formats.  It may also be used to revert previously applied
+differences.")
+     (license gpl3+)
+     (home-page "https://savannah.gnu.org/projects/patch/"))))
+
 (define-public patch
  (package
+    (inherit patch/pinned)
    (name "patch")
    (version "2.8")
    (source (origin
@@ -320,27 +350,13 @@ standard utility.")
              (sha256
               (base32
                "1qssgwgy3mfahkpgg99a35gl38vamlqb15m3c2zzrd62xrlywz7q"))))
-    (build-system gnu-build-system)
    (arguments
-     (list
-      #:configure-flags
-      #~(append
-         (if #$(%current-target-system)
-             (list "gl_cv_func_working_mktime=yes")
-             '())
-         (if #$(target-hurd32?)
-             (list "--disable-year2038")
-             '()))))
-    (native-inputs (list ed))
-    (synopsis "Apply differences to originals, with optional backups")
-    (description
-     "Patch is a program that applies changes to files based on differences
-laid out as by the program \"diff\".  The changes may be applied to one or more
-files depending on the contents of the diff file.  It accepts several
-different diff formats.  It may also be used to revert previously applied
-differences.")
-    (license gpl3+)
-    (home-page "https://savannah.gnu.org/projects/patch/")
+     (substitute-keyword-arguments (package-arguments patch/pinned)
+       ((#:configure-flags flags #~'())
+        (if (target-hurd32?)
+            #~(cons* "--disable-year2038"
+                     #$flags)
+            flags))))
    (properties '())))

 (define-public diffutils
@@ -431,14 +447,6 @@ interactive means to merge two files.")
                                 "gnulib-tests/test-strerror_r.c"
                               (("(^| )main *\\(.*" all)
                                (string-append all "{\n  exit (77);//"))))))
-                       '())
-                 ,@(if (string=? "riscv64-linux" (%current-system))
-                       ;; Unmodified test-lock will fail or crash riscv64
-                       '((add-before 'check 'modify-test-lock
-                           (lambda _
-                             (substitute* "gnulib-tests/test-lock.c"
-                               (("#define DO_TEST_RWLOCK 1")
-                                "#define DO_TEST_RWLOCK 0")))))
                       '()))))
   (synopsis "Operating on files matching given criteria")
   (description
@@ -507,14 +515,6 @@ used to apply commands with arbitrarily long arguments.")
                       (("/bin/sh") (which "sh")))
                     (substitute* (find-files "tests" "\\.sh$")
                       (("#!/bin/sh") (string-append "#!" (which "sh"))))))
-                 ,@(if (string=? "riscv64-linux" (%current-system))
-                       ;; Unmodified test-lock will fail or crash riscv64
-                       '((add-before 'check 'modify-test-lock
-                           (lambda _
-                             (substitute* "gnulib-tests/test-lock.c"
-                               (("#define DO_TEST_RWLOCK 1")
-                                "#define DO_TEST_RWLOCK 0")))))
-                       '())
                 (add-after 'unpack 'remove-tests
                   (lambda _
                     ,@(if (system-hurd?)
@@ -632,21 +632,20 @@ standard.")
   (inputs (list guile-3.0))
   (outputs '("out" "debug"))
   (arguments
-    (append
-     (if (target-hurd?)
-         (list #:configure-flags #~(list "CFLAGS=-D__alloca=alloca"
-                                         "ac_cv_func_posix_spawn=no"))
-         (list))
-     (list
+    `(,@(if (target-hurd?)
+            '(#:configure-flags '("CFLAGS=-D__alloca=alloca"
+                                  "ac_cv_func_posix_spawn=no"))
+            '())
      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-default-shell
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Change the default shell from /bin/sh.
+      (modify-phases %standard-phases
+        (add-before 'build 'set-default-shell
+          (lambda* (#:key inputs #:allow-other-keys)
+            ;; Change the default shell from /bin/sh.
+            (let ((bash (assoc-ref inputs "bash")))
              (substitute* "src/job.c"
                (("default_shell =.*$")
-                 (format #f "default_shell = \"~a\";\n"
-                         (search-input-file inputs "/bin/sh"))))))))))
+                 (format #f "default_shell = \"~a/bin/sh\";\n"
+                         bash)))))))))
   (synopsis "Remake files automatically")
   (description
    "Make is a program that is used to control the production of
@@ -670,17 +669,17 @@ change.  GNU make offers many powerful extensions over the standard utility.")
               (base32
                "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"))))
    (arguments
-     (list
-      #:configure-flags #~(list "CFLAGS=-D__alloca=alloca -D__stat=stat")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-default-shell
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Change the default shell from /bin/sh.
-              (substitute* "job.c"
-                (("default_shell =.*$")
-                 (format #f "default_shell = \"~a\";\n"
-                         (search-input-file inputs "/bin/sh")))))))))))
+     `(#:configure-flags '("CFLAGS=-D__alloca=alloca -D__stat=stat")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'set-default-shell
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Change the default shell from /bin/sh.
+             (let ((bash (assoc-ref inputs "bash")))
+               (substitute* "job.c"
+                 (("default_shell =.*$")
+                  (format #f "default_shell = \"~a/bin/sh\";\n"
+                          bash)))))))))))

 (define-public binutils
  (package
@@ -694,7 +693,6 @@ change.  GNU make offers many powerful extensions over the standard utility.")
      (sha256
       (base32 "0fnwaasfglbphqzvz5n25js9gl695p7pjbmb1z81g8gsc6k90qzn"))
      (patches (search-patches
-                "binutils-reproducible-tar.patch"
                "binutils-2.41-fix-cross.patch"
                "binutils-loongson-workaround.patch"))))
   (build-system gnu-build-system)
@@ -730,8 +728,7 @@ change.  GNU make offers many powerful extensions over the standard utility.")
          ;; For some reason, the build machinery insists on rebuilding .info
          ;; files, even though they're already provided by the tarball.
          #:make-flags #~'("MAKEINFO=true")))
-   (native-inputs (list bison  ;needed to build 'gprofng'
-                        perl)) ;needed to build the man pages (pod2man)
+   (native-inputs (list bison))                   ;needed to build 'gprofng'
   (synopsis "Binary utilities: bfd gas gprof ld")
   (description
    "GNU Binutils is a collection of tools for working with binary files.
@@ -911,7 +908,6 @@ the store.")
  (list "glibc-ldd-powerpc.patch"
        "glibc-2.41-ldd-x86_64.patch"
        "glibc-2.40-dl-cache.patch"
-        "glibc-fix-path-attribute-in-getconf.patch"
        "glibc-2.37-versioned-locpath.patch"
        ;; "glibc-allow-kernel-2.6.32.patch"
        "glibc-guix-locpath.patch"
@@ -961,259 +957,247 @@ the store.")
              "static"))                          ;9 MiB of .a files

   (arguments
-    (list
-     #:out-of-source? #t
+    `(#:out-of-source? #t

-     ;; The libraries have an empty RUNPATH, but some, such as the versioned
-     ;; libraries (libdl-2.24.so, etc.) have ld.so marked as NEEDED.  Since
-     ;; these libraries are always going to be found anyway, just skip
-     ;; RUNPATH checks.
-     #:validate-runpath? #f
+      ;; The libraries have an empty RUNPATH, but some, such as the versioned
+      ;; libraries (libdl-2.24.so, etc.) have ld.so marked as NEEDED.  Since
+      ;; these libraries are always going to be found anyway, just skip
+      ;; RUNPATH checks.
+      #:validate-runpath? #f

-     #:modules `((ice-9 ftw)
-                 (ice-9 match)
+      #:modules ((ice-9 ftw)
                 (srfi srfi-1)
                 (srfi srfi-26)
-                 (guix build gremlin)
                 (guix build utils)
                 (guix build gnu-build-system))

-     ;; Strip binaries but preserve the symbol table needed by Valgrind:
-     ;; <https://lists.gnu.org/archive/html/help-guix/2022-03/msg00036.html>.
-     #:strip-flags #~'("--strip-debug")
+      ;; Strip binaries but preserve the symbol table needed by Valgrind:
+      ;; <https://lists.gnu.org/archive/html/help-guix/2022-03/msg00036.html>.
+      #:strip-flags '("--strip-debug")

-     #:configure-flags
-     #~(list "--sysconfdir=/etc"
+      #:configure-flags
+      (list "--sysconfdir=/etc"

-             ;; Installing a locale archive with all the locales is to
-             ;; expensive (~100 MiB), so we rely on users to install the
-             ;; locales they really want.
-             ;;
-             ;; Set the default locale path.  In practice, $LOCPATH may be
-             ;; defined to point whatever locales users want.  However, setuid
-             ;; binaries don't honor $LOCPATH, so they'll instead look into
-             ;; $libc_cv_complocaledir; we choose /run/current-system/locale/X.Y,
-             ;; with the idea that it is going to be populated by the sysadmin.
-             ;; The "X.Y" sub-directory is because locale data formats are
-             ;; incompatible across libc versions; see
-             ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>.
-             ;;
-             ;; `--localedir' is not honored, so work around it.
-             ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
-             (string-append "libc_cv_complocaledir=/run/current-system/locale/"
-                            #$(version-major+minor version))
+            ;; Installing a locale archive with all the locales is to
+            ;; expensive (~100 MiB), so we rely on users to install the
+            ;; locales they really want.
+            ;;
+            ;; Set the default locale path.  In practice, $LOCPATH may be
+            ;; defined to point whatever locales users want.  However, setuid
+            ;; binaries don't honor $LOCPATH, so they'll instead look into
+            ;; $libc_cv_complocaledir; we choose /run/current-system/locale/X.Y,
+            ;; with the idea that it is going to be populated by the sysadmin.
+            ;; The "X.Y" sub-directory is because locale data formats are
+            ;; incompatible across libc versions; see
+            ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>.
+            ;;
+            ;; `--localedir' is not honored, so work around it.
+            ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
+            (string-append "libc_cv_complocaledir=/run/current-system/locale/"
+                           ,(version-major+minor version))

-             ;; Here we need to refer to kernel headers and not glibc-mesboot
-             (string-append
-              "--with-headers="
-              (and=>
-               (find
-                (match-lambda
-                  ((label . input)
-                   (and (directory-exists?
-                         (string-append input "/include/" #$(if (system-hurd?)
-                                                                "mach"
-                                                                "linux")))
-                        ;; Ensure we're not refering to another libc.
-                        (not (file-exists?
-                              (string-append input "/include/locale.h"))))))
-                #$(if (%current-target-system)
-                      #~%build-target-inputs
-                      #~%build-inputs))
-               cdr) "/include")
+            (string-append "--with-headers="
+                           (assoc-ref ,(if (%current-target-system)
+                                           '%build-target-inputs
+                                           '%build-inputs)
+                                      "kernel-headers")
+                           "/include")

-             ;; This is the default for most architectures as of GNU libc 2.26,
-             ;; but we specify it explicitly for clarity and consistency.  See
-             ;; "kernel-features.h" in the GNU libc for details.
-             "--enable-kernel=3.2.0"
+            ;; This is the default for most architectures as of GNU libc 2.26,
+            ;; but we specify it explicitly for clarity and consistency.  See
+            ;; "kernel-features.h" in the GNU libc for details.
+            "--enable-kernel=3.2.0"

-             ;; Use our Bash instead of /bin/sh.
-             (string-append "BASH_SHELL="
-                            (search-input-file %build-inputs "/bin/bash"))
+            ;; Use our Bash instead of /bin/sh.
+            (string-append "BASH_SHELL="
+                           (assoc-ref %build-inputs "bash")
+                           "/bin/bash")

-             ;; On GNU/Hurd we get discarded-qualifiers warnings for
-             ;; 'device_write_inband' among other things.  Ignore them.
-             #$@(if (target-hurd?)
-                    #~("--disable-werror")
-                    #~()))
+            ;; On GNU/Hurd we get discarded-qualifiers warnings for
+            ;; 'device_write_inband' among other things.  Ignore them.
+            ,@(if (target-hurd?)
+                  `("--disable-werror")
+                  '()))

-     #:tests? #f ; XXX
-     #:phases
-     #~(modify-phases %standard-phases
-         (add-before 'configure 'pre-configure
-           (lambda* (#:key inputs native-inputs #:allow-other-keys)
-             (let* ((bin (string-append #$output "/bin"))
-                    (bash (find
-                           (match-lambda
-                             ((label . input)
-                              (let ((sh (string-append input "/bin/sh")))
-                                (and (file-exists? sh)
-                                     ;; Is it bash-static specifically? The
-                                     ;; label can't be used because of
-                                     ;; bash-mesboot during the bootstrap.
-                                     (not (file-dynamic-info sh))))))
-                           inputs))
-                    (bash (and=> bash cdr)))
-               ;; Install the rpc data base file under `$out/etc/rpc'.
-               (substitute* "inet/Makefile"
-                 (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
-                  (string-append #$output "/etc/rpc" suffix "\n"))
-                 (("^install-others =.*$")
-                  (string-append "install-others = " #$output "/etc/rpc\n")))
+      #:tests? #f                                 ; XXX
+      #:phases (modify-phases %standard-phases
+                 (add-before
+                  'configure 'pre-configure
+                  (lambda* (#:key inputs native-inputs outputs
+                                  #:allow-other-keys)
+                    (let* ((out  (assoc-ref outputs "out"))
+                           (bin  (string-append out "/bin"))
+                           ;; FIXME: Normally we would look it up only in INPUTS
+                           ;; but cross-base uses it as a native input.
+                           (bash (or (assoc-ref inputs "static-bash")
+                                     (assoc-ref native-inputs "static-bash"))))
+                      ;; Install the rpc data base file under `$out/etc/rpc'.
+                      (substitute* "inet/Makefile"
+                        (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
+                         (string-append out "/etc/rpc" suffix "\n"))
+                        (("^install-others =.*$")
+                         (string-append "install-others = " out "/etc/rpc\n")))

-               (substitute* "Makeconfig"
-                 ;; According to
-                 ;; <http://www.linuxfromscratch.org/lfs/view/stable/chapter05/glibc.html>,
-                 ;; linking against libgcc_s is not needed with GCC
-                 ;; 4.7.1.
-                 ((" -lgcc_s") ""))
+                      (substitute* "Makeconfig"
+                        ;; According to
+                        ;; <http://www.linuxfromscratch.org/lfs/view/stable/chapter05/glibc.html>,
+                        ;; linking against libgcc_s is not needed with GCC
+                        ;; 4.7.1.
+                        ((" -lgcc_s") ""))

-               ;; Tell the ld.so cache code where the store is.
-               (substitute* "elf/dl-cache.c"
-                 (("@STORE_DIRECTORY@")
-                  (string-append "\"" (%store-directory) "\"")))
+                      ;; Tell the ld.so cache code where the store is.
+                      (substitute* "elf/dl-cache.c"
+                        (("@STORE_DIRECTORY@")
+                         (string-append "\"" (%store-directory) "\"")))

-               ;; Have `system' use that Bash.
-               (substitute* "sysdeps/posix/system.c"
-                 (("#define[[:blank:]]+SHELL_PATH.*$")
-                  (format #f "#define SHELL_PATH \"~a/bin/bash\"\n" bash)))
+                      ;; Have `system' use that Bash.
+                      (substitute* "sysdeps/posix/system.c"
+                        (("#define[[:blank:]]+SHELL_PATH.*$")
+                         (format #f "#define SHELL_PATH \"~a/bin/bash\"\n"
+                                 bash)))

-               ;; Same for `popen'.
-               (substitute* "libio/iopopen.c"
-                 (("/bin/sh")
-                  (string-append bash "/bin/sh")))
+                      ;; Same for `popen'.
+                      (substitute* "libio/iopopen.c"
+                        (("/bin/sh")
+                         (string-append bash "/bin/sh")))

-               ;; Same for the shell used by the 'exec' functions for
-               ;; scripts that lack a shebang.
-               (substitute* (find-files "." "^paths\\.h$")
-                 (("#define[[:blank:]]+_PATH_BSHELL[[:blank:]].*$")
-                  (string-append "#define _PATH_BSHELL \""
-                                 bash "/bin/sh\"\n")))
+                      ;; Same for the shell used by the 'exec' functions for
+                      ;; scripts that lack a shebang.
+                      (substitute* (find-files "." "^paths\\.h$")
+                        (("#define[[:blank:]]+_PATH_BSHELL[[:blank:]].*$")
+                         (string-append "#define _PATH_BSHELL \""
+                                        bash "/bin/sh\"\n")))

-               ;; Make sure we don't retain a reference to the
-               ;; bootstrap Perl.
-               (substitute* "malloc/mtrace.pl"
-                 (("^#!.*")
-                  ;; The shebang can be omitted, because there's the
-                  ;; "bilingual" eval/exec magic at the top of the file.
-                  "")
-                 (("exec @PERL@")
-                  "exec perl")))))
+                      ;; Make sure we don't retain a reference to the
+                      ;; bootstrap Perl.
+                      (substitute* "malloc/mtrace.pl"
+                        (("^#!.*")
+                         ;; The shebang can be omitted, because there's the
+                         ;; "bilingual" eval/exec magic at the top of the file.
+                         "")
+                        (("exec @PERL@")
+                         "exec perl")))))

-         (add-after 'install 'move-static-libs
-           (lambda _
-             ;; Move static libraries to the "static" output.
-             ;; Note: As of GNU libc 2.34, the contents of some ".a"
-             ;; files have been moved into "libc.so", and *both* empty
-             ;; ".so" and ".a" files have been introduced to avoid
-             ;; breaking existing executables and existing builds
-             ;; respectively.  The intent of the seemingly redundant
-             ;; empty ".a" files is to avoid newly-compiled executables
-             ;; from having dependencies on the empty shared libraries,
-             ;; and as such, it is useful to have these ".a" files in
-             ;; OUT in addition to STATIC.
+                 (add-after 'install 'move-static-libs
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     ;; Move static libraries to the "static" output.
+                     ;; Note: As of GNU libc 2.34, the contents of some ".a"
+                     ;; files have been moved into "libc.so", and *both* empty
+                     ;; ".so" and ".a" files have been introduced to avoid
+                     ;; breaking existing executables and existing builds
+                     ;; respectively.  The intent of the seemingly redundant
+                     ;; empty ".a" files is to avoid newly-compiled executables
+                     ;; from having dependencies on the empty shared libraries,
+                     ;; and as such, it is useful to have these ".a" files in
+                     ;; OUT in addition to STATIC.

-             (define (empty-static-library? file)
-               ;; Return true if FILE is an 'ar' archive with nothing
-               ;; beyond the header.
-               (let ((file (string-append #$output "/lib/" file)))
-                 (and (ar-file? file)
-                      (= (stat:size (stat file)) 8))))
+                     (define (empty-static-library? file)
+                       ;; Return true if FILE is an 'ar' archive with nothing
+                       ;; beyond the header.
+                       (let ((file (string-append (assoc-ref outputs "out")
+                                                  "/lib/" file)))
+                         (and (ar-file? file)
+                              (= (stat:size (stat file)) 8))))

-             (define (static-library? file)
-               ;; Return true if FILE is a static library.  The
-               ;; "_nonshared.a" files are referred to by libc.so,
-               ;; libpthread.so, etc., which are in fact linker
-               ;; scripts.
-               (and (string-suffix? ".a" file)
-                    (not (string-contains file "_nonshared"))
-                    (not (empty-static-library? file))))
+                     (define (static-library? file)
+                       ;; Return true if FILE is a static library.  The
+                       ;; "_nonshared.a" files are referred to by libc.so,
+                       ;; libpthread.so, etc., which are in fact linker
+                       ;; scripts.
+                       (and (string-suffix? ".a" file)
+                            (not (string-contains file "_nonshared"))
+                            (not (empty-static-library? file))))

-             (define (linker-script? file)
-               ;; Guess whether FILE, a ".a" file, is actually a
-               ;; linker script.
-               (and (not (ar-file? file))
-                    (not (elf-file? file))))
+                     (define (linker-script? file)
+                       ;; Guess whether FILE, a ".a" file, is actually a
+                       ;; linker script.
+                       (and (not (ar-file? file))
+                            (not (elf-file? file))))

-             (let* ((lib (string-append #$output "/lib"))
-                    (files (scandir lib static-library?))
-                    (empty (scandir lib empty-static-library?))
-                    (slib (string-append #$output:static "/lib")))
-               (mkdir-p slib)
-               (for-each (lambda (base)
-                           (rename-file (string-append lib "/" base)
-                                        (string-append slib "/" base)))
-                         files)
-               (for-each (lambda (base)
-                           (copy-file (string-append lib "/" base)
-                                      (string-append slib "/" base)))
-                         empty)
+                     (let* ((out    (assoc-ref outputs "out"))
+                            (lib    (string-append out "/lib"))
+                            (files  (scandir lib static-library?))
+                            (empty  (scandir lib empty-static-library?))
+                            (static (assoc-ref outputs "static"))
+                            (slib   (string-append static "/lib")))
+                       (mkdir-p slib)
+                       (for-each (lambda (base)
+                                   (rename-file (string-append lib "/" base)
+                                                (string-append slib "/" base)))
+                                 files)
+                       (for-each (lambda (base)
+                                   (copy-file (string-append lib "/" base)
+                                              (string-append slib "/" base)))
+                                 empty)

-               ;; Usually libm.a is a linker script so we need to
-               ;; change the file names in there to refer to STATIC
-               ;; instead of OUT.
-               (for-each (lambda (ld-script)
-                           (substitute* ld-script
-                             ((#$output)
-                              #$output:static)))
-                         (filter linker-script?
-                                 (map (cut string-append slib "/" <>)
-                                      files))))))
+                       ;; Usually libm.a is a linker script so we need to
+                       ;; change the file names in there to refer to STATIC
+                       ;; instead of OUT.
+                       (for-each (lambda (ld-script)
+                                   (substitute* ld-script
+                                     ((out) static)))
+                                 (filter linker-script?
+                                         (map (cut string-append slib "/" <>)
+                                              files))))))

-         (add-after 'install 'install-utf8-c-locale
-           (lambda _
-             ;; Install the C.UTF-8 locale so there's always a UTF-8
-             ;; locale around.
-             (let ((bin (string-append #$output "/bin"))
-                   (locale (string-append #$output "/lib/locale/"
-                                          #$(package-version
-                                             this-package))))
-               (mkdir-p locale)
+                 (add-after 'install 'install-utf8-c-locale
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     ;; Install the C.UTF-8 locale so there's always a UTF-8
+                     ;; locale around.
+                     (let* ((out (assoc-ref outputs "out"))
+                            (bin (string-append out "/bin"))
+                            (locale (string-append out "/lib/locale/"
+                                                   ,(package-version
+                                                     this-package))))
+                       (mkdir-p locale)

-               ;; FIXME: When cross-compiling, attempt to use
-               ;; 'localedef' from the same libc version.
-               (invoke #$(if (%current-target-system)
-                             "true"
-                             #~(string-append bin "/localedef"))
-                       "--no-archive" "--prefix" locale
-                       "-i" "C" "-f" "UTF-8"
-                       (string-append locale "/C.UTF-8")))))
+                       ;; FIXME: When cross-compiling, attempt to use
+                       ;; 'localedef' from the same libc version.
+                       (invoke ,(if (%current-target-system)
+                                    "true"
+                                    '(string-append bin "/localedef"))
+                               "--no-archive" "--prefix" locale
+                               "-i" "C" "-f" "UTF-8"
+                               (string-append locale "/C.UTF-8")))))

-         #$@(if (target-hurd?)
-                #~((add-after 'install 'augment-libc.so
-                     (lambda _
-                       (substitute* (string-append #$output "/lib/libc.so")
-                         (("/[^ ]+/lib/libc.so.0.3")
-                          (string-append #$output "/lib/libc.so.0.3"
-                                         " libmachuser.so libhurduser.so")))))
-                   (add-after 'install 'create-machine-symlink
-                     (lambda _
-                       (let* ((cpu #$(match (or (%current-target-system)
-                                                (%current-system))
-                                       ((? target-x86-32?)
-                                        "i386")
-                                       ((? target-x86-64?)
-                                        "x86_64")))
-                              (machine (string-append #$output
-                                                      "/include/mach/machine")))
-                         (unless (file-exists? machine)
-                           (symlink cpu machine))))))
-                #~()))))
+                 ,@(if (target-hurd?)
+                       `((add-after 'install 'augment-libc.so
+                           (lambda* (#:key outputs #:allow-other-keys)
+                             (let ((out (assoc-ref outputs "out")))
+                               (substitute* (string-append out "/lib/libc.so")
+                                 (("/[^ ]+/lib/libc.so.0.3")
+                                  (string-append out "/lib/libc.so.0.3"
+                                                 " libmachuser.so libhurduser.so"))))))
+                         (add-after 'install 'create-machine-symlink
+                           (lambda* (#:key outputs #:allow-other-keys)
+                             (let* ((out (assoc-ref outputs "out"))
+                                    (cpu ,(match (or (%current-target-system)
+                                                     (%current-system))
+                                            ((? target-x86-32?)
+                                             "i386")
+                                            ((? target-x86-64?)
+                                             "x86_64")))
+                                    (machine (string-append
+                                              out "/include/mach/machine")))
+                               (unless (file-exists? machine)
+                                 (symlink cpu machine))))))
+                       '()))))

-   (inputs (list static-bash))
+   (inputs `(("static-bash" ,static-bash)))

   ;; To build the manual, we need Texinfo and Perl.  Gettext is needed to
   ;; install the message catalogs, with 'msgfmt'.
-   (native-inputs
-    (append
-     (list bison
-           gettext-minimal
-           perl
-           python-minimal
-           texinfo)
-     (if (target-hurd?)
-         (list mig)
-         (list))))
+   (native-inputs `(("texinfo" ,texinfo)
+                    ("perl" ,perl)
+                    ("bison" ,bison)
+                    ("gettext" ,gettext-minimal)
+                    ("python" ,python-minimal)
+
+                    ,@(if (target-hurd?)
+                          `(("mig" ,mig)
+                            ("perl" ,perl))
+                          '())))
+
   (native-search-paths
    ;; Search path for packages that provide locale data.  This is useful
    ;; primarily in build environments.  Use 'GUIX_LOCPATH' rather than
@@ -1316,8 +1300,8 @@ with the Linux kernel.")
        ;; The C.UTF-8 fails to build in glibc 2.35:
        ;; <https://sourceware.org/bugzilla/show_bug.cgi?id=28861>.
        ;; It is missing altogether in versions earlier than 2.35.
-        #~(modify-phases #$phases
-            (delete 'install-utf8-c-locale)))))))
+        `(modify-phases ,phases
+           (delete 'install-utf8-c-locale)))))))

 (define-public glibc-2.33
  (package
@@ -1358,9 +1342,9 @@ with the Linux kernel.")
                 "libc_cv_cxx_link_ok=no"
                 #$flags))
       ((#:phases phases)
-        #~(modify-phases #$phases
-            ;; This phase fails trying to create /etc/ld.so.cache
-            (delete 'install-utf8-c-locale)))))))
+        `(modify-phases ,phases
+           ;; This phase fails trying to create /etc/ld.so.cache
+           (delete 'install-utf8-c-locale)))))))

 (define-public (make-gcc-libc base-gcc libc)
  "Return a GCC that targets LIBC."
@@ -66,7 +66,7 @@

 (define (patch-url seqno)
  "Return the URL of Bash patch number SEQNO."
-  (format #f "mirror://gnu/bash/bash-5.3-patches/bash53-~3,'0d" seqno))
+  (format #f "mirror://gnu/bash/bash-5.2-patches/bash52-~3,'0d" seqno))

 (define (bash-patch seqno sha256-bv)
  "Return the origin of Bash patch SEQNO, with expected hash SHA256-BV."
@@ -79,13 +79,47 @@
  (list (bash-patch seqno (base32 hash))
        ...))

-(define %patch-series-5.3
-  ;; This is the current patches series for 5.3, generated using
+(define %patch-series-5.2
+  ;; This is the current patches series for 5.2, generated using
  ;; 'download-patches' below.
  (patch-series
-   (1 "0zr8wgg1gb67vxn7ws971n1znrdinczymc688ndnpy2a6qs88q0z")
-   (2 "009051z55plsy4jmmjdb3ys7li2jraynz99qg7n6a1qk025591g3")
-   (3 "1vb0gnrkmz49rcfpxjcxy0v0k5278wrlkljk9gc20nizvk3xjigj")))
+   (1 "02iibpd3jq8p1bhdzgik8ps6gi1145vr463a82gj1hivjbp2ybzl")
+   (2 "1f6p1z85qh1lavdp3xikgp0bfv0vqhvgpgwmdzlywl35hwdmxk25")
+   (3 "1zxsi869jd90hksx3nyypgyqwrxhw2ws3r6hmk76yc1lsgdhq2ba")
+   (4 "04i5liw5cg6dqkdxfgazqc2jrw40bmclx3dx45bwy259pcj7g0iq")
+   (5 "0mykflv9qnbx3jz71l4f7isadiw9knm4qimqkwsv9cv88dafpq7c")
+   (6 "13265akl8w6zyrg0l7f0x6arjgqjhllcwl6lk46rl53x4mm5dq6i")
+   (7 "146lrwkn5wgxzs6vx34wl47g69zsxdy032k40qzi626b47ya6015")
+   (8 "1s5i8hcayrv25lc8fxcr431v634yx5sii53b8fmip789s0pxjjvb")
+   (9 "1kfk25151ka9wkmk1myf12irgcmvhsd8b0nfifvhrszah9w82npr")
+   (10 "1kf1jrwm30js0v3d1r2rk4x09s1pyjp70wnd1qqhf9bmkw15ww67")
+   (11 "1x5nkvbj6hci7gx42q7qa72hg2a9wwxh85dk79gn521ypwjmy6w3")
+   (12 "0b6lcwzm7v5bzjiwaz2c8n5aj77w8ckhp2vwk4v3zsdq3z70gc9g")
+   (13 "1rkwpibd6j2ghppfhqsva2jm4kdni6b7jpdsxdps52643gc4yjq9")
+   (14 "09766vqqw4ffnmysm725v35qkhp1g9j4qgqag941xvq655pj9y9y")
+   (15 "12im449abnq5gaqjmdxr5i38kmp02fa8l8wffad3jryvd58r0wzg")
+   (16 "05arb0hzmng03cr357lf6p8af0x2a1pznsd3psll03nibfy56n0m")
+   (17 "129cvx4gfz8n23iw1lhbknbw86fyw6vh60jqj1wj3d5pr75wwj0w")
+   (18 "105am94qxjc27gga4a8asvsi01090xwjfim3s16lafwjvm4xsha6")
+   (19 "10njgv5mrc5rhsp5lvxcbm0pnzn59a8spi2nhdasifyl1a32cp1j")
+   (20 "07f0wlmqjdfarp44w3gj9gdqbqm5x20rvlhpn34ngklmxcm2bz5n")
+   (21 "1kahfqqalcwi4m73pg3ssz6lh0kcqsqax09myac7a15d2y0vhd43")
+   (22 "0w74aym0g1fh48864a3qxh89f26iaq7wsbg7244c6kjr94527dbq")
+   (23 "1lywjqbc36j5pdzfcvnz1zy30j76aqmsm190p888av0hw815b45g")
+   (24 "1hq23djqbr7s9y2324jq9mxr5bwdkmgizn3zgpchbsqp054k85cp")
+   (25 "0x9hc4silzl4d3zw4p43i5dm7w86k50j47f87lracwfgwy3z8f2i")
+   (26 "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln")
+   (27 "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1")
+   (28 "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0")
+   (29 "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j")
+   (30 "13v9fqgim082dmvkslsr0hs793yzhsij2s91mjswsfhj1qip7zy3")
+   (31 "15d7rddj6spwc1fy997lxx6zvzq0zbxgf2h20mhi4wgp5nzbglf2")
+   (32 "05ia6yf32hjprmyyxqawhgckxs3684ikfx8xg08zfgx9xkd7g73v")
+   (33 "1qm2aad9mf2xah6xwchga7s5pk3v308mrv9lgh50d65d236ccgh1")
+   (34 "0bi38dhkkwpm2qrzp8zpykglq6gibvv2n9f8m59gwj406cxvp7w9")
+   (35 "1r8k34y82v02yfkgws17j7i53ybb74dqnwl2jjiv0av9z93hl6l2")
+   (36 "0mwhr9hfbh2czf8klbxg6nbd2g9xl9kygvgk061vird56r4kzj8m")
+   (37 "156sbi3srzkyxajkmhb7iigq0j4nvwnpsbw88xdsxn95a4xiqb4a")))

 (define (download-patches store count)
  "Download COUNT Bash patches into store.  Return a list of
@@ -123,7 +157,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
               " -Wl,-rpath -Wl,"
               (assoc-ref %build-inputs "ncurses")
               "/lib")))
-         (version "5.3"))
+         (version "5.2"))
    (package
     (name "bash")
     (source (origin
@@ -132,11 +166,11 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
                    "mirror://gnu/bash/bash-" version ".tar.gz"))
              (sha256
               (base32
-                "1fii1xaxbng9x0klxmxkm0xhmycngfz72jsgyrna4sgqcmlxhp0d"))
+                "1yrjmf0mqg2q8pqphjlark0mcmgf88b0acq7bqf4gx3zvxkc2fd1"))
              (patch-flags '("-p0"))
              (patches (cons (search-patch "bash-linux-pgrp-pipe.patch")
-                             %patch-series-5.3))))
-     (version (string-append version "." (number->string (length %patch-series-5.3))))
+                             %patch-series-5.2))))
+     (version (string-append version "." (number->string (length %patch-series-5.2))))
     (build-system gnu-build-system)

      (outputs '("out"
@@ -6,7 +6,6 @@
 ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2026 Zheng Junjie <z572@z572.online>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,7 +23,6 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages bdw-gc)
-  #:use-module (guix deprecation)
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -57,8 +55,6 @@
     #~(list
        ;; Install gc_cpp.h et al.
        "--enable-cplusplus"
-        ;; Used by 'guile-static'.
-        "--enable-static"

        ;; In GNU/Hurd systems during the 'check' phase,
        ;; there is a deadlock caused by the 'gctest' test.
@@ -72,17 +68,7 @@
               #~())
        #$@(if (target-mingw?)
               #~("--enable-threads=pthreads")
-               #~()))
-     #:phases
-     #~(modify-phases %standard-phases
-         (add-after 'install 'move-static-library
-           (lambda _
-             (for-each
-              (lambda (a)
-                (install-file a (string-append #$output:static
-                                               "/lib"))
-                (delete-file a))
-              (find-files (string-append #$output "/lib") "\\.a"))))))
+               #~())))
     (cond
       ((target-ppc64le?)
        (list #:make-flags
@@ -101,7 +87,7 @@
        ;; cross-compiling, and demands using libatomic-ops instead.
        (list libatomic-ops)
        '()))
-   (outputs '("out" "debug" "static"))
+   (outputs '("out" "debug"))
   (properties
    '((release-monitoring-url . "https://www.hboehm.info/gc/gc_source/")
      (upstream-name . "gc")))
@@ -126,8 +112,16 @@ C or C++ programs, though that is not its primary goal.")

   (license (x11-style (string-append home-page "license.txt")))))

-;; XXX: Deprecated on <2026-04-25>.
-(define-deprecated/public-alias libgc/static-libs libgc)
+;; TODO: Add a static output in libgc in the next rebuild cycle.
+(define-public libgc/static-libs
+  (package/inherit
+   libgc
+   (arguments
+    (substitute-keyword-arguments arguments
+      ((#:configure-flags flags #~'())
+       #~(cons "--enable-static" #$flags))))
+
+   (properties '((hidden? . #t)))))

 (define-public libgc-7
  (package
@@ -944,7 +944,20 @@ configurable through a set of options.")
      #~(list (string-append
               "CC=" #$(this-package-input "openmpi") "/bin/mpicc")
              (string-append
-               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))))
+               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; OSU installs its binaries to /libexec. Have a symlink in /bin to
+          ;; improve user experience.
+          (add-after 'install 'symlink-binaries-in-bin
+            (lambda _
+              (mkdir-p (string-append #$output "/bin"))
+              (for-each (lambda (file)
+                          (symlink file
+                                   (string-append #$output "/bin/"
+                                                  (basename file))))
+                        (find-files (string-append #$output
+                                                   "/libexec"))))))))
    (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
    (synopsis "Benchmarking suite from the MVAPICH project")
    (description
@@ -3436,14 +3436,14 @@ the @code{HorvathMethylChip40} (Mammal40) array.")
 (define-public r-systempiperdata
  (package
    (name "r-systempiperdata")
-    (version "2.14.5")
+    (version "2.14.6")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "systemPipeRdata" version
                              'experiment))
       (sha256
-        (base32 "1yrq1vyc0pmp3iv621cvdsavlarcca3z4bbxfzbg0ny3fyqp67pb"))))
+        (base32 "1j7h40hcm0gyahmlilvlb83ddmwrarqn319qwpnrgwcji8fm92jd"))))
    (properties `((upstream-name . "systemPipeRdata")))
    (build-system r-build-system)
    (propagated-inputs (list r-biocgenerics r-biostrings r-jsonlite r-remotes))
@@ -4552,15 +4552,9 @@ these biases and construct statistically consistent estimators.")
    (build-system r-build-system)
    (arguments
     (list
-      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'skip-bad-tests
-           (lambda _
-             ;; This test needs Internet access.
-             (with-directory-excursion "tests/testthat"
-               (substitute* "test-examples.R"
-                 ((".*find_taxonomy\\(\\) is working.*" m)
-                  (string-append m "skip('guix')\n")))))))))
+      #:skipped-tests
+      ;; This test needs Internet access.
+      '(("test-examples.R" ".*find_taxonomy\\(\\) is working.*"))))
    (propagated-inputs
     (list r-ape
           r-assertthat
@@ -4611,13 +4605,13 @@ to understand their data better and discover new insights.")
 (define-public r-anndatar
  (package
    (name "r-anndatar")
-    (version "1.0.1")
+    (version "1.0.2")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "anndataR" version))
       (sha256
-        (base32 "1vi9aqgdjy0nlbsk7628sz12jsxd9bfb79yxhh0ngijpxj9sxd4p"))))
+        (base32 "1gn1yyfs08a77zrl4cidahxim3kgcvpbsrgfxxnhhrka57xcylld"))))
    (properties `((upstream-name . "anndataR")))
    (build-system r-build-system)
    (arguments
@@ -4670,14 +4664,13 @@ directly access various slots (e.g. X, obs, var), or convert the data into
    (build-system r-build-system)
    (arguments
     (list
+      #:test-directory "inst/unitTests"
+      ;; These tests require internet access.
+      #:skipped-tests
+      '("test_recipe.R"
+        "test_webAccessFunctions.R")
      #:phases
      '(modify-phases %standard-phases
-         (add-after 'unpack 'delete-bad-tests
-           (lambda _
-             ;; These tests require internet access.
-             (for-each delete-file
-                       '("inst/unitTests/test_recipe.R"
-                         "inst/unitTests/test_webAccessFunctions.R"))))
         (add-before 'install 'set-home
           (lambda _ (setenv "HOME" "/tmp"))))))
    (propagated-inputs
@@ -5244,13 +5237,13 @@ structures: @code{ExpressionSet}, @code{AffyBatch}, @code{NChannelSet}.")
 (define-public r-arrayqualitymetrics
  (package
    (name "r-arrayqualitymetrics")
-    (version "3.64.0")
+    (version "3.66.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "arrayQualityMetrics" version))
              (sha256
               (base32
-                "1kz2d40wx2ksy9dz1z3wylcj7y7ad9z8xphsnz39j02m4g5mbvlp"))))
+                "0y9k81vwqq74zfdrc2hvx7mg0l7572hvrsby00m20z034j7f9pmi"))))
    (properties
     '((upstream-name . "arrayQualityMetrics")
       ;; We don't need these.
@@ -5272,7 +5265,7 @@ structures: @code{ExpressionSet}, @code{AffyBatch}, @code{NChannelSet}.")
                             r-svglite
                             r-vsn
                             r-xml))
-    (native-inputs (list r-knitr))
+    (native-inputs (list r-biocstyle r-knitr))
    (home-page "https://bioconductor.org/packages/arrayQualityMetrics")
    (synopsis "Quality metrics report for microarray data sets")
    (description
@@ -6110,10 +6103,8 @@ retrieval analyses, or similar technologies.")
    (build-system r-build-system)
    (arguments
     (list
-      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'disable-bad-tests
-           (lambda _ (delete-file "tests/testthat/test-download.R"))))))
+      ;; This requires internet access.
+      #:skipped-tests '("test-download.R")))
    (propagated-inputs (list cmake r-dir-expiry))
    (native-inputs (list r-knitr r-testthat))
    (home-page "https://github.com/LTLA/biocmake")
@@ -6421,17 +6412,6 @@ objects.")
        (base32 "189akh4lpbp0dzgflb3nb3vi94bhmsj7qkcl597dnnzxqz00hsb2"))))
    (properties `((upstream-name . "CoreGx")))
    (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'disable-bad-tests
-           (lambda _
-             ;; It is unclear why 3 tests fail.
-             (with-directory-excursion "tests/testthat"
-               (substitute* "test-LongTable-utils.R"
-                 ((".*doesn't miss assay observations.*" m)
-                  (string-append m "skip('guix')\n")))))))))
    (propagated-inputs
     (list r-bench
           r-biobase
@@ -7900,13 +7880,13 @@ Kallisto, Salmon, StringTie, Cufflinks/Cuffdiff etc.")
 (define-public r-isva
  (package
    (name "r-isva")
-    (version "1.9")
+    (version "1.10")
    (source (origin
              (method url-fetch)
              (uri (cran-uri "isva" version))
              (sha256
               (base32
-                "05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"))))
+                "1im1bwbf6l88m4bwwwr0z2x8bvw927s3fqbwc06s5240wc8syjpl"))))
    (properties `((upstream-name . "isva")))
    (build-system r-build-system)
    (propagated-inputs (list r-fastica r-jade r-qvalue))
@@ -8673,13 +8653,13 @@ on Bioconductor or which replace R functions.")
 (define-public r-biomart
  (package
    (name "r-biomart")
-    (version "2.66.1")
+    (version "2.66.2")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "biomaRt" version))
              (sha256
               (base32
-                "1cmzay4z9s183dc001rxfa81ql67la9y8m0p0wsn2iwzxzx94n8g"))))
+                "1awsfklcs35vrmjkc12bk5ys9w7ib0799i3d0k138y44a0837pph"))))
    (properties
     `((upstream-name . "biomaRt")))
    (build-system r-build-system)
@@ -10337,13 +10317,13 @@ Enrichment Analysis} (GSEA).")
 (define-public r-gsva
  (package
    (name "r-gsva")
-    (version "2.4.6")
+    (version "2.4.8")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "GSVA" version))
              (sha256
               (base32
-                "08i2s5zlm75mr7zl357cic2zxcy7aqqfv67xb0w67n48cw016ri6"))))
+                "0p9awi85dbmmyplhdfz0in4nhaavb58gpf48kqyp30rcc3v5a8h0"))))
    (properties `((upstream-name . "GSVA")))
    (build-system r-build-system)
    (propagated-inputs (list r-biobase
@@ -10738,6 +10718,54 @@ nucleotide sequence analysis.  The package is primarily useful to developers
 of other R packages who wish to make use of HTSlib.")
    (license license:lgpl2.0+)))

+(define-public r-rliger
+  (package
+    (name "r-rliger")
+    (version "2.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/welch-lab/liger")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1w849km9b347m56qwr5lr6ymdk7wv22hr224riscm0zrnx402yb3"))))
+    (properties `((upstream-name . "rliger")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-cli
+                             r-delayedarray
+                             r-dplyr
+                             r-ggplot2
+                             r-hdf5array
+                             r-hdf5r
+                             r-leidenalg
+                             r-lifecycle
+                             r-magrittr
+                             r-matrix
+                             r-patchwork
+                             r-rann
+                             r-rcpp
+                             r-rcpparmadillo
+                             r-rcppplanc
+                             r-rcppprogress
+                             r-rlang
+                             r-s4vectors
+                             r-scales
+                             r-uwot))
+    (native-inputs
+     (list r-circlize r-complexheatmap r-knitr r-testthat r-viridis))
+    (home-page "https://github.com/welch-lab/liger")
+    (synopsis "Linked inference of genomic experimental relationships")
+    (description
+     "LIGER is a package for integrating and analyzing multiple single-cell
+datasets. It relies on integrative non-negative matrix factorization to
+identify shared and dataset-specific factors.")
+    (license license:gpl3)))
+
+(define-deprecated-package r-liger
+  r-rliger)
+
 (define-public r-rnbeads
  (package
    (name "r-rnbeads")
@@ -11117,13 +11145,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.")
 (define-public r-maaslin2
  (package
    (name "r-maaslin2")
-    (version "1.22.0")
+    (version "1.24.1")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "Maaslin2" version))
       (sha256
-        (base32 "10hdjhi1ykk513hzvs0bi6avzghqmkqns8knhz3ycv7bj3ynp70x"))))
+        (base32 "0z8vfx6db6xfvqdhg6n8jx3fmgwvq22facsacq6ym867kw2jafiz"))))
    (properties `((upstream-name . "Maaslin2")))
    (build-system r-build-system)
    (propagated-inputs
@@ -11311,17 +11339,6 @@ high distances can be flagged as potentially low-quality.")
       ;; Avoid dependency cycle.
       (updater-ignored-native-inputs . ("r-spectra"))))
    (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      '(modify-phases %standard-phases
-         ;; This test uses a deprecated procedure that has since been removed
-         ;; from testthat.
-         (add-after 'unpack 'testthat-compatibility
-           (lambda _
-             (substitute* "tests/testthat/test_zzz.R"
-               ((".*.onLoad works.*" m)
-                (string-append m "skip('guix')\n"))))))))
    (propagated-inputs (list r-biocparallel r-mscoreutils))
    (native-inputs (list r-callr r-knitr r-microbenchmark r-robustbase
                         r-testthat))
@@ -11528,13 +11545,13 @@ time-series data (including a graphical user interface).")
 (define-public r-mmuphin
  (package
    (name "r-mmuphin")
-    (version "1.22.0")
+    (version "1.24.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "MMUPHin" version))
       (sha256
-        (base32 "0d8i9b6pjwz409jd46fm1n9h21hzg8zgzpvchywpyc1k896fvz4l"))
+        (base32 "1zdk9ffa996w4acnhbs7grbji5s3plwhcl6m21yajrlck2i9y3cw"))
       ;; Delete generated files.
       (snippet
        '(for-each delete-file
@@ -14298,13 +14315,13 @@ level.")
 (define-public r-tcgautils
  (package
    (name "r-tcgautils")
-    (version "1.30.2")
+    (version "1.30.3")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "TCGAutils" version))
              (sha256
               (base32
-                "1zwzx7mfp4s0v1rdjsyxj4l9w360g4qm3am8yf5lsd0biciqqh93"))))
+                "1nppp70675y3ds76jf61rhfis2lgkxqjhz48b367qa55g3q2ah61"))))
    (properties `((upstream-name . "TCGAutils")))
    (build-system r-build-system)
    (arguments
@@ -15024,14 +15041,14 @@ unmodeled, or latent sources of noise.")
 (define-public r-systempiper
  (package
    (name "r-systempiper")
-    (version "2.16.3")
+    (version "2.16.4")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "systemPipeR" version))
       (sha256
        (base32
-         "0maixi0hwqzkpiq60hf60x4q3gv3hkvmrqh3ygv0fk63g1k9f6cj"))))
+         "1zrk6ky58f30wvaxph5dc2wr418qfpwc7d8pkxpl5dhb5g7vgn8r"))))
    (properties `((upstream-name . "systemPipeR")))
    (build-system r-build-system)
    ;; Tests fail because genWorkenvir fails to set up the environment.
@@ -15398,13 +15415,13 @@ molecular functions, respectively, and produces intuitive graphical outputs.")
 (define-public r-xllim
  (package
    (name "r-xllim")
-    (version "2.3")
+    (version "2.3.1")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "xLLiM" version))
       (sha256
-        (base32 "08v6acn6vpn8asn61ldqdryjz0xk5zyd2v63aqrc5xximpqwrp7d"))))
+        (base32 "1h2z6a3j3yi7rj5lyk7gb1iyp2vf516fgmk7wr333gfkvk522n2r"))))
    (properties `((upstream-name . "xLLiM")))
    (build-system r-build-system)
    (propagated-inputs (list r-abind
@@ -16304,14 +16321,14 @@ signals directly in the Bruker format.")
 (define-public r-codedepends
  (package
    (name "r-codedepends")
-    (version "0.6.6")
+    (version "0.6.7")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "CodeDepends" version))
       (sha256
        (base32
-         "0msq5ksjqp2pjzl6f1vizw53gdf5lz520bpdr5dbjwz5mc1mp0bz"))))
+         "02sj40qxq5vywgqay9q9vpv3s6j3jjr46kc8q3v1yw2vbsmlvrz0"))))
    (properties `((upstream-name . "CodeDepends")))
    (build-system r-build-system)
    (propagated-inputs
@@ -17382,14 +17399,14 @@ data.")
 (define-public r-ggtree
  (package
    (name "r-ggtree")
-    (version "4.0.4")
+    (version "4.0.5")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "ggtree" version))
       (sha256
        (base32
-         "1qi5nispv0cirfayijybnn1nr8l6sb2adnic3y37qm3yv91w6s6z"))))
+         "0w9hqc3m35mrdqy5iwcm201pzpbl8jw6rd3wyzwp6f53wbbm2lbh"))))
    (properties `((upstream-name . "ggtree")))
    (build-system r-build-system)
    (propagated-inputs
@@ -18703,13 +18720,13 @@ standardization of the analyses and the development of best practices.")
 (define-public r-microbiomestat
  (package
    (name "r-microbiomestat")
-    (version "1.3")
+    (version "1.4")
    (source (origin
              (method url-fetch)
              (uri (cran-uri "MicrobiomeStat" version))
              (sha256
               (base32
-                "02xg8l4d0z5wrdrm5dj5a0q51vsbhf3f6z2lk8294c4d85s09dhl"))))
+                "0in28lzds3sv1xa25vs8q5mmm1ax78s2axhq7mi23njqip5xmsr1"))))
    (properties
     '((upstream-name . "MicrobiomeStat")
       (updater-extra-inputs . ("nlopt"))
@@ -18717,23 +18734,21 @@ standardization of the analyses and the development of best practices.")
    (build-system r-build-system)
    (inputs (list nlopt))
    (native-inputs (list pkg-config))
-    (propagated-inputs (list r-bbmisc
+    (propagated-inputs (list r-bbotk
                             r-dplyr
                             r-foreach
                             r-ggplot2
                             r-ggrepel
-                             r-lhs
                             r-lmertest
                             r-mass
                             r-matrix
                             r-matrixstats
-                             r-mlr
-                             r-mlrmbo
+                             r-mlr3
+                             r-mlr3mbo
                             r-modeest
-                             r-paramhelpers
+                             r-paradox
                             r-rcpp
                             r-rcpparmadillo
-                             r-smoof
                             r-statmod))
    (home-page "https://cran.r-project.org/package=MicrobiomeStat")
    (synopsis "Statistical methods for microbiome compositional data")
@@ -19637,14 +19652,14 @@ correspondence between different data sources.")
 (define-public r-enrichplot
  (package
    (name "r-enrichplot")
-    (version "1.30.4")
+    (version "1.30.5")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "enrichplot" version))
       (sha256
        (base32
-         "080q91ll8rvqf93hcmxc7kjbmmihyh0vrpxck2pqrwglbqxm4xll"))))
+         "12c6xwp29mmalvxp3asliv2hlha5vv8l37prmmcgpdi4nghfic3b"))))
    (build-system r-build-system)
    (propagated-inputs
     (list r-aplot
@@ -22889,14 +22904,14 @@ expression space.")
 (define-public r-cicero
  (package
    (name "r-cicero")
-    (version "1.28.0")
+    (version "1.28.3")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "cicero" version))
       (sha256
        (base32
-         "1ibxynw77a8mqv9av7z828wcazjpm4sfp83hd412f2rmgkls895x"))))
+         "016wpficnbricf4f7sgq8j53cl178f1332fh9zvlx7q560489zf1"))))
    (build-system r-build-system)
    (propagated-inputs
     (list r-assertthat
@@ -23528,14 +23543,14 @@ populations, splice site strength, conservation, etc.")
 (define-public r-variancepartition
  (package
    (name "r-variancepartition")
-    (version "1.40.1")
+    (version "1.40.2")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "variancePartition" version))
       (sha256
        (base32
-         "1xqy4jl8im7i4kd4iwn8hvhy172fzsadyn90kprihmvccmpd5cr3"))))
+         "0k2rcgg4ll06b9j7999d4l60wpmi3vnjaqiy5ay8ppd1z0m38ygf"))))
    (properties
     '((upstream-name . "variancePartition")
       (updater-extra-native-inputs . ("r-rfast"))))
@@ -23876,30 +23891,26 @@ rate} (FDR).")
 (define-public r-activedriverwgs
  (package
    (name "r-activedriverwgs")
-    (version "1.2.0")
+    (version "1.2.1")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "ActiveDriverWGS" version))
       (sha256
        (base32
-         "0xnplgwxd197a4d422bsxg753q158i12ils16awd1cw30wafdxkk"))))
+         "1v6lnzbaksqpc33q3bp4mwij6rrfbqhi5wk1qx32h2wr2hr4208y"))))
    (properties
     `((upstream-name . "ActiveDriverWGS")))
    (build-system r-build-system)
    (propagated-inputs
     (list r-biostrings
           r-bsgenome
-           r-bsgenome-hsapiens-ucsc-hg19
-           r-bsgenome-hsapiens-ucsc-hg38
-           r-bsgenome-mmusculus-ucsc-mm9
-           r-bsgenome-mmusculus-ucsc-mm10
           r-genomeinfodb
           r-genomicranges
           r-iranges
           r-s4vectors))
    (native-inputs
-     (list r-knitr r-testthat))
+     (list r-bsgenome-hsapiens-ucsc-hg19 r-knitr r-testthat))
    (home-page "https://cran.r-project.org/web/packages/ActiveDriverWGS/")
    (synopsis "Driver discovery tool for cancer whole genomes")
    (description
@@ -24759,13 +24770,13 @@ functionality.")
 (define-public r-biocviews
  (package
    (name "r-biocviews")
-    (version "1.78.0")
+    (version "1.78.1")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "biocViews" version))
              (sha256
               (base32
-                "1dfsfj4dm9wnh4qr1sqdrwzccl3pgw58j17vr3i1bvxkrq31p1ws"))))
+                "1qw3xwsffdqfwpmwrpzg8rnjwv9l45lkjz8bf5272hkhgjc7b1a8"))))
    (properties
     `((upstream-name . "biocViews")))
    (build-system r-build-system)
@@ -24878,14 +24889,14 @@ db and resource files to AWS S3 buckets.")
 (define-public r-multiassayexperiment
  (package
    (name "r-multiassayexperiment")
-    (version "1.36.1")
+    (version "1.36.2")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "MultiAssayExperiment" version))
       (sha256
        (base32
-         "09jwnwiq4vx7cmzq5va3rh7npjyhi1p5p344c4n0h9nr55mxzjiw"))))
+         "0bhr51c58vdfvly0bh3hgr397qkq45yw8221rpr38cah7dbzvrba"))))
    (properties
     '((upstream-name . "MultiAssayExperiment")
       (updater-extra-native-inputs
@@ -25954,13 +25965,13 @@ provided for direct creation of an in-memory tatami matrix from a HDF5 file.")
 (define-public r-beadarray
  (package
    (name "r-beadarray")
-    (version "2.58.0")
+    (version "2.60.1")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "beadarray" version))
              (sha256
               (base32
-                "0m9hmy4xn7q2v4ra95b9h08d0qh5qmjgqmg96vabyv46gn5i7qp4"))))
+                "1bcirbg10ai6jpa8a5ppq4450r5h2bwizb98qn0z0hmm1mm4ww9r"))))
    (properties `((upstream-name . "beadarray")))
    (build-system r-build-system)
    (propagated-inputs (list r-annotationdbi
@@ -26390,13 +26401,13 @@ of other packages.")
 (define-public r-scater
  (package
    (name "r-scater")
-    (version "1.38.0")
+    (version "1.38.1")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "scater" version))
              (sha256
               (base32
-                "1qwygk8fg8nharrkmjs65fcl3lsdi232f2383s5j8vm1qil5gghd"))))
+                "1p8dzjphrcqai1f8wh56jfv377dqzdfnx2sl9sn73axbsr41swa7"))))
    (build-system r-build-system)
    (properties
     '((updater-extra-native-inputs
@@ -26501,13 +26512,13 @@ variable and significantly correlated genes.")
 (define-public r-sparsearray
  (package
    (name "r-sparsearray")
-    (version "1.10.8")
+    (version "1.10.10")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "SparseArray" version))
       (sha256
-        (base32 "1bjxljwfrv787ikp61xl29wx3k6624qz75gl1kzfif62vys7vgf0"))))
+        (base32 "19c1dfa5wizq7k53a43i5dwwaqs44prclxbf1k0i3awx5wz6qlbw"))))
    (properties `((upstream-name . "SparseArray")))
    (build-system r-build-system)
    (propagated-inputs (list r-biocgenerics
@@ -27161,14 +27172,14 @@ with your data.")
 (define-public r-gwascat
  (package
    (name "r-gwascat")
-    (version "2.42.0")
+    (version "2.42.1")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "gwascat" version))
       (sha256
        (base32
-         "1v5z4fmwgs3swvpa09y986sracz0nsggq8s9hp1nmwb9a9grw8px"))))
+         "0djrd63nsqpy46acblg5k8pq6ldqccr35r6h0sf4xridpkqm78b1"))))
    (build-system r-build-system)
    (propagated-inputs
     (list r-annotationdbi
@@ -27183,7 +27194,6 @@ with your data.")
           r-readr
           r-s4vectors
           r-seqinfo
-           r-snpstats
           r-tibble
           r-variantannotation))
    (native-inputs
@@ -27644,16 +27654,6 @@ visualizations for publication-quality multi-panel figures.")
         "1c7vy10ga3cswsqwxljbgqlsjg0d2lx9srfknbjy4fkbyrjci15k"))))
    (properties `((upstream-name . "ballgown")))
    (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      '(modify-phases %standard-phases
-         ;; These deprecated procedures have been removed in testthat.
-         (add-after 'unpack 'testthat-compatibility
-           (lambda _
-             (substitute* "tests/testthat/test-annotation.R"
-               (("is_true\\(\\)") "expect_true")
-               (("is_false\\(\\)") "expect_false")))))))
    (propagated-inputs
     (list r-biobase
           r-genomicranges
@@ -28409,28 +28409,18 @@ separate published packages.")
 (define-public r-biomformat
  (package
    (name "r-biomformat")
-    (version "1.38.0")
+    (version "1.38.3")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "biomformat" version))
       (sha256
        (base32
-         "1ydcgifdrgg48y7qxg0gw30h332y3yk3k3n17fajkv58mlvyx1yc"))))
+         "0b0w0mfx448ph8fla3nb4i50mvpnv498kxip7rnh14xwas9rhdd7"))))
    (properties `((upstream-name . "biomformat")))
    (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      '(modify-phases %standard-phases
-         ;; These deprecated procedures have been removed in testthat.
-         (add-after 'unpack 'testthat-compatibility
-           (lambda _
-             (substitute* "tests/testthat/test-IO.R"
-               (("is_true\\(\\)") "expect_true")
-               (("is_false\\(\\)") "expect_false")))))))
    (propagated-inputs
-     (list r-jsonlite r-matrix r-plyr r-rhdf5))
+     (list r-jsonlite r-matrix r-rhdf5))
    (native-inputs (list r-knitr r-testthat))
    (home-page "https://github.com/joey711/biomformat/")
    (synopsis "Interface package for the BIOM file format")
@@ -29188,25 +29178,15 @@ reproducibility.")
 (define-public r-phyloseq
  (package
    (name "r-phyloseq")
-    (version "1.54.1")
+    (version "1.54.2")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "phyloseq" version))
       (sha256
-        (base32 "1zivxag6b2bjh32k1mpn7hlvalap97rp90x3cbfynqrk6933f4bq"))))
+        (base32 "106zwzzwzvb5x0lz9i68wshh2nsa2rf5rmkqjqsvr4smxq6hknlj"))))
    (properties `((upstream-name . "phyloseq")))
    (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      '(modify-phases %standard-phases
-         ;; These deprecated procedures have been removed in testthat.
-         (add-after 'unpack 'testthat-compatibility
-           (lambda _
-             (substitute* (find-files "tests/testthat" "\\.R$")
-               (("is_true\\(\\)") "expect_true")
-               (("is_false\\(\\)") "expect_false")))))))
    (propagated-inputs
     (list r-ade4
           r-ape
@@ -922,7 +922,10 @@ suite native in R.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))))
+        (base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))
+       (modules '((guix build utils)))
+       (snippet
+        '(delete-file-recursively "r/src/vendor/highway"))))
    (properties `((upstream-name . "BPCells")))
    (build-system r-build-system)
    (arguments
@@ -930,7 +933,11 @@ suite native in R.")
      #:phases
      '(modify-phases %standard-phases
         (add-after 'unpack 'chdir
-           (lambda _ (chdir "r"))))))
+           (lambda _
+             (substitute* "r/configure"
+               (("tools/hwy-test.cpp" m)
+                (string-append m " $HWY_LIBS $HWY_CFLAGS")))
+             (chdir "r"))))))
    (propagated-inputs
     (list r-dplyr
           r-ggplot2
@@ -957,7 +964,7 @@ suite native in R.")
           r-igraph
           r-iranges
           r-matrixstats))
-    (inputs (list hdf5 zlib))
+    (inputs (list hdf5 google-highway zlib))
    (native-inputs (list pkg-config))
    (home-page "https://github.com/bnprks/BPCells")
    (synopsis "Single cell counts matrices to PCA")
@@ -4890,26 +4897,29 @@ relying on a complex dependency tree.")
 (define-public biosoup
  (package
    (name "biosoup")
-    (version "0.10.0")
+    (version "0.11.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/rvaser/biosoup")
-             ;; Corresponds to version 0.10.0
-             (commit "38181f09854ff42cbd9632200a2ec9fb37a4b7b6")))
+             (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "02hvyka703zagx0nvv2yx3dkc748zc8g6qbrpya7r8kfkcl7y8hw"))))
+         "0vn1hj3h152iwahnrzghqll34qaphchi07klb3j70vgc248micbz"))))
    (build-system cmake-build-system)
    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "./bin/biosoup_test")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'enable-testing
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("target_link_libraries\\(biosoup_test")
+                 "enable_testing()
+  add_test(NAME biosoup-test COMMAND biosoup_test)
+  target_link_libraries(biosoup_test")))))))
    (native-inputs
     (list googletest))
    (home-page "https://github.com/rvaser/biosoup")
@@ -4921,26 +4931,29 @@ used for storage and logging in bioinformatics tools.")
 (define-public bioparser
  (package
    (name "bioparser")
-    (version "3.0.13")
+    (version "3.1.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/rvaser/bioparser")
-             ;; Corresponds to tag 3.0.13
-             (commit "13341e6e0855c6b358ffcea6dad216e1009e1287")))
+             (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0c5p2dl8jb12ci9f427jzrmmm9cgvc1k4fxsn2ggkfsin6r1r82i"))))
+         "057zb3g8qyvbkbfzgkygrf0iphz3v4icm13pchxzrafiy7zkbmrq"))))
    (build-system cmake-build-system)
    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "./bin/bioparser_test")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'enable-testing
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("target_link_libraries\\(bioparser_test")
+                 "enable_testing()
+  add_test(NAME bioparser-test COMMAND bioparser_test)
+  target_link_libraries(bioparser_test")))))))
    (inputs
     (list biosoup))
    (propagated-inputs
@@ -4954,113 +4967,6 @@ bioinformatics formats (FASTA/Q, MHAP/PAF/SAM), with support for zlib
 compressed files.")
    (license license:expat)))

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

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

 (define-module (gnu packages bison)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages flex)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu)
  #:use-module (gnu packages m4)
  #:use-module (gnu packages perl)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
+  #:use-module (gnu packages flex)
  #:use-module (srfi srfi-1))

 (define-public bison
@@ -46,29 +45,24 @@
        "1wjvbbzrr16k1jlby3l436an3kvv492h08arbnf0gwgprha05flv"))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      ;; Building in parallel on many-core systems may cause an error such as
-      ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or
-      ;; directory".  See <https://bugs.gnu.org/36238>.
-      #:parallel-build? #f
-      ;; Similarly, when building tests in parallel, Make may produce this error:
-      ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file
-      ;; or directory".  Full log in <https://bugs.gnu.org/36238>.
-      #:parallel-tests? #f
-      #:configure-flags
-      ;; On the Hurd with glibc 2.41 bison uses weak symbols from pthread
-      ;; but does not link to it.
-      (if (target-hurd?)
-          #~(list "LIBS=-lpthread")
-          #~(list))))
-    (native-inputs
-     (list perl
-           ;; m4 is not present in PATH when cross-building.
-           m4))
-    (inputs
-     (list flex))
-    (propagated-inputs
-     (list m4))
+     `(;; Building in parallel on many-core systems may cause an error such as
+       ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or
+       ;; directory".  See <https://bugs.gnu.org/36238>.
+       #:parallel-build? #f
+       ;; Similarly, when building tests in parallel, Make may produce this error:
+       ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file
+       ;; or directory".  Full log in <https://bugs.gnu.org/36238>.
+       #:parallel-tests? #f
+       ;; On the Hurd with glibc 2.41 bison uses weak symbols from pthread
+       ;; but does not link to it.
+       ,@(if (target-hurd?)
+             (list #:configure-flags ''("LIBS=-lpthread"))
+             '())))
+    (native-inputs (list perl
+                         ;; m4 is not present in PATH when cross-building.
+                         m4))
+    (inputs (list flex))
+    (propagated-inputs (list m4))
    (home-page "https://www.gnu.org/software/bison/")
    (synopsis "Yacc-compatible parser generator")
    (description
@@ -78,4 +72,4 @@ grammar.  It is versatile enough to have many applications, from parsers for
 simple tools through complex programming languages.

 Bison also provides an implementation of @command{yacc}, as specified by POSIX.")
-    (license license:gpl3+)))
+    (license gpl3+)))
@@ -41,32 +41,16 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

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

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

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

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

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

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

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

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

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

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

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

 (define-public qbittorrent-no-x
  (let ((base qbittorrent))
@@ -727,4 +727,4 @@ Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange
 speed limits.  Deluge heavily utilises the libtorrent library.  It is
 designed to run as both a normal standalone desktop application and as a
 client-server.")
-    (license l:gpl3+)))
+    (license license:gpl3+)))
@@ -37,7 +37,7 @@
                #:select (raw-derivation derivation-input derivation->output-path))
  #:use-module (guix utils)
  #:use-module ((guix build utils) #:select (elf-file?))
-  #:use-module (guix gexp)
+  #:use-module ((guix gexp) #:select (lower-object local-file))
  #:use-module (guix monads)
  #:use-module (guix memoization)
  #:use-module (guix i18n)
@@ -204,7 +204,10 @@ for system '~a'")
           (uri (map (cute string-append <>
                           (bootstrap-executable-file-name system program))
                     %bootstrap-executable-base-urls))
-           (file-name (string-append "bootstrap-" program))
+           ;; XXX: In the long term, migrate all boostrap executables to
+           ;; (string-append "bootstrap-" program), and drop the additional
+           ;; file-name argument.
+           (file-name file-name)
           (hash (content-hash bv sha256))))))))

 (define* (bootstrap-executable program system #:optional file-name)
@@ -264,33 +267,32 @@ or false to signal an error."
    (version "0")
    (build-system trivial-build-system)
    (arguments
-     (list
-      #:guile %bootstrap-guile
-      #:modules '((guix build utils))
-      #:builder
-      #~(begin
-          (use-modules (guix build utils))
+     `(#:guile ,%bootstrap-guile
+       #:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))

-          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
-                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
-                (tarball (assoc-ref %build-inputs
-                                    #$(string-append name ".tar.xz"))))
+         (let ((out     (assoc-ref %outputs "out"))
+              (tar     (assoc-ref %build-inputs "tar"))
+              (xz      (assoc-ref %build-inputs "xz"))
+              (tarball (assoc-ref %build-inputs "tarball")))

-            (mkdir #$output)
-            (copy-file tarball "binaries.tar.xz")
-            (invoke xz "-d" "binaries.tar.xz")
-            (let ((builddir (getcwd)))
-              (with-directory-excursion #$output
-                (invoke tar "xvf"
-                        (string-append builddir "/binaries.tar"))
-                #$@(if snippet (list snippet) '())
-                (or (not #$program-to-test)
-                    (invoke (string-append "bin/" #$program-to-test)
-                            "--version"))))))))
+          (mkdir out)
+          (copy-file tarball "binaries.tar.xz")
+          (invoke xz "-d" "binaries.tar.xz")
+          (let ((builddir (getcwd)))
+            (with-directory-excursion out
+              (invoke tar "xvf"
+                      (string-append builddir "/binaries.tar"))
+              ,@(if snippet (list snippet) '())
+              (or (not ,program-to-test)
+                  (invoke (string-append "bin/" ,program-to-test)
+                          "--version"))))))))
    (inputs
-     (list (bootstrap-executable "tar" (%current-system))
-           (bootstrap-executable "xz" (%current-system))
-           (bootstrap-origin (source (%current-system)))))
+     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
+       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
+       ("tarball" ,(bootstrap-origin (source (%current-system))))))
    (source #f)
    (synopsis description)
    (description description)
@@ -633,29 +635,37 @@ $out/bin/guile --version~%"
                                            (_
                                             "/20131110/static-binaries.tar.xz")))
                                     %bootstrap-base-urls))
-                           (file-name "bootstrap-binaries.tar.xz")
                           (sha256
-                            (base32
-                             (match system
-                               ("x86_64-linux"
-                                "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4")
-                               ("i686-linux"
-                                "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak")
-                               ("armhf-linux"
-                                "0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5")
-                               ("aarch64-linux"
-                                "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh")
-                               ("powerpc64le-linux"
-                                "0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v")
-                               ("i586-gnu"
-                                "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")
-                               ("x86_64-gnu"
-                                "0xnw5p6279m8xazbhal5ld5qxsya0249z2l6jcc7w9ndh2gnx07v")
-                               ("powerpc-linux"
-                                "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")
-                               ("riscv64-linux"
-                                "0x0xjlpmyh6rkr51p00gp6pscgl6zjida1rsg8vk3rinyi6rrbkg")
-                               ("mips64el-linux"
+                            (match system
+                              ("x86_64-linux"
+                               (base32
+                                "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4"))
+                              ("i686-linux"
+                               (base32
+                                "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak"))
+                              ("armhf-linux"
+                               (base32
+                                "0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5"))
+                              ("aarch64-linux"
+                               (base32
+                                "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh"))
+                              ("powerpc64le-linux"
+                               (base32
+                                "0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v"))
+                              ("i586-gnu"
+                               (base32
+                                "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn"))
+                              ("x86_64-gnu"
+                               (base32
+                                "0xnw5p6279m8xazbhal5ld5qxsya0249z2l6jcc7w9ndh2gnx07v"))
+                              ("powerpc-linux"
+                               (base32
+                                "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m"))
+                              ("riscv64-linux"
+                               (base32
+                                "0x0xjlpmyh6rkr51p00gp6pscgl6zjida1rsg8vk3rinyi6rrbkg"))
+                              ("mips64el-linux"
+                               (base32
                                "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753"))))))
                        "fgrep"                    ; the program to test
                        "Bootstrap binaries of Coreutils, Awk, etc."
@@ -683,7 +693,6 @@ $out/bin/guile --version~%"
                       "/i686-linux/20190815/"
                       "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz")
                 %bootstrap-base-urls))
-       (file-name "linux-libre-headers-bootstrap.tar.xz")
       (sha256
        (base32
         "0sm2z9x4wk45bh6qfs94p0w1d6hsy6dqx9sw38qsqbvxwa1qzk8s"))))
@@ -691,56 +700,63 @@ $out/bin/guile --version~%"
   "Bootstrap linux-libre-headers"))

 (define %bootstrap-binutils
-  (package-from-tarball
-   "binutils-bootstrap"
-   (lambda (system)
-     (origin
-       (method url-fetch)
-       (uri (map (cut string-append <> "/" system
-                      (match system
-                        ("armhf-linux"
-                         "/20150101/binutils-2.25.tar.xz")
-                        ("aarch64-linux"
-                         "/20170217/binutils-2.27.tar.xz")
-                        ("powerpc64le-linux"
-                         "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz")
-                        ("i586-gnu"
-                         "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
-                        ("x86_64-gnu"
-                         "/20260302/binutils-static-stripped-2.44-x86_64-pc-gnu.tar.xz")
-                        ("powerpc-linux"
-                         "/20200923/binutils-2.35.1.tar.xz")
-                        ("riscv64-linux"
-                         "/20210725/binutils-2.34.tar.xz")
-                        (_
-                         "/20131110/binutils-2.23.2.tar.xz")))
-                 %bootstrap-base-urls))
-       (file-name "binutils-bootstrap.tar.xz")
-       (sha256
-        (base32
-         (match system
-           ("x86_64-linux"
-            "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20")
-           ("i686-linux"
-            "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9")
-           ("armhf-linux"
-            "1v7dj6bzn6m36f20gw31l99xaabq4xrhrx3gwqkhhig0mdlmr69q")
-           ("aarch64-linux"
-            "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n")
-           ("powerpc64le-linux"
-            "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz")
-           ("riscv64-linux"
-            "0n9qf4vbilfmh1lknhw000waakj4q6s50pnjazr5137skm976z5m")
-           ("i586-gnu"
-            "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")
-           ("x86_64-gnu"
-            "033bgmaa012b2lw8g76b02mjgzdnzv2yd3jvaqbhqrr5q9r3xn04")
-           ("powerpc-linux"
-            "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8")
-           ("mips64el-linux"
-            "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7"))))))
-   "ld"                      ; the program to test
-   "Bootstrap binaries of the GNU Binutils"))
+  (package-from-tarball "binutils-bootstrap"
+                        (lambda (system)
+                          (origin
+                           (method url-fetch)
+                           (uri (map (cut string-append <> "/" system
+                                          (match system
+                                            ("armhf-linux"
+                                             "/20150101/binutils-2.25.tar.xz")
+                                            ("aarch64-linux"
+                                             "/20170217/binutils-2.27.tar.xz")
+                                            ("powerpc64le-linux"
+                                             "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz")
+                                            ("i586-gnu"
+                                             "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
+                                            ("x86_64-gnu"
+                                             "/20260302/binutils-static-stripped-2.44-x86_64-pc-gnu.tar.xz")
+                                            ("powerpc-linux"
+                                             "/20200923/binutils-2.35.1.tar.xz")
+                                            ("riscv64-linux"
+                                             "/20210725/binutils-2.34.tar.xz")
+                                            (_
+                                             "/20131110/binutils-2.23.2.tar.xz")))
+                                     %bootstrap-base-urls))
+                           (sha256
+                            (match system
+                              ("x86_64-linux"
+                               (base32
+                                "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20"))
+                              ("i686-linux"
+                               (base32
+                                "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9"))
+                              ("armhf-linux"
+                               (base32
+                                "1v7dj6bzn6m36f20gw31l99xaabq4xrhrx3gwqkhhig0mdlmr69q"))
+                              ("aarch64-linux"
+                               (base32
+                                "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n"))
+                              ("powerpc64le-linux"
+                               (base32
+                                "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz"))
+                              ("riscv64-linux"
+                               (base32
+                                "0n9qf4vbilfmh1lknhw000waakj4q6s50pnjazr5137skm976z5m"))
+                              ("i586-gnu"
+                               (base32
+                                "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs"))
+                              ("x86_64-gnu"
+                               (base32
+                                "033bgmaa012b2lw8g76b02mjgzdnzv2yd3jvaqbhqrr5q9r3xn04"))
+                              ("powerpc-linux"
+                               (base32
+                                "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8"))
+                              ("mips64el-linux"
+                               (base32
+                                "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7"))))))
+                        "ld"                      ; the program to test
+                        "Bootstrap binaries of the GNU Binutils"))

 (define %bootstrap-glibc
  ;; The initial libc.
@@ -750,91 +766,99 @@ $out/bin/guile --version~%"
    (source #f)
    (build-system trivial-build-system)
    (arguments
-     (list
-      #:guile %bootstrap-guile
-      #:modules '((guix build utils))
-      #:builder
-      #~(begin
-          (use-modules (guix build utils))
+     `(#:guile ,%bootstrap-guile
+       #:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))

-          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
-                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
-                (tarball (assoc-ref %build-inputs "glibc.tar.xz")))
+         (let ((out     (assoc-ref %outputs "out"))
+              (tar     (assoc-ref %build-inputs "tar"))
+              (xz      (assoc-ref %build-inputs "xz"))
+              (tarball (assoc-ref %build-inputs "tarball")))

-            (mkdir #$output)
-            (copy-file tarball "binaries.tar.xz")
-            (invoke xz "-d" "binaries.tar.xz")
-            (let ((builddir (getcwd)))
-              (with-directory-excursion #$output
-                (invoke tar "xvf"
-                        (string-append builddir
-                                       "/binaries.tar"))
-                (chmod "lib" #o755)
+          (mkdir out)
+          (copy-file tarball "binaries.tar.xz")
+          (invoke xz "-d" "binaries.tar.xz")
+          (let ((builddir (getcwd)))
+            (with-directory-excursion out
+              (invoke tar "xvf"
+                      (string-append builddir
+                                     "/binaries.tar"))
+              (chmod "lib" #o755)

-                ;; Patch linker scripts so they refer to the right file-names.
-                (substitute* #$(cond ((target-hurd64?)
-                                      ''("lib/libc.so" "lib/libm.so"))
-                                     ((and (not (target-hurd?))
-                                           (or (target-x86?)
-                                               (target-arm?)))
-                                      ''("lib/libc.so" "lib/libpthread.so"))
-                                     (else
-                                      ''("lib/libc.so")))
-                  (("/[^ ]+/lib/(libc|libh|libm|libpthread|ld)" _ prefix)
-                   (string-append #$output "/lib/" prefix)))
-                #$@(if (target-arm32?)
-                       #~((substitute* "lib/libpthread.so"
-                            (("/[^ ]+/lib/libpthread_nonshared\\.a") "")))
-                       #~())))))))
+              ;; Patch linker scripts so they refer to the right file-names.
+              (substitute* ,(cond ((target-hurd64?)
+                                   ''("lib/libc.so" "lib/libm.so"))
+                                  ((and (not (target-hurd?))
+                                        (or (target-x86?)
+                                            (target-arm?)))
+                                   ''("lib/libc.so" "lib/libpthread.so"))
+                                  (else
+                                   ''("lib/libc.so")))
+                (("/[^ ]+/lib/(libc|libh|libm|libpthread|ld)" _ prefix)
+                 (string-append out "/lib/" prefix)))
+              ,@(if (target-arm32?)
+                    `((substitute* "lib/libpthread.so"
+                        (("/[^ ]+/lib/libpthread_nonshared\\.a") "")))
+                    `())))))))
    (inputs
-     (list (bootstrap-executable "tar" (%current-system))
-           (bootstrap-executable "xz" (%current-system))
-           (bootstrap-origin
-            (origin
-              (method url-fetch)
-              (uri (map (cut string-append <> "/" (%current-system)
-                             (match (%current-system)
-                               ("armhf-linux"
-                                "/20150101/glibc-2.20.tar.xz")
-                               ("aarch64-linux"
-                                "/20170217/glibc-2.25.tar.xz")
-                               ("powerpc64le-linux"
-                                "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz")
-                               ("i586-gnu"
-                                "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz")
-                               ("x86_64-gnu"
-                                "/20260302/glibc-stripped-2.41-x86_64-pc-gnu.tar.xz")
-                               ("powerpc-linux"
-                                "/20200923/glibc-2.32.tar.xz")
-                               ("riscv64-linux"
-                                "/20210725/glibc-2.31.tar.xz")
-                               (_
-                                "/20131110/glibc-2.18.tar.xz")))
-                        %bootstrap-base-urls))
-              (file-name "glibc.tar.xz")
-              (sha256
-               (base32
-                (match (%current-system)
-                  ("x86_64-linux"
-                   "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")
-                  ("i686-linux"
-                   "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")
-                  ("armhf-linux"
-                   "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn")
-                  ("aarch64-linux"
-                   "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")
-                  ("powerpc64le-linux"
-                   "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")
-                  ("riscv64-linux"
-                   "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm")
-                  ("i586-gnu"
-                   "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2")
-                  ("x86_64-gnu"
-                   "1lpvk0l7qqvz46cnxm64a1a40zg0gj90j3glyk67i1sh5r4znlmy")
-                  ("powerpc-linux"
-                   "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")
-                  ("mips64el-linux"
-                   "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))
+     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
+       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
+       ("tarball" ,(bootstrap-origin
+                    (origin
+                     (method url-fetch)
+                     (uri (map (cut string-append <> "/" (%current-system)
+                                    (match (%current-system)
+                                      ("armhf-linux"
+                                       "/20150101/glibc-2.20.tar.xz")
+                                      ("aarch64-linux"
+                                       "/20170217/glibc-2.25.tar.xz")
+                                      ("powerpc64le-linux"
+                                       "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz")
+                                      ("i586-gnu"
+                                       "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz")
+                                      ("x86_64-gnu"
+                                       "/20260302/glibc-stripped-2.41-x86_64-pc-gnu.tar.xz")
+                                      ("powerpc-linux"
+                                       "/20200923/glibc-2.32.tar.xz")
+                                      ("riscv64-linux"
+                                       "/20210725/glibc-2.31.tar.xz")
+                                      (_
+                                       "/20131110/glibc-2.18.tar.xz")))
+                               %bootstrap-base-urls))
+                     (sha256
+                      (match (%current-system)
+                        ("x86_64-linux"
+                         (base32
+                          "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v"))
+                        ("i686-linux"
+                         (base32
+                          "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w"))
+                        ("armhf-linux"
+                         (base32
+                          "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn"))
+                        ("aarch64-linux"
+                         (base32
+                          "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c"))
+                        ("powerpc64le-linux"
+                         (base32
+                          "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz"))
+                        ("riscv64-linux"
+                         (base32
+                          "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm"))
+                        ("i586-gnu"
+                         (base32
+                          "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2"))
+                        ("x86_64-gnu"
+                         (base32
+                          "1lpvk0l7qqvz46cnxm64a1a40zg0gj90j3glyk67i1sh5r4znlmy"))
+                        ("powerpc-linux"
+                         (base32
+                          "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb"))
+                        ("mips64el-linux"
+                         (base32
+                          "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg")))))))))
    (synopsis "Bootstrap binaries and headers of the GNU C Library")
    (description synopsis)
    (home-page #f)
@@ -849,102 +873,110 @@ $out/bin/guile --version~%"
    (source #f)
    (build-system trivial-build-system)
    (arguments
-     (list
-      #:guile %bootstrap-guile
-      #:modules '((guix build utils))
-      #:builder
-      #~(begin
-          (use-modules (guix build utils)
-                       (ice-9 popen))
+     `(#:guile ,%bootstrap-guile
+       #:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils)
+                      (ice-9 popen))

-          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
-                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
-                (bash    (assoc-ref %build-inputs "bootstrap-bash"))
-                (libc    (assoc-ref %build-inputs "glibc-bootstrap"))
-                (tarball (assoc-ref %build-inputs "gcc.tar.xz")))
+         (let ((out     (assoc-ref %outputs "out"))
+               (tar     (assoc-ref %build-inputs "tar"))
+               (xz      (assoc-ref %build-inputs "xz"))
+               (bash    (assoc-ref %build-inputs "bash"))
+               (libc    (assoc-ref %build-inputs "libc"))
+               (tarball (assoc-ref %build-inputs "tarball")))

-            (mkdir #$output)
-            (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link
-            (invoke xz "-d" "binaries.tar.xz")
-            (let ((builddir (getcwd))
-                  (bindir   (string-append #$output "/bin")))
+           (mkdir out)
+           (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link
+           (invoke xz "-d" "binaries.tar.xz")
+           (let ((builddir (getcwd))
+                 (bindir   (string-append out "/bin")))

-              (define (wrap-program program)
-                (let ((wrapped (format #f ".~a-wrapped" program)))
-                  (rename-file program wrapped)
-                  (call-with-output-file program
-                    (lambda (p)
-                      (format p "#!~a
+             (define (wrap-program program)
+               (let ((wrapped (format #f ".~a-wrapped" program)))
+                 (rename-file program wrapped)
+                 (call-with-output-file program
+                   (lambda (p)
+                     (format p "#!~a
 exec ~a/bin/~a -B~a/lib \
     -Wl,-rpath -Wl,~a/lib \
     -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
-                              bash
-                              #$output wrapped
-                              libc libc libc
-                              #$(glibc-dynamic-linker)))))
-                (chmod program #o555))
+                             bash
+                             out wrapped
+                             libc libc libc
+                             ,(glibc-dynamic-linker)))))
+               (chmod program #o555))

-              (with-directory-excursion #$output
-                (invoke tar "xvf"
-                        (string-append builddir "/binaries.tar")))
+             (with-directory-excursion out
+               (invoke tar "xvf"
+                       (string-append builddir "/binaries.tar")))

-              (with-directory-excursion bindir
-                (chmod "." #o755)
-                (for-each wrap-program
-                          #$(if (target-hurd64?)
-                                ''("gcc" "g++")
-                                ''("gcc")))))))))
+             (with-directory-excursion bindir
+               (chmod "." #o755)
+               (for-each wrap-program
+                         ,(if (target-hurd64?)
+                              ''("gcc" "g++")
+                              ''("gcc")))))))))
    (inputs
-     (list (bootstrap-executable "tar" (%current-system))
-           (bootstrap-executable "xz" (%current-system))
-           (bootstrap-executable "bash" (%current-system))
-           %bootstrap-glibc
-           (bootstrap-origin
-            (origin
-              (method url-fetch)
-              (uri (map (cut string-append <> "/" (%current-system)
-                             (match (%current-system)
-                               ("armhf-linux"
-                                "/20150101/gcc-4.8.4.tar.xz")
-                               ("aarch64-linux"
-                                "/20170217/gcc-5.4.0.tar.xz")
-                               ("powerpc64le-linux"
-                                "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz")
-                               ("i586-gnu"
-                                "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
-                               ("x86_64-gnu"
-                                "/20260302/gcc-stripped-14.3.0-x86_64-pc-gnu.tar.xz")
-                               ("powerpc-linux"
-                                "/20200923/gcc-5.5.0.tar.xz")
-                               ("riscv64-linux"
-                                "/20210725/gcc-7.5.0.tar.xz")
-                               (_
-                                "/20131110/gcc-4.8.2.tar.xz")))
-                        %bootstrap-base-urls))
-              (file-name "gcc.tar.xz")
-              (sha256
-               (base32
-                (match (%current-system)
-                  ("x86_64-linux"
-                   "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")
-                  ("i686-linux"
-                   "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")
-                  ("armhf-linux"
-                   "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v")
-                  ("aarch64-linux"
-                   "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")
-                  ("powerpc64le-linux"
-                   "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1")
-                  ("riscv64-linux"
-                   "1k4mbnb54wj2q37fgshf5dfixixqnhn002vhzvi9pnb57xb9v14d")
-                  ("i586-gnu"
-                   "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")
-                  ("x86_64-gnu"
-                   "1fhi7f5zld08b6qsyv1d48ha7z0vr8pxr4kf8x7aq1a3kbcv5rkz")
-                  ("powerpc-linux"
-                   "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w")
-                  ("mips64el-linux"
-                   "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))
+     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
+       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
+       ("bash" ,(bootstrap-executable "bash" (%current-system)))
+       ("libc" ,%bootstrap-glibc)
+       ("tarball" ,(bootstrap-origin
+                    (origin
+                      (method url-fetch)
+                      (uri (map (cut string-append <> "/" (%current-system)
+                                     (match (%current-system)
+                                       ("armhf-linux"
+                                        "/20150101/gcc-4.8.4.tar.xz")
+                                       ("aarch64-linux"
+                                        "/20170217/gcc-5.4.0.tar.xz")
+                                       ("powerpc64le-linux"
+                                        "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz")
+                                       ("i586-gnu"
+                                        "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
+                                       ("x86_64-gnu"
+                                        "/20260302/gcc-stripped-14.3.0-x86_64-pc-gnu.tar.xz")
+                                       ("powerpc-linux"
+                                        "/20200923/gcc-5.5.0.tar.xz")
+                                       ("riscv64-linux"
+                                        "/20210725/gcc-7.5.0.tar.xz")
+                                       (_
+                                        "/20131110/gcc-4.8.2.tar.xz")))
+                                %bootstrap-base-urls))
+                      (sha256
+                       (match (%current-system)
+                         ("x86_64-linux"
+                          (base32
+                           "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls"))
+                         ("i686-linux"
+                          (base32
+                           "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw"))
+                         ("armhf-linux"
+                          (base32
+                           "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v"))
+                         ("aarch64-linux"
+                          (base32
+                           "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1"))
+                         ("powerpc64le-linux"
+                          (base32
+                           "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1"))
+                         ("riscv64-linux"
+                          (base32
+                           "1k4mbnb54wj2q37fgshf5dfixixqnhn002vhzvi9pnb57xb9v14d"))
+                         ("i586-gnu"
+                          (base32
+                           "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5"))
+                         ("x86_64-gnu"
+                          (base32
+                           "1fhi7f5zld08b6qsyv1d48ha7z0vr8pxr4kf8x7aq1a3kbcv5rkz"))
+                         ("powerpc-linux"
+                          (base32
+                           "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w"))
+                         ("mips64el-linux"
+                          (base32
+                           "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks")))))))))
    (native-search-paths
     (list (search-path-specification
            (variable "C_INCLUDE_PATH")
@@ -965,12 +997,14 @@ exec ~a/bin/~a -B~a/lib \
  ;; own packages.
  (match (%current-system)
    ((or "i686-linux" "x86_64-linux")
-     (list %bootstrap-linux-libre-headers))
+     `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)))
    (_
-     (list %bootstrap-glibc
-           %bootstrap-gcc
-           %bootstrap-binutils
-           %bootstrap-coreutils&co))))
+     `(("libc" ,%bootstrap-glibc)
+       ("gcc" ,%bootstrap-gcc)
+       ("binutils" ,%bootstrap-binutils)
+       ("coreutils&co" ,%bootstrap-coreutils&co)
+       ;; In gnu-build-system.scm, we rely on the availability of Bash.
+       ("bash" ,%bootstrap-coreutils&co)))))

 (define %bootstrap-inputs-for-tests
  ;; These are bootstrap inputs that are cheap to produce (no compilation
@@ -95,8 +95,8 @@ supported content to the Kodi media center.")
  ;; Arbitrary commit of branch master,
  ;; Update when updating uBlockOrigin.
  (let* ((name "ublock-main-assets")
-         (commit "011eef4a5b36a7ebf4adedc486d96b77cfa25c54")
-         (revision "5")
+         (commit "004af606e6a0efc22bc65ab1016b553441cacb71")
+         (revision "6")
         (version (git-version "0" revision commit)))
    (origin
      (method git-fetch)
@@ -105,14 +105,14 @@ supported content to the Kodi media center.")
            (commit commit)))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "0ng8a88zdvrxg30fz83gswjy27b3hfx9q11n2i715id7az7kqf9x")))))
+       (base32 "1bfd2d53flrkgvjcr1kj9nbxj4y9a4pcr7m3dycccdhd21x6k0ln")))))

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

 (define ublock-origin
  (package
    (name "ublock-origin")
-    (version "1.66.2")
+    (version "1.70.0")
    (home-page "https://github.com/gorhill/uBlock")
    (source (origin
              (method git-fetch)
@@ -136,7 +136,7 @@ supported content to the Kodi media center.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "16ph031hb8bf4rxyxvm6jr0bxmy0snza11jfrbjgfb390gax9r63"))))
+                "0j1m80nz86yc69c42hv5di5zza0vkycqmjaydb9jgx0abcvi19x5"))))
    (build-system gnu-build-system)
    (outputs '("xpi" "firefox" "chromium"))
    (properties '((addon-id . "uBlock0@raymondhill.net")))
@@ -26,6 +26,7 @@
 ;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2026 Nemin <bergengocia@protonmail.com>
+;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -43,37 +44,17 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

 (define-public acr
  (package
@@ -139,6 +141,48 @@ Bourne shell script instead of m4.")
    (home-page "https://github.com/radareorg/acr")
    (license license:gpl2)))

+(define-public autosetup
+  (package
+    (name "autosetup")
+    (version "0.7.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/msteveb/autosetup")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256 (base32 "002b380073cpxlqziia2gvngywrb37b08p9k0zk9vlxn2p174hc6"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            (delete-file "jimsh0.c")
+            (substitute* "Makefile"
+              (("^.*tclsh8\\..*")       ;tests run with specific Tcl versions
+               ""))))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:test-target "test"
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure)
+               (delete 'build)
+               (replace 'install
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "sys-find-tclsh"
+                     (("jimsh tclsh")
+                      (search-input-file inputs "bin/tclsh")))
+                   (invoke "tclsh" "autosetup"
+                           (string-append "--sysinstall=" #$output)))))))
+    (inputs (list tcl))
+    (home-page "https://msteveb.github.io/autosetup/")
+    (synopsis "Build environment auto-configurator")
+    (description
+     "@command{autosetup} is a tool, similar to @command{autoconf},
+to configure a build system for the appropriate environment,
+according to the system capabilities and the user-selected options.")
+    (license license:bsd-2)))
+
 (define-public bam
  (package
    (name "bam")
@@ -152,7 +196,8 @@ Bourne shell script instead of m4.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))))
+                "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))
+              (patches (search-patches "bam-python3-compat.patch"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags `(,(string-append "CC=" ,(cc-for-target))
@@ -163,7 +208,7 @@ Bourne shell script instead of m4.")
       (modify-phases %standard-phases
         (delete 'configure))))
    (native-inputs
-     `(("python" ,python-2)))
+     (list python-minimal-wrapper))
    (inputs
     (list lua))
    (home-page "https://matricks.github.io/bam/")
@@ -300,8 +345,8 @@ programs and other files depend.")
    (license license:bsd-3)))

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

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

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

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

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

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

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

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

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

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

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

              "clang_warning_suppression_file=\"\""

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

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

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

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

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

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

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

-(define-public rtags
-  (package
-    (name "rtags")
-    (version "2.18")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Andersbakken/rtags")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (patches (search-patches "rtags-separate-rct.patch"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Part of spliting rct with rtags.
-        ;; Substitute #include "rct/header.h" with #include <rct/header.h>.
-        '(with-directory-excursion "src"
-           (delete-file-recursively "rct")        ;remove bundled copy
-           (let ((files (find-files "." ".*\\.cpp|.*\\.h")))
-             (substitute* files
-               (("#include ?\"rct/(.*.h)\"" all header)
-                (string-append "#include <rct/" header ">")))
-             #t)))
-       (sha256
-        (base32
-         "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"))))
-    (build-system cmake-build-system)
-    (arguments
-     '(#:build-type "RelWithDebInfo"
-       #:configure-flags
-       '("-DRTAGS_NO_ELISP_FILES=1")
-       #:tests? #f))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list bash-completion
-           clang
-           llvm
-           lua
-           rct
-           selene))
-    (home-page "https://github.com/Andersbakken/rtags")
-    (synopsis "Indexer for the C language family with Emacs integration")
-    (description
-     "RTags is a client/server application that indexes C/C++ code and keeps a
-persistent file-based database of references, declarations, definitions,
-symbolnames etc.  There’s also limited support for ObjC/ObjC++.  It allows you
-to find symbols by name (including nested class and namespace scope).  Most
-importantly we give you proper follow-symbol and find-references support.")
-    (license license:gpl3+)))
-
 (define-public colormake
  (package
    (name "colormake")
@@ -321,11 +321,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
                "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb"))))
    (build-system gnu-build-system)
    (arguments
-     (list #:make-flags #~(list (string-append "PREFIX=" #$output))
-           ;; Don't attempt to run the tests when cross-compiling.
-           #:tests? (not (%current-target-system))
-
-           #:modules '((guix build gnu-build-system)
+     (list #:modules '((guix build gnu-build-system)
                       (guix build utils)
                       (ice-9 ftw)
                       (srfi srfi-1))
@@ -333,21 +329,20 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
           #~(modify-phases %standard-phases
               (add-after 'set-paths 'hide-input-bzip2
                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libbz2.so (false-if-exception
-                                     (search-input-file inputs "lib/libbz2.so"))))
-                     (if libbz2.so
+                   (let ((bzip2 (assoc-ref inputs "bzip2")))
+                     (if bzip2
                         ;; Prevent the build system from retaining a reference to
-                         ;; BZIP2 from INPUTS (used in both implicit and bootstrap).
+                         ;; BZIP2 from INPUTS.
                         (begin
-                           (let ((library-path (string-split (getenv "LIBRARY_PATH")
-                                                             #\:)))
-                             (setenv "LIBRARY_PATH"
-                                     (string-join (delete (dirname libbz2.so)
-                                                          library-path)
-                                                  ":")))
+                           (setenv "LIBRARY_PATH"
+                                   (string-join (delete (string-append bzip2 "/lib")
+                                                        (string-split (getenv "LIBRARY_PATH")
+                                                                      #\:))
+                                                ":"))
                           (format #t "environment variable `LIBRARY_PATH' set to `~a'~%"
                                   (getenv "LIBRARY_PATH")))
-                         (format #t "no bzip2 found, nothing done~%")))))
+                         (format #t "no bzip2 found, nothing done~%"))
+                     #t)))
               (replace 'configure
                 (lambda* (#:key target #:allow-other-keys)
                   (when #$(%current-target-system)
@@ -361,7 +356,8 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
                        (string-append "RANLIB = " target "-ranlib\n"))
                       (("^all:(.*)test" _ prerequisites)
                        ;; Remove 'all' -> 'test' dependency.
-                        (string-append "all:" prerequisites "\n"))))))
+                        (string-append "all:" prerequisites "\n"))))
+                   #t))
               (add-before 'build 'build-shared-lib
                 (lambda* (#:key inputs #:allow-other-keys)
                   (patch-makefile-SHELL "Makefile-libbz2_so")
@@ -370,7 +366,8 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
                 (lambda* (#:key outputs #:allow-other-keys)
                   ;; The Makefile above does not have an 'install' target, nor does
                   ;; it create all the (un)versioned symlinks, so we handle it here.
-                   (let* ((libdir (string-append #$output "/lib"))
+                   (let* ((out    (assoc-ref outputs "out"))
+                          (libdir (string-append out "/lib"))
                          (soname "libbz2.so")
                          ;; Locate the built library (e.g. "libbz2.so.1.0.6").
                          (lib (car (scandir "."
@@ -387,19 +384,32 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
                         (unless (null? numbers)
                           (let ((so-file (string-append base "." (car numbers))))
                             (symlink so-file base)
-                             (loop so-file (cdr numbers)))))))))
+                             (loop so-file (cdr numbers))))))
+                     #t)))
               (add-after 'install-shared-lib 'move-static-lib
-                 (lambda _
-                   (with-directory-excursion (string-append #$output "/lib")
-                     (install-file "libbz2.a" (string-append #$output:static "/lib"))
-                     (delete-file "libbz2.a"))))
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out"))
+                         (static (assoc-ref outputs "static")))
+                     (with-directory-excursion (string-append out "/lib")
+                       (install-file "libbz2.a" (string-append static "/lib"))
+                       (delete-file "libbz2.a")
+                       #t))))
               (add-after 'install-shared-lib 'patch-scripts
-                 (lambda _
-                   (substitute* (string-append #$output "/bin/bzdiff")
-                     (("/bin/rm") "rm")))))))
-    (inputs (if (%current-target-system)
-                (list bash-minimal)
-                (list)))
+                 (lambda* (#:key outputs inputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out")))
+                     (substitute* (string-append out "/bin/bzdiff")
+                       (("/bin/rm") "rm")))
+                   #t)))
+
+           #:make-flags #~(list (string-append "PREFIX="
+                                               (assoc-ref %outputs "out")))
+
+           ;; Don't attempt to run the tests when cross-compiling.
+           #:tests? (not (%current-target-system))))
+    (inputs
+     `(,@(if (%current-target-system)
+             `(("bash" ,bash-minimal))
+             '())))
    (outputs '("out" "static"))
    (synopsis "High-quality data compression program")
    (description
@@ -544,7 +554,7 @@ formats, including zstd, xz, gzip, and bgzf.")
 (define-public xz
  (package
   (name "xz")
-   (version "5.8.1")
+   (version "5.4.5")
   (source (origin
            (method url-fetch)
            (uri (list (string-append "http://tukaani.org/xz/xz-" version
@@ -553,7 +563,7 @@ formats, including zstd, xz, gzip, and bgzf.")
                                      version ".tar.gz")))
            (sha256
             (base32
-              "0hsmg58a27jd1vq0lc6yp405978c1nfhqwndl7f10v1mk6sjay2h"))))
+              "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k"))))
   (build-system gnu-build-system)
   (arguments
    `(#:phases
@@ -571,7 +581,7 @@ formats, including zstd, xz, gzip, and bgzf.")
              (substitute* (string-append out "/lib/liblzma.la")
                (("^old_library='liblzma.a'") "old_library=''"))
              #t))))))
-   (outputs '("out" "static" "doc"))
+   (outputs '("out" "static"))
   (inputs
    `(,@(if (%current-target-system)
            `(("bash" ,bash-minimal))
@@ -588,8 +598,6 @@ compression algorithm is currently LZMA2, which is used inside the .xz
 container format.  With typical files, XZ Utils create 30 % smaller output
 than gzip and 15 % smaller output than bzip2.")
   (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
-   (properties
-    `((output-synopsis "doc" "API documentation and example code")))
   (home-page "https://tukaani.org/xz/")))

 (define-public heatshrink
@@ -375,7 +375,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
 (define-public guix-compose
  (package
    (name "guix-compose")
-    (version "0.1.1")
+    (version "0.2.0")
    (source
     (origin
       (method git-fetch)
@@ -384,7 +384,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1ij6rfs5pfykk8c53q029sl2qx3k572dqdfb6pn5s569l6697ci1"))))
+        (base32 "1dy48qkz3ifxagijpvwg7rmq7hz3pikhdcfral6djyc9ppmz8mbm"))))
    (build-system guile-build-system)
    (arguments
     (list
@@ -426,7 +426,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
                 "guile" "-L" "./modules" "-s" "tests/test-compose.scm")))))))
    (native-inputs (list guile-3.0))
    ;; Avoid setting propagated so that we use the user’s profile.
-    (inputs (list guix guile-yamlpp))
+    (inputs (list guix guile-dotenv guile-yamlpp))
    (native-search-paths
     (list $GUIX_EXTENSIONS_PATH))
    (synopsis "Guix' docker compose compatibility layer")
@@ -714,7 +714,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
 (define-public podman
  (package
    (name "podman")
-    (version "5.8.1")
+    (version "5.8.2")
    (outputs '("out" "docker"))
    (properties
     `((output-synopsis "docker" "docker alias for podman")
@@ -727,7 +727,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
             (url "https://github.com/containers/podman")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "1wdsdc0nj4m1v8mn95dhavi87ad0adqmld70da59gvp2abff5f0f"))
+        (base32 "12bmzbfyjsf0mwnam38cw9ib54wj1znh5b7lxzdyll9cvvkhqisr"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -0,0 +1,226 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
+;;; Copyright © 2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages coreboot)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages pciutils)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (srfi srfi-26))
+
+(define %coreboot-version "26.03")
+
+(define %coreboot-origin
+  (origin
+    (method git-fetch)
+    (uri (git-reference
+           (url "https://review.coreboot.org/coreboot")
+           (commit %coreboot-version)))
+    (file-name (git-file-name "coreboot" %coreboot-version))
+    (sha256
+     (base32
+      "0436rr0vibh35phvkxrc939njvrmnfq9xw87y1b0nlllglvq07kk"))))
+
+(define-public bincfg
+  (package
+    (name "bincfg")
+    (version %coreboot-version)
+    (source %coreboot-origin)
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ; no test suite
+      #:make-flags
+      #~(list
+         (string-append "CC=" #$(cc-for-target)))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure) ; no configure script
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/bincfg")))
+          (add-after 'build 'build-binaries
+            (lambda* (#:key make-flags #:allow-other-keys)
+              (for-each
+               (lambda (target result)
+                 (apply invoke "make" (string-append "gen-" target) make-flags)
+                 (rename-file result
+                              (string-append target ".bin")))
+               (list
+                ;; generate GbE for X200
+                "gbe-ich9m"
+                ;; generate GbE for X220/x230
+                "gbe-82579LM"
+                ;; generate IFD for X200
+                "ifd-x200")
+               (list
+                "flashregion_3_gbe.bin"
+                "flashregion_3_gbe.bin"
+                "flashregion_0_fd.bin"))))
+          ;; The Makefile has no install target.
+          (replace 'install
+            (lambda _
+              (let ((bin (string-append #$output "/bin"))
+                    (lib (string-append #$output "/lib/bincfg"))
+                    (data (string-append #$output "/share/bincfg")))
+                ;; Install the program
+                (install-file "bincfg" bin)
+                ;; And its data
+                (for-each
+                 (lambda (path)
+                   (install-file path data))
+                 (append (find-files "." ".*\\.set")
+                         (find-files "." ".*\\.spec")))
+                ;; And the files generated with the data
+                (for-each
+                 (lambda (path)
+                   (install-file path lib))
+                 (find-files "." ".*\\.bin"))))))))
+    (native-inputs (list bison flex))
+    (home-page "https://coreboot.org")
+    (synopsis "Encoder/decoder for binary formats described in text files")
+    (description "
+The bincfg program comes with specifications files for the following binary
+formats:
+@itemize
+@item Various DDR3 and DDR4 SPD
+@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
+@item Configuration data for the Intel Gigabit Ethernet controller present in
+      the Intel ICH9-M chipset.
+@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
+@item Configuration data for the ITE IT8718F SuperIO
+@end itemize
+It also comes with example files generated by bincfg.")
+    (license license:gpl3+)))
+
+(define-public ifdtool
+  (package
+    (name "ifdtool")
+    (version %coreboot-version)
+    (source %coreboot-origin)
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              "INSTALL=install"
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/ifdtool")))
+          (delete 'configure))           ; no configure script
+      #:tests? #f))                    ; no test suite
+    (home-page "https://doc.coreboot.org/util/ifdtool/")
+    (synopsis "Intel Firmware Descriptor dumper")
+    (description "This package provides @command{ifdtool}, a program to
+dump Intel Firmware Descriptor data of an image file.")
+    (license license:gpl2)))
+
+(define-public intelmetool
+  (package
+    (name "intelmetool")
+    (version %coreboot-version)
+    (source %coreboot-origin)
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f                       ;no test suite
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              "INSTALL=install"
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/intelmetool")))
+          (delete 'configure) ;no configure script
+          (delete 'check))))
+    (inputs (list pciutils zlib))
+    (home-page
+     "https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
+    (synopsis "Intel Management Engine tools")
+    (description "This package provides tools for working with Intel
+Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
+@code{sudo rmmod mei} before using this tool.  Also pass
+@code{iomem=relaxed} to the Linux kernel command line.")
+    (license license:gpl2)
+
+    ;; This is obviously an Intel thing, plus it requires <cpuid.h>.
+    (supported-systems '("x86_64-linux" "i686-linux"))))
+
+(define-public nvramtool
+  (package
+    (name "nvramtool")
+    (version %coreboot-version)
+    (source %coreboot-origin)
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ; no test suite
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              "INSTALL=install"
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/nvramtool")))
+          (delete 'configure)))) ; no configure script
+    (home-page "https://coreboot.org")
+    (synopsis "Command line tool that can edit Coreboot settings")
+    (description "@command{nvramtool} can see and/or modify Coreboot settings
+like the serial port speed, log level, etc.  It requires Coreboot to be compiled
+with CONFIG_USE_OPTION_TABLE and some options require the iomem=relaxed kernel
+command line to work.  Features:
+@itemize
+@item If Coreboot was compiled without CONFIG_STATIC_OPTION_TABLE, it can change
+      its settings, which are applied after a reboot.
+@item It can modify Coreboot images  default settings with
+      @command{nvramtool -C coreboot.rom [...]}.
+@item It has various options related to the file format used to store these
+      settings.
+@item It can also read/write the CMOS memory where the Coreboot settings can be
+      located.
+@end itemize")
+    ;; Some files are "GPL-2.0-only or BSD-3-Clause", other are GPL-2.0-only
+    ;; and anyway there is. There is also a license declaration in
+    ;; cli/nvramtool.8 that applies to "This program" which uses the GPLv2.
+    (license license:gpl2)))
@@ -683,38 +683,6 @@ computer program to introspect and modify an object at runtime.  It is also
 the name of the library itself, which is written in C++.")
    (license license:expat)))

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

@@ -567,15 +557,16 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                        (srfi srfi-26))
             ,@(package-arguments glibc/hurd-headers))
         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'set-cross-headers-path
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let* ((mach (assoc-ref inputs "gnumach-headers"))
-                         (hurd (assoc-ref inputs "hurd-headers"))
-                         (cpath (string-append mach "/include:"
-                                               hurd "/include")))
-                    (for-each (cut setenv <> cpath)
-                              '#$%gcc-cross-include-paths))))))
+          `(modify-phases ,phases
+             (add-after 'unpack 'set-cross-headers-path
+               (lambda* (#:key inputs #:allow-other-keys)
+                 (let* ((mach (assoc-ref inputs "gnumach-headers"))
+                        (hurd (assoc-ref inputs "hurd-headers"))
+                        (cpath (string-append mach "/include:"
+                                              hurd "/include")))
+                   (for-each (cut setenv <> cpath)
+                             ',%gcc-cross-include-paths)
+                   #t)))))
         ((#:configure-flags flags)
          `(cons* ,(string-append "--build=" (%current-system))
                  ,(string-append "--host=" target)
@@ -690,78 +681,80 @@ returned."
      (name (string-append "glibc-cross-" target))
      (arguments
       (substitute-keyword-arguments
-           `(;; Disable stripping (see above.)
-             #:strip-binaries? #f
+         `(;; Disable stripping (see above.)
+           #:strip-binaries? #f

-                               ;; This package is used as a target input, but it should not have
-                               ;; the usual cross-compilation inputs since that would include
-                               ;; itself.
-                               #:implicit-cross-inputs? #f
+           ;; This package is used as a target input, but it should not have
+           ;; the usual cross-compilation inputs since that would include
+           ;; itself.
+           #:implicit-cross-inputs? #f

-                               ;; We need SRFI 26.
-                               #:modules ((guix build gnu-build-system)
-                                          (guix build utils)
-                                          (srfi srfi-26))
+           ;; We need SRFI 26.
+           #:modules ((guix build gnu-build-system)
+                      (guix build utils)
+                      (srfi srfi-26))

-                               ,@(package-arguments libc))
-         ((#:configure-flags flags)
-          #~(cons #$(string-append "--host=" target)
-                  #$(if (target-hurd? target)
-                        #~(append (list "--disable-werror")
-                                  #$flags)
+               ,@(package-arguments libc))
+           ((#:configure-flags flags)
+            `(cons ,(string-append "--host=" target)
+                   ,(if (target-hurd? target)
+                        `(append (list "--disable-werror")
+                                 ,flags)
                        flags)))
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-before 'configure 'set-cross-kernel-headers-path
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let* ((kernel (assoc-ref inputs "kernel-headers"))
-                         (cpath (string-append kernel "/include")))
-                    (for-each (cut setenv <> cpath)
-                              '#$%gcc-cross-include-paths)
-                    (setenv "CROSS_LIBRARY_PATH"
-                            (string-append kernel "/lib"))))) ; for Hurd's libihash
-              (add-before 'configure 'add-cross-binutils-to-PATH
-                (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                  ;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc
-                  ;; -print-prog-name=objdump' returns the correct name.  See
-                  ;; <https://inbox.sourceware.org/libc-alpha/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/>.
-                  (define cross-objdump
-                    (search-input-file
-                     (or native-inputs inputs)
-                     (string-append #$target "/bin/objdump")))
+           ((#:phases phases)
+            `(modify-phases ,phases
+               (add-before 'configure 'set-cross-kernel-headers-path
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let* ((kernel (assoc-ref inputs "kernel-headers"))
+                          (cpath (string-append kernel "/include")))
+                     (for-each (cut setenv <> cpath)
+                               ',%gcc-cross-include-paths)
+                     (setenv "CROSS_LIBRARY_PATH"
+                             (string-append kernel "/lib")) ; for Hurd's libihash
+                     #t)))
+               (add-before 'configure 'add-cross-binutils-to-PATH
+                 (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                   ;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc
+                   ;; -print-prog-name=objdump' returns the correct name.  See
+                   ;; <https://inbox.sourceware.org/libc-alpha/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/>.
+                   (define cross-objdump
+                     (search-input-file
+                      (or native-inputs inputs)
+                      (string-append ,target "/bin/objdump")))

-                  (define cross-binutils
-                    (dirname cross-objdump))
+                   (define cross-binutils
+                     (dirname cross-objdump))

-                  (format #t "adding '~a' to the front of 'PATH'~%"
-                          cross-binutils)
-                  (setenv "PATH" (string-append cross-binutils ":"
-                                                (getenv "PATH")))))
+                   (format #t "adding '~a' to the front of 'PATH'~%"
+                           cross-binutils)
+                   (setenv "PATH" (string-append cross-binutils ":"
+                                                 (getenv "PATH")))))

-              ;; This phase would require running 'localedef' built for
-              ;; TARGET, which is impossible by definition.
-              (delete 'install-utf8-c-locale)
+               ;; This phase would require running 'localedef' built for
+               ;; TARGET, which is impossible by definition.
+               (delete 'install-utf8-c-locale)

-              #$@(if (target-hurd? target)
-                     #~((add-after 'install 'augment-libc.so
-                          (lambda _
-                            (substitute* (string-append #$output "/lib/libc.so")
-                              (("/[^ ]+/lib/libc.so.0.3")
-                               (string-append #$output "/lib/libc.so.0.3"
-                                              " libmachuser.so libhurduser.so")))))
-                        (add-after 'install 'create-machine-symlink
-                          (lambda _
-                            (let ((cpu #$(match target
-                                           ((? target-x86-32?)
-                                            "i386")
-                                           ((? target-x86-64?)
-                                            "x86_64")))
+               ,@(if (target-hurd? target)
+                     `((add-after 'install 'augment-libc.so
+                         (lambda* (#:key outputs #:allow-other-keys)
+                           (let ((out (assoc-ref outputs "out")))
+                             (substitute* (string-append out "/lib/libc.so")
+                               (("/[^ ]+/lib/libc.so.0.3")
+                                (string-append out "/lib/libc.so.0.3"
+                                               " libmachuser.so libhurduser.so"))))))
+                       (add-after 'install 'create-machine-symlink
+                         (lambda* (#:key outputs #:allow-other-keys)
+                           (let* ((out (assoc-ref outputs "out"))
+                                  (cpu ,(match target
+                                          ((? target-x86-32?)
+                                           "i386")
+                                          ((? target-x86-64?)
+                                           "x86_64")))
                                  (machine (string-append
-                                            #$output
-                                            "/include/mach/machine")))
-                              (unless (file-exists? machine)
-                                (symlink cpu machine))))))
-                     #~())))))
+                                            out "/include/mach/machine")))
+                             (unless (file-exists? machine)
+                               (symlink cpu machine))))))
+                     '())))))

      ;; Shadow the native "kernel-headers" because glibc's recipe expects the
      ;; "kernel-headers" input to point to the right thing.
@@ -1688,14 +1688,14 @@ structure.  However CryFS is not considered stable yet by the developers.")
 (define-public b3sum
  (package
    (name "b3sum")
-    (version "1.8.2")
+    (version "1.8.4")
    (source
      (origin
        (method url-fetch)
        (uri (crate-uri "b3sum" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-         (base32 "06qc6iv574km4j1ja4qhxyai680jkll58qzpz4mb79c0rk750dpd"))))
+         (base32 "0pkra5zh680cl9q92hpzmg9flz99b06bhpg7jyhymg1nkm0anw7a"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -69,6 +69,7 @@
 ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
 ;;; Copyright © 2025 bdunahu <bdunahu@operationnull.com>
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
+;;; Copyright © 2026 Peter Polidoro <peter@polidoro.io>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1545,17 +1546,17 @@ and high-availability (HA).")
    (license license:gpl2)))                  ;'COPYING' says "version 2" only

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

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

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

 (define-public postgresql postgresql-14)

@@ -1691,7 +1727,7 @@ pictures, sounds, or video.")
 (define-public timescaledb
  (package
    (name "timescaledb")
-    (version "2.16.1")
+    (version "2.26.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1700,7 +1736,7 @@ pictures, sounds, or video.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
+                "0zfm224jyz874pk4r9qlz5c2mn1xjvairhxh6widlbh3mn62m3j8"))
              (modules '((guix build utils)))
              (snippet
               ;; Remove files carrying the proprietary TIMESCALE license.
@@ -1710,8 +1746,7 @@ pictures, sounds, or video.")
                            '("scripts/c_license_header-timescale.h"
                              "scripts/license_tsl.spec"
                              "scripts/sql_license_tsl.sql"
-                              "test/perl/AccessNode.pm"
-                              "test/perl/DataNode.pm"
+                              "test/t/001_replication_telemetry.pl"
                              "test/perl/TimescaleNode.pm"))))))
    (build-system cmake-build-system)
    (arguments
@@ -1795,7 +1830,7 @@ pictures, sounds, or video.")
                 (lambda* (#:rest args)
                   (apply (assoc-ref gnu:%standard-phases 'check)
                          #:test-target "regresschecklocal" args))))))
-    (inputs (list openssl postgresql))
+    (inputs (list openssl postgresql-17))
    (home-page "https://www.timescale.com/")
    (synopsis "Time-series extension for PostgreSQL")
    (description
@@ -3044,7 +3079,7 @@ temporary directory, and destroys it when the perl script exits.")
 (define-public unixodbc
  (package
   (name "unixodbc")
-   (version "2.3.9")
+   (version "2.3.14")
   (source (origin
            (method url-fetch)
            (uri
@@ -3052,7 +3087,7 @@ temporary directory, and destroys it when the perl script exits.")
              "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-"
              version ".tar.gz"))
            (sha256
-             (base32 "01xj65d02i3yjy7p9z08y9jakcs5szmz4rask868n7387nn3x0sj"))))
+             (base32 "0wa7a82h5dsba23155gfhh1sp4dsbaxq6pppp6q31z017vg18a2f"))))
   (build-system gnu-build-system)
   (synopsis "Data source abstraction library")
   (description "Unixodbc is a library providing an API with which to access
@@ -3062,6 +3097,64 @@ Driver.")
   ;; COPYING contains copy of lgpl2.1 - but copyright notices just say "LGPL"
   (home-page "https://www.unixodbc.org")))

+(define-public sqliteodbc
+  (package
+    (name "sqliteodbc")
+    (version "0.99991")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.ch-werner.de/sqliteodbc/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0p4avhqxnd2l49g3vpzwrmdi8wxyqzy0vswalaagmqfdsfwav52d"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f                      ; no check target
+      #:configure-flags
+      #~(list "--disable-static"
+              (string-append "--with-sqlite3=" #$(this-package-input "sqlite"))
+              (string-append "--with-odbc=" #$(this-package-input "unixodbc")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'create-lib-directory
+            (lambda _
+              (mkdir-p (string-append #$output "/lib"))))
+          (add-after 'install 'remove-extra-sqlite-extensions
+            (lambda _
+              ;; Keep this package focused on the ODBC driver itself.
+              (for-each delete-file
+                        (find-files (string-append #$output "/lib")
+                                    "^libsqlite3_mod_.*\\.(la|so)$"))))
+          (add-after 'install 'install-odbcinst.ini
+            (lambda _
+              (let ((dir (string-append #$output "/share/sqliteodbc")))
+                (mkdir-p dir)
+                (call-with-output-file (string-append dir "/odbcinst.ini")
+                  (lambda (port)
+                    (display
+                     (string-append
+                      "[SQLite3]\n"
+                      "Description = SQLite3 ODBC Driver\n"
+                      "Driver      = " #$output "/lib/libsqlite3odbc.so\n"
+                      "Setup       = " #$output "/lib/libsqlite3odbc.so\n"
+                      "Threading   = 2\n")
+                     port)))))))))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "ODBCSYSINI")
+            (files '("share/sqliteodbc"))
+            (separator #f))))
+    (inputs (list sqlite unixodbc))
+    (home-page "http://www.ch-werner.de/sqliteodbc/")
+    (synopsis "ODBC driver for SQLite")
+    (description
+     "SQLiteODBC provides an ODBC driver for SQLite 3 databases.  It installs
+the shared library and a driver registration file so applications using
+unixODBC can resolve the @code{SQLite3} driver name from a Guix profile.")
+    (license license:tcl/tk)))
+
 (define-public nanodbc
  (package
    (name "nanodbc")
@@ -113,7 +113,14 @@
                     (for-each (lambda (x)
                                 (install-file x "aclocal"))
                               (find-files "aclocal_java"))
-                     (apply (assq-ref %standard-phases 'bootstrap) arguments))))
+                     (apply (assq-ref %standard-phases 'bootstrap) arguments)
+                     (let ((automake-files (search-input-directory
+                                            (or native-inputs inputs)
+                                            "share/automake-1.16")))
+                       (define (replace file)
+                         (symlink (string-append automake-files "/" file) file))
+                       (for-each replace '("config.sub" "config.guess"
+                                           "install-sh"))))))
               #$@(if (or (target-arm?)
                          (target-riscv64?))
                      #~((add-after 'unpack 'bdb-configure-patch
@@ -195,7 +202,14 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
                     (for-each (lambda (x)
                                 (install-file x "aclocal"))
                               (find-files "aclocal_java"))
-                     (apply (assq-ref %standard-phases 'bootstrap) arguments))))
+                     (apply (assq-ref %standard-phases 'bootstrap) arguments)
+                     (let ((automake-files (search-input-directory
+                                            (or native-inputs inputs)
+                                            "share/automake-1.16")))
+                       (define (replace file)
+                         (symlink (string-append automake-files "/" file) file))
+                       (for-each replace '("config.sub" "config.guess"
+                                           "install-sh"))))))
               (add-before 'configure 'pre-configure
                 (lambda _
                   (chdir "dist")
@@ -20,18 +20,6 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

@@ -79,7 +79,7 @@
 (define-public diffoscope
  (package
    (name "diffoscope")
-    (version "315")
+    (version "317")
    (source
     (origin
       (method git-fetch)
@@ -88,7 +88,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1q2q60hw36d1capqdrg6gp2220dg87bmxgmk52m7yml4xw13zi2p"))))
+        (base32 "13r96c49wrpx0xa8bbkki832w58gjdgqb4khjsaawk5mb5yv4c39"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1231,7 +1231,7 @@ passphrases.")
 (define-public ndctl
  (package
    (name "ndctl")
-    (version "78")
+    (version "84")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1240,7 +1240,7 @@ passphrases.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0rhmxjajxxslsikixlf9cdg5vcn42h7zzqkqj5p5pshxch368kn0"))))
+                "0jal7w4mk5l5j0qfays27kya8n1h2qwkncl0s317rfxp56bkjp6y"))))
    (build-system meson-build-system)
    (arguments
     ;; The test suite runs but SKIPs all tests: do not consider this tested!
@@ -51,7 +51,7 @@
 (define-public boinc-client
  (package
    (name "boinc-client")
-    (version "8.2.8")
+    (version "8.2.9")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -62,7 +62,7 @@
              (file-name (git-file-name "boinc" version))
              (sha256
               (base32
-                "1ppcf57p6dkv9dv5k90fj3xhbv9di2d3yjkg2flfv5d45s82lay8"))))
+                "0ik9423ii6kal29jdn907pxy8w86zpi8n158qx1gcsh8lsaif1v5"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -549,6 +549,7 @@ when coding custom template tags.")
       (uri (git-reference
             (url "https://github.com/jazzband/django-taggit")
             (commit version)))
+       (file-name (git-file-name name version))
       (sha256
        (base32
         "1i8an3wcl7nygl5f565jcpyhyws9gabawazggxpf6m3vklxn3cj0"))))
@@ -709,13 +710,13 @@ your code.")
 (define-public python-django-filter
  (package
    (name "python-django-filter")
-    (version "25.1")
+    (version "25.2")
    (source (origin
              (method url-fetch)
              (uri (pypi-uri "django_filter" version))
              (sha256
               (base32
-                "0lvi82f3dnj89ip8hry8fq8w7x632r5p84dlr451rnm8izsfxj8y"))))
+                "08wgzqirabxzcdhh0wvv45hqr6dqxy3ifm7mjv86hi0zjd59h3kn"))))
    (build-system pyproject-build-system)
    (arguments
     '(#:phases
@@ -75,7 +75,8 @@
       (uri (string-append "https://github.com/ldc-developers/ldc/releases"
                           "/download/v" version "/ldc-" version "-src.tar.gz"))
       (sha256
-        (base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))))
+        (base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))
+       (patches (search-patches "ldc-i686-int128-alignment.patch"))))
    (build-system cmake-build-system)
    (arguments
     `(#:disallowed-references (,tzdata-for-tests)
@@ -107,9 +108,7 @@
           (lambda _
             (invoke "cmake" "--install" "."))))))
    (inputs
-     `(("libconfig" ,libconfig)
-       ("libedit" ,libedit)
-       ("zlib" ,zlib)))
+     `(("zlib" ,zlib)))
    (native-inputs
     `(("lld-wrapper" ,(make-lld-wrapper lld-17 #:lld-as-ld? #t))
       ("llvm" ,llvm-17)
@@ -372,6 +371,7 @@ integration tests...\n")
              ;; Do not build the shared libphobos2.so library, to avoid
              ;; retaining a reference to gcc:lib.
              "SHARED=0"
+              "DIFFABLE=1"              ;constant timestamp
              "VERBOSE=1")
      #:modules
      `(,@%default-gnu-modules
@@ -476,6 +476,15 @@ integration tests...\n")
              (phase-in-sub-dir 'build "dmd"))
            (add-after 'build 'build-phobos
              (phase-in-sub-dir 'build "phobos"))
+            (add-after 'build-phobos 'build-man
+              (lambda* (#:key make-flags #:allow-other-keys)
+                (with-directory-excursion "dmd/compiler/docs"
+                  (let ((dmd (or (which "gdmd")
+                                 (which "dmd"))))
+                    ((assoc-ref %standard-phases 'build)
+                     #:make-flags (cons
+                                   (string-append "DMD=" dmd)
+                                   make-flags))))))
            (replace 'check
              (phase-in-sub-dir 'check "dmd"))
            (add-after 'check 'check-phobos
@@ -501,7 +510,7 @@ integration tests...\n")
                      (for-each (cut install-file <> lib-lib)
                                (find-files "." "^libdruntime\\.so[.0-9]*$")))
                    (copy-recursively "druntime/import" out-include)
-                    (copy-recursively "compiler/docs/man" out-man))
+                    (copy-recursively "generated/docs/man" out-man))
                  (with-directory-excursion "phobos"
                    (with-directory-excursion build-sub-dir
                      (install-file "libphobos2.a" out-lib)
@@ -676,6 +685,7 @@ needed.")
                 (lambda* (#:key tests? #:allow-other-keys)
                   (when tests?
                     (invoke "bin/rdmd" "rdmd_test.d" "bin/rdmd"
+                             "-m" (if #$(target-64bit?) "64" "32")
                             "--rdmd-default-compiler" "ldmd2"))))
               (replace 'install
                 (lambda* (#:key outputs #:allow-other-keys)
@@ -1,12 +1,13 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015-2018, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2016 Nikita <nikita@n0.is>
 ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2019-2021 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
 ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
@@ -21,9 +22,11 @@
 ;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,12 +49,12 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages check)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages databases)
-  #:use-module (gnu packages documentation)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages databases)
  #:use-module (gnu packages datastructures)
+  #:use-module (gnu packages documentation)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages freedesktop)
@@ -65,6 +68,7 @@
  #:use-module (gnu packages libidn)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages lua)
+  #:use-module (gnu packages m4)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages nettle)
  #:use-module (gnu packages networking)
@@ -73,6 +77,8 @@
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages protobuf)
  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages ragel)
  #:use-module (gnu packages serialization)
@@ -84,17 +90,175 @@
  #:use-module (gnu packages web)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages)
-  #:use-module (guix gexp)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix utils)
+  #:use-module (guix build-system cmake)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system meson))
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
+  #:use-module (guix utils))
+
+(define-public adns
+  (package
+    (name "adns")
+    (version "1.6.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
+              (commit (string-append "adns-" version))))
+       (sha256
+        (base32
+         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      ;; INFO: Tests expect real name resolution to work.
+      #:tests? #f
+      #:configure-flags
+      #~(list
+         ;; Make sure the programs under bin/ find libadns.so.
+         (string-append "LDFLAGS=-Wl,-rpath -Wl,"
+                        #$output:out
+                        "/lib"))))
+    (native-inputs
+     (list m4))
+    (home-page "https://www.gnu.org/software/adns/")
+    (synopsis "Asynchronous DNS client library and utilities")
+    (description
+     "GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
+Name System} resolution functionality.  The library is asynchronous, allowing
+several concurrent calls.  The package also includes several command-line
+utilities for use in scripts.")
+    (license license:gpl3+)))
+
+(define-public c-ares
+  (package
+    (name "c-ares")
+    (version "1.34.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/c-ares/c-ares/releases/download/v"
+             version "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'filter-live-tests
+            (lambda _
+              ;; Filter tests that require internet access.
+              (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
+          #$@(if (system-hurd?)
+                 #~((add-after 'unpack 'skip-tests
+                      (lambda _
+                        (substitute* "test/ares-test-main.cc"
+                          (("(^| )main *\\(.*" all)
+                           (string-append all "  exit (77);\n")))))
+                    (add-after 'filter-live-tests 'filter-hurd-tests
+                      (lambda _
+                        (setenv "GTEST_FILTER"
+                                (string-append
+                                 (getenv "GTEST_FILTER")
+                                 ":.*Basic/2"
+                                 ":.*CancelImmediate/2"
+                                 ":.*CancelImmediateGetHostByAddr/2"
+                                 ":.*CancelLater/1"
+                                 ":.*FamilyUnspecified/2"
+                                 ":.*FamilyV6/2"
+                                 ":.*GetAddrInfoParallelLookups/1"
+                                 ":.*GetHostByAddrDestroy/2"
+                                 ":.*GetHostByNameCNAMENoData/2"
+                                 ":.*GetHostByNameDestroyAbsolute/2"
+                                 ":.*GetHostByNameDestroyRelative/2"
+                                 ":.*GetHostByNameParallelLookups/1"
+                                 ":.*HostAlias/2"
+                                 ":.*HostAliasMissing/2"
+                                 ":.*HostAliasMissingFile/2"
+                                 ":.*NotImplResponse/2"
+                                 ":.*RefusedResponse/2"
+                                 ":.*Resend/1"
+                                 ":.*RetryWithoutEDNS/2"
+                                 ":.*SearchDomains/2"
+                                 ":.*SearchDomainsBare/2"
+                                 ":.*SearchDomainsServFailOnAAAA/2"
+                                 ":.*SearchDomainsWithResentReply/1"
+                                 ":.*SearchHighNdots/2"
+                                 ":.*SearchNoDataThenFail/2"
+                                 ":.*SearchNoDataThenNoDataBare/2"
+                                 ":.*SearchNoDataThenSuccess/2"
+                                 ":.*ServFailResponse/2"
+                                 ":.*SimpleQuery/2"
+                                 ":.*SockCallback/2"
+                                 ":.*SockConfigureCallback/2"
+                                 ":.*SortListV4/2"
+                                 ":.*SortListV6/2"
+                                 ":.*ThirdServer/2"
+                                 ":.*TruncationRetry/1"
+                                 ":.*UnspecifiedFamilyCname6A4/2"
+                                 ":.*UnspecifiedFamilyV4/2"
+                                 ":.*UnspecifiedFamilyV6/2")))))
+                 #~()))))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://c-ares.haxx.se/")
+    (synopsis "C library for asynchronous DNS requests")
+    (description
+     "C-ares is a C library that performs DNS requests and name resolution
+asynchronously.  It is intended for applications which need to perform DNS
+queries without blocking, or need to perform multiple DNS queries in parallel.
+The primary examples of such applications are servers which communicate with
+multiple clients and programs with graphical user interfaces.")
+    (license (license:x11-style "https://c-ares.haxx.se/license.html"))))
+
+(define-public c-ares-for-node-lts
+  (hidden-package c-ares))
+
+(define-public c-ares-for-node-bootstrap
+  (hidden-package
+   (package
+     (inherit c-ares)
+     (version "1.18.1")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+              "https://c-ares.haxx.se/download/c-ares-" version
+              ".tar.gz"))
+        (sha256
+         (base32
+          "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
+
+;; INFO: gRPC requires a c-ares built with CMake in order to get the .cmake
+;; modules.  We can not build c-ares itself with CMake because that would
+;; introduce a circular dependency through nghttp2.
+;;
+;; TODO: It would be nice if we could extract the modules somehow and make
+;; them work with the "normal" c-ares package instead of building a whole new
+;; library.
+(define-public c-ares/cmake
+  (hidden-package
+   (package
+     (inherit c-ares)
+     (build-system cmake-build-system)
+     (arguments
+      (list
+       ;; INFO: Tests require name resolution (the normal variant runs no
+       ;; tests).
+       #:tests? #f)))))

 (define-public cloudflare-cli
  (let ((commit "2d986d3ec1b0e3158c4bd40e8918947cb74aa392")
@@ -143,6 +307,58 @@ protocol.")
      (home-page "https://github.com/earlchew/cloudflare-cli")
      (license license:expat))))

+(define-public ddclient
+  (package
+    (name "ddclient")
+    (version "4.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ddclient/ddclient")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0sz4f7qx4yjg6q6ybhzilb7f0kshz46c54y3i4hq2nww2bhkc8a4"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'bootstrap 'patch-ddclient.in-shebang
+            (lambda _
+              ;; This is run in the bootstrap phase, so patch before
+              (patch-shebang "ddclient.in")))
+          (add-after 'install 'wrap-program
+            (lambda* (#:key inputs #:allow-other-keys)
+              (wrap-program (string-append #$output "/bin/ddclient")
+                `("PERL5LIB" ":" prefix
+                  ,(map (lambda (input-name)
+                          (string-append (assoc-ref inputs input-name)
+                                         "/lib/perl5/site_perl"))
+                        '("perl-json")))))))))
+    (native-inputs
+     (list autoconf
+           automake
+           perl-http-daemon
+           perl-plack
+           perl-test-mockmodule
+           perl-test-tcp
+           perl-test-warnings))
+    (inputs
+     (list curl
+           perl
+           perl-json
+           bash-minimal))
+    (home-page "https://github.com/ddclient/ddclient")
+    (synopsis "Dynamic DNS update client")
+    (description
+     "ddclient is used to update dynamic DNS entries for accounts on many
+dynamic DNS services.  It supports a wide range of routers and protocols,
+including Cloudflare, Namecheap, DynDNS, FreeDNS, Google Domains, and many
+more.")
+    (license license:gpl2+)))
+
 (define-public ldns
  (package
    (name "ldns")
@@ -295,35 +511,37 @@ prompt the user with the option to go with insecure DNS only.")
 (define-public dnsmasq
  (package
    (name "dnsmasq")
-    (version "2.90")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-"
-                    version ".tar.xz"))
-              (sha256
-               (base32
-                "1r09l537vi867hlpv6vl7nvqhscvq1kf04m896bfrgrpv2dk0l4f"))))
+    (version "2.92")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "http://thekelleys.org.uk/git/dnsmasq.git")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "055gn5kigz0m9y09vig97s1g257hnlkhw4wv9d9wdficnsxcbwwm"))))
    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no tests
+      #:make-flags
+      #~(list (string-append "PREFIX=" #$output)
+              (string-append "CC=" #$(cc-for-target))
+              (string-append "PKG_CONFIG=" #$(pkg-config-for-target))
+              "COPTS=\"-DHAVE_DBUS\"")
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure) ;no configure
+          (add-after 'install 'install-dbus
+            (lambda _
+              (install-file "dbus/dnsmasq.conf"
+                            (string-append #$output "/etc/dbus-1/system.d")))))))
    (native-inputs
     (list pkg-config))
    (inputs
     (list dbus))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-after 'install 'install-dbus
-           (lambda _
-             (install-file "dbus/dnsmasq.conf"
-                           (string-append %output "/etc/dbus-1/system.d")))))
-
-       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
-                          (string-append "CC=" ,(cc-for-target))
-                          (string-append "PKG_CONFIG=" ,(pkg-config-for-target))
-                          "COPTS=\"-DHAVE_DBUS\"")
-       #:tests? #f))                    ; no ‘check’ target
-    (home-page "https://www.thekelleys.org.uk/dnsmasq/doc.html")
+    (home-page "https://thekelleys.org.uk/dnsmasq/doc.html")
    (synopsis "Small caching DNS proxy and DHCP/TFTP server")
    (description
     "Dnsmasq is a light-weight DNS forwarder and DHCP server.  It is designed
@@ -336,6 +554,39 @@ and BOOTP/TFTP for network booting of diskless machines.")
    ;; Source files only say GPL2 and GPL3 are allowed.
    (license (list license:gpl2 license:gpl3))))

+(define-public dnsupdate
+  (package
+    (name "dnsupdate")
+    (version "0.4.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/lopsided98/dnsupdate")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0bp6mm0yhg4hs698xdmvcfad4jqf5rgb1cab88pfzyx9w52x0ag6"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:test-backend #~'unittest
+           #:test-flags #~'("discover" "-p" "*_test.py")))
+    (native-inputs
+     (list python-setuptools))
+    (propagated-inputs
+     (list python-beautifulsoup4
+           python-netifaces
+           python-pyyaml
+           python-requests))
+    (home-page "https://github.com/lopsided98/dnsupdate")
+    (synopsis "Modern and flexible dynamic DNS client")
+    (description
+     "Dnsupdate is a dynamic DNS client that provides support for multiple DNS
+services, including Afraid.org FreeDNS, Cloudflare, IETF standard DNS
+updates (nsupdate), and custom HTTP-based services.  It uses YAML
+configuration files and supports multiple address detection methods.")
+    (license license:gpl3+)))
+
 ;; 'bind' is the name of a built-in Guile procedure, which is why we choose a
 ;; different name here.
 (define-public isc-bind
@@ -70,6 +70,7 @@
  #:use-module (gnu packages qt)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages sphinx)
+  #:use-module (gnu packages tex)
  #:use-module (gnu packages uglifyjs)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg))
@@ -108,10 +109,13 @@
                          #$output)
                         (("\\$cfg\\{'TMPSPACE'\\} = q'[^']*'")
                          "$cfg{'TMPSPACE'} = q'/tmp'")))))))
+    (propagated-inputs (list texlive-preview texlive-xcolor texlive-dvips))
    (inputs (list perl netpbm ghostscript))
    (synopsis "LaTeX documents to HTML")
    (description "LaTeX2HTML is a utility that converts LaTeX documents to web
-pages in HTML.")
+pages in HTML.  Since there are many different latex packages, it is expected
+that the user has their latex installation set up correctly when invoking
+@code{latex2html}.")
    (home-page "https://www.latex2html.org/")
    (license license:gpl2+)))

@@ -148,13 +148,13 @@ system.")
 (define-public r-duckdb
  (package
    (name "r-duckdb")
-    (version "1.4.4")
+    (version "1.5.1")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "duckdb" version))
       (sha256
-        (base32 "1hch36v3lsymnx30lv3cjy12gs3v3mhd44ha97l7w9mwp9wbzmxl"))
+        (base32 "177621m08whqqk4yhj3zrr08l3d9hhlqh3gm9jzhi5cplg47cksq"))
       ;; 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.
@@ -179,10 +179,12 @@ system.")
                         r-dplyr
                         r-remotes
                         r-rlang
+                         r-sf
                         r-testthat
                         r-tibble
                         r-vctrs
                         r-withr
+                         r-wk
                         tzdata-for-tests))
    (home-page "https://r.duckdb.org/")
    (synopsis "DBI package for the DuckDB database management system")
@@ -4,7 +4,7 @@
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2018-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
 ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -385,7 +385,7 @@ not have any other specialized device.")
 (define-public openboard
  (package
    (name "openboard")
-    (version "1.7.3")
+    (version "1.7.7")
    (source
     (origin
       (method git-fetch)
@@ -394,7 +394,7 @@ not have any other specialized device.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1098pys5p82sx97xrhw54vlkn6jly0rhq8b09grmmx2h4mcpj2i2"))))
+        (base32 "1i27h84p77pl1chw791fjs3vyzsjvsqc9ky2mbw7g8xpzxz1nd9j"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -240,8 +240,8 @@ are also taken from the original.")
      (license license:gpl3+))))

 (define-public abc
-  (let ((commit "c18b9a24de46d3b0209afa416511b7a1127344f9")
-        (revision "9"))
+  (let ((commit "80c8a9a1928ef8148a6b504e9590ec07c55c8bcf")
+        (revision "10"))
    (package
      (name "abc")
      (version (git-version "0.0" revision commit))
@@ -253,7 +253,7 @@ are also taken from the original.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "12fjhlr9r34l6kw2jyaalh53fs783r1h2zx0ldzaxxrbcslb0bxh"))))
+                  "1fbnwsd841z86vfv45443qfpx0l199vf08sgms8wyz19jw7m5ds6"))))
      (build-system gnu-build-system)
      (inputs
       (list readline))
@@ -278,7 +278,7 @@ formal verification.")
  (package
    (inherit abc)
    (name "abc-yosyshq")
-    (version "0.63")
+    (version "0.64")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -287,7 +287,7 @@ formal verification.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1nwj4zhjqjgvb7fh877j51kfccwzrc591ag25qm9jirycgq1cqx6"))))
+                "1jk74yq7dnrnai8r9hqc10jcjmgj50jxj6hsflmvc61acm1r3f8r"))))
    (home-page "https://github.com/YosysHQ/abc/")
    (description "ABC is a program for sequential logic synthesis and
 formal verification.  This is the Yosyshq fork of ABC.")
@@ -296,7 +296,7 @@ formal verification.  This is the Yosyshq fork of ABC.")
 (define-public apycula
  (package
    (name "apycula")
-    (version "0.31")
+    (version "0.32")
    ;; The pypi tar.gz file includes the necessary .pickle files, not available
    ;; in the home-page repository.
    (source
@@ -304,7 +304,7 @@ formal verification.  This is the Yosyshq fork of ABC.")
       (method url-fetch)
       (uri (pypi-uri "apycula" version))
       (sha256
-        (base32 "0pf43cd071kv5ann78hl5qrcj9vhndr46ds2g12sgnfjfvh6pfpg"))))
+        (base32 "0zz6mz1s7razbqsysaji7qwfsjj19av4mg7zclxaigz4hmq9ar0d"))))
    (build-system pyproject-build-system)
    (arguments
     (list #:tests? #f ;requires Gowin EDA tools
@@ -467,7 +467,7 @@ individual low-level driver modules.")
 (define-public eqy
  (package
    (name "eqy")
-    (version "0.63")
+    (version "0.64")
    (source
     (origin
       (method git-fetch)
@@ -476,7 +476,7 @@ individual low-level driver modules.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05rk6gy0xnaksxqdkpm08i3ngh0adavfyfjyscw5l1b7d7yhfavh"))))
+        (base32 "1lsf8wm10wq67lmwz1ck30inl3byfy27ya39fj93gym5ys815ma6"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1069,7 +1069,7 @@ characterization result in a liberty library file.")
 (define-public kicad
  (package
    (name "kicad")
-    (version "10.0.0")
+    (version "10.0.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1077,7 +1077,7 @@ characterization result in a liberty library file.")
                    (commit version)))
              (sha256
               (base32
-                "1470x1276yvd8li3w25zjg73fkpl2qp4dsx7adanafq5c4l47rmc"))
+                "1mnlv8fyz03pfg8pkqwdl5gjz6vsk98c6414lf3wkvrkb85ljaav"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -1185,7 +1185,9 @@ characterization result in a liberty library file.")
     "Kicad is a program for the formation of printed circuit
 boards and electrical circuits.  The software has a number of programs that
 perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
-electrical diagrams), gerbview (viewing Gerber files) and others.")
+electrical diagrams), gerbview (viewing Gerber files) and others.  To use
+SQLite-backed database libraries, install the optional @code{sqliteodbc}
+package.")
    (license license:gpl3+)))

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

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

@@ -1502,7 +1504,7 @@ an embedded event driven algorithm.")
 (define-public librelane
  (package
    (name "librelane")
-    (version "3.0.0")
+    (version "3.0.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1511,7 +1513,7 @@ an embedded event driven algorithm.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "01zi2v5qi26h09hwjafsq9k0anrc5g5fc6q5vg87k9lcwyfsi685"))))
+                "1v43adkw5c624nd06g11cb609v8pj3prfyyawbq3i4k1w1law597"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -2018,7 +2020,7 @@ which allows one to install the M8 firmware on any Teensy.")
 (define-public magic
  (package
    (name "magic")
-    (version "8.3.625")
+    (version "8.3.633")
    (source
     (origin
       (method git-fetch)
@@ -2027,7 +2029,7 @@ which allows one to install the M8 firmware on any Teensy.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0ld238cdq8mzzcx7vgk67aqim0ypbfyks486z59q19yzxpr6c42s"))))
+        (base32 "1rwrhb0q99rpv4lbiw1sqykwzf9gj1my2wkh6mp8g36rab2vhii3"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2057,7 +2059,7 @@ versus schematic} tests and can assist with automatic routing.")
 (define-public mcy
  (package
    (name "mcy")
-    (version "0.63")
+    (version "0.64")
    (source
     (origin
       (method git-fetch)
@@ -2120,7 +2122,7 @@ coverage.")
 (define-public netgen
  (package
    (name "netgen")
-    (version "1.5.316")
+    (version "1.5.318")
    (source
     (origin
       (method git-fetch)
@@ -2129,7 +2131,7 @@ coverage.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1923mynqw1wjhlcij639gdqrkifyb5lcks1x11gwpgp4gijwj3qb"))))
+        (base32 "19rd8y2pspycr2296nhm60fhsgnzlyzb09wx2kgqzg6s7h6cmrr5"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2690,20 +2692,20 @@ formats.")
 (define-public openroad
  (package
    (name "openroad")
-    (version "26Q1")
+    (version "26Q2")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/The-OpenROAD-Project/OpenROAD")
-              (commit "e06ca0f5f2e641cd7b138a4d9b4fdd290359eca8")
+              (commit version)
              ;; 26Q1 Uses:
-              ;; - forked, custom opensta: v2.2.0-1579-g9c9b5659
-              ;; - forked, custom (berkeley) abc: 20260104.1628-g4c756ffb8
+              ;; - forked, custom opensta: v2.2.0-1952-g43177bba
+              ;; - forked, custom (berkeley) abc: 20260301.0445-g17cadca08
              (recursive? #t)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "13x4kqi4j489k4sz56ws4aqhp60nff1i18z6hjd6xx8y7flaik0c"))))
+        (base32 "152j78c47wyq4sw42bwlxdhvs5g47a8jqz1qz5yzdsk9z5y4y7vl"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -2737,7 +2739,7 @@ formats.")
           flex
           googletest
           pkg-config
-           swig-4.0))
+           swig-4.4))
    (inputs
     (list abseil-cpp
           boost
@@ -2776,7 +2778,6 @@ clock tree synthesis, routing, parasitic extraction, and timing analysis.")
  (package
    (inherit openroad)
    (name "openroad-cli")
-    (build-system cmake-build-system)
    (arguments
     (delkw
      #:qtbase
@@ -3460,7 +3461,7 @@ form of AXI, AXI lite, and AXI stream modules.")
 (define-public python-edalize
  (package
    (name "python-edalize")
-    (version "0.6.5")
+    (version "0.6.6")
    (source
     (origin
       (method git-fetch)
@@ -3469,7 +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 "1drmc126a12zlynx8ps9iwghaqs058pqj2xpdysxnrj26hg3sp15"))))
+        (base32 "115nc15n2cx4x9irjim07zkg0287418djqd6ja7rm8jrnyldvln9"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -3496,17 +3497,17 @@ form of AXI, AXI lite, and AXI stream modules.")
    (native-inputs
     (list python-pytest python-setuptools python-setuptools-scm))
    (propagated-inputs
-     (list python-importlib-metadata python-jinja2))
+     (list python-importlib-metadata python-jinja2 python-pandas))
    (home-page "https://github.com/olofk/edalize/")
    (synopsis "Python Library for interacting with EDA tools")
    (description
-     "This package implements a functionality to create project files for
-supported tools and run them in batch or GUI mode.  All EDA tools such as
-Icarus, Yosys, ModelSim, Vivado, Verilator, GHDL, Quartus etc get input HDL
-files (Verilog and VHDL) and some tool-specific files (constraint files,memory
-initialization files, IP description files etc).  Together with the files,
-perhaps a couple of Verilog `defines, some top-level parameters/generics or
-some tool-specific options are set.")
+     "This package can create project files for supported tools and run them in
+batch or GUI mode.  All EDA tools such as Icarus, Yosys, ModelSim, Vivado,
+Verilator, GHDL, Quartus etc get input HDL files (Verilog and VHDL) and some
+tool-specific files (constraint files,memory initialization files, IP
+description files etc).  Together with the files, perhaps a couple of Verilog
+`defines, some top-level parameters/generics or some tool-specific options are
+set.")
    (license license:bsd-2)))

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

 (define-public sby-gui
-  (let ((commit "6c977084c17c4842c504829c6d455a07d67e119c")
-        (revision "0"))
+  (let ((commit "0a89301bf347c9f42932186e49ba2c0014ff3661")
+        (revision "1"))
    (package
      (name "sby-gui")
      (version (git-version "0" revision commit))
@@ -4303,10 +4304,13 @@ front-end program for Yosys-based formal hardware verification flows.")
                (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "137x3s5mwbzlcv2p6671ijvbafzwhxpvszzfi9wifq0wcli6cxxg"))))
+          (base32 "1zp2c7zqclsfvl5xhb8zlc1dclp2s36w2nd0x80fazsxp7ksw5gr"))))
      (build-system qt-build-system)
      (arguments
-       (list #:tests? #f))               ;no tests
+       (list
+        #:qtbase qtbase                 ;for Qt 6
+        #:tests? #f))                   ;no tests
+      (native-inputs (list python-minimal-wrapper))
      (propagated-inputs (list sby))
      (home-page "https://github.com/YosysHQ/sby-gui/")
      (synopsis "Graphical user interface for code{sby}")
@@ -4661,7 +4665,7 @@ parallel computing platforms.  It also supports serial execution.")
 (define-public yosys
  (package
    (name "yosys")
-    (version "0.63")
+    (version "0.64")
    (source
     (origin
       (method git-fetch)
@@ -4669,7 +4673,7 @@ parallel computing platforms.  It also supports serial execution.")
              (url "https://github.com/YosysHQ/yosys")
              (commit (string-append "v" version))))
       (sha256
-        (base32 "1iaafzsc0pbd61m5hh12nzr2z4rn4n7i68l6ij9vli4m5zsxw39k"))
+        (base32 "13gw5msk1kv05jkb330nybvx2s0ixm6l6mdpyapnqmv3lkhby1mj"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
@@ -4782,12 +4786,12 @@ parallel computing platforms.  It also supports serial execution.")
              (git-reference
                (url "https://github.com/povik/yosys-slang")
                ;; No tags, nor releases.
-                (commit "d82b0b163a725fc1a401fbb6b465cd862517ec1f")
+                (commit "4e53d772996184b07e9bfe784060f96e6cb0a267")
                (recursive? #t)))  ;requires slang and fmt
             (file-name "yosys-slang")
             (sha256
              (base32
-               "07h4qssphggd4mbn376vldqwzj1i16y1ix455xzr4lgx6s2q9ryg")))))
+               "1jjr1b6xd1sr9fkyfyl4y2wkzl51m7g10bw97mnw81v2mzssrs2q")))))
    ;; Optional dependencies increase considerably package closure.
    ;; - gtkwave: required only for vcd2fst binary, used by ‘sim’ command.
    ;; - graphviz, xdot: used by ‘show’ command to display schematics.
@@ -164,7 +164,8 @@ Mix.CLI.main()"
                       '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
                   programs))))))))
    (outputs '("out" "src"))
-    (inputs (list bash-minimal erlang rebar3 git))
+    (inputs (list bash-minimal erlang rebar3))
+    (native-inputs (list git-minimal))
    (native-search-paths
     (list (search-path-specification
            (variable "GUIX_ELIXIR_LIBS")
@@ -644,32 +644,6 @@ editor (console only)")
    (description "This Emacs build implements graphical UI purely in terms
 of GTK.")))

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

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

@@ -65,6 +65,7 @@
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages libftdi)
  #:use-module (gnu packages libusb)
+  #:use-module (gnu packages linux)
  #:use-module (gnu packages messaging)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages perl)
@@ -1505,7 +1506,8 @@ hardware.  The utility support USB and UART as serial link.")
                 (apply (assoc-ref cargo:%standard-phases phase)
                        #:cargo-target #$(cargo-triplet)
                        args))
-               '(unpack-rust-crates
+               '(prepare-rust-crates
+                 unpack-rust-crates
                 configure
                 check-for-pregenerated-files
                 patch-cargo-checksums)))))))
@@ -1900,7 +1902,7 @@ PicoBlaze; and Zilog Z80 families, plus many of their variants.")
    (inputs
     (list readline ucsim))
    (native-inputs
-     (list bison boost flex python-2 texinfo zlib))
+     (list bison boost flex python-minimal-wrapper texinfo zlib))
    (home-page "https://sdcc.sourceforge.net/")
    (synopsis "C compiler suite for 8-bit microcontrollers")
    (description "SDCC is a retargetable, optimizing Standard C compiler suite
@@ -2066,26 +2068,27 @@ operations.")
    (license license:asl2.0)))

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

 (define-public cc-tool
  (package
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@worcester.edu>
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017-2024, 2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
@@ -3247,14 +3247,14 @@ that compiles to WebAssembly.")
 (define-public scummvm
  (package
    (name "scummvm")
-    (version "2.9.1")
+    (version "2026.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
                           "/scummvm-" version ".tar.xz"))
       (sha256
-        (base32 "1qspqawdazsxisxm1lxzgi0i4gx54qd10xyk3nmmirwxz9mg70ka"))))
+        (base32 "1wv0z9c4dnjywgla9zhbkgnzahj829ybvcx9jw67hdmagnbys42f"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -48,7 +48,7 @@
 (define-public nuspell
  (package
    (name "nuspell")
-    (version "5.1.7")
+    (version "5.1.4")
    (source
     (origin
       (method git-fetch)
@@ -58,14 +58,12 @@
         (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1xvy8qrpw1282akr873xzja61afnr27f1gab6jc4cgy8pkfqq308"))))
+        (base32 "05j1hmczy6v9dyxp77vxhgyl7y5hff3v45vlp86gyh7m9lgqpmra"))))
    (build-system cmake-build-system)
    (arguments
-     (list #:configure-flags
-           #~(list "-DBUILD_DOCS=OFF"   ;do not pull Pandoc
-                   #$@(if (%current-target-system)
-                          '("-DBUILD_TESTING=OFF")
-                          '()))))
+     (if (%current-target-system)
+         (list #:configure-flags #~(list "-DBUILD_TESTING=OFF"))
+         '()))
    (native-inputs (list catch2-3 pkg-config))
    (propagated-inputs (list icu4c))
    (native-search-paths (list (search-path-specification
@@ -50,6 +50,7 @@
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Daniel Khodabakhsh <d@niel.khodabakh.sh>
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
+;;; Copyright © 2026 Brent Wedderburn <mb@bean.za.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -253,13 +254,21 @@ their devices.")
          (replace 'build (assoc-ref gnu:%standard-phases 'build))
          (replace 'check (assoc-ref gnu:%standard-phases 'check))
          (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((bin   (string-append #$output "/bin"))
-                    (share (string-append #$output "/share/librecad")))
+            (lambda _
+              (let* ((bin (string-append #$output "/bin"))
+                     (share (string-append #$output "/share"))
+                     (apps (string-append share "/applications"))
+                     (icons (string-append share "/icons/hicolor/128x128/apps")))
                (mkdir-p bin)
                (install-file "unix/librecad" bin)
                (mkdir-p share)
-                (copy-recursively "unix/resources" share)))))))
+                (copy-recursively "unix/resources"
+                                  (string-append share "/librecad"))
+                (mkdir-p apps)
+                (install-file "desktop/librecad.desktop" apps)
+                (mkdir-p icons)
+                (copy-file "librecad/res/main/librecad.png"
+                           (string-append icons "/librecad.png"))))))))
    (inputs
     (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
    (native-inputs
@@ -2721,7 +2730,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
 (define-public freecad
  (package
    (name "freecad")
-    (version "1.1.0")
+    (version "1.1.1")
    (source
     (origin
       (method git-fetch)
@@ -2731,7 +2740,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
             (recursive? #t)))          ;needed for the AddonManager
       (file-name (git-file-name name version))
       (sha256
-        (base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
+        (base32 "05dx7ifx33705mxb0vc82j0mzzkazakgadfgq5bws30qrxp49xgg"))
       (snippet
        #~(begin
            (use-modules (guix build utils))
@@ -2816,7 +2825,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
           qtwayland
           sqlite
           onetbb                       ;same version as opencascade-occt
-           vtk
+           vtk-9.5
           xerces-c
           yaml-cpp
           zlib))
@@ -186,7 +186,7 @@ testing InfiniBand networks.")
 (define-public ucx
  (package
    (name "ucx")
-    (version "1.19.0")
+    (version "1.20.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -196,7 +196,7 @@ testing InfiniBand networks.")
              (patches (search-patches "ucx-tcp-iface-ioctl.patch"))
              (sha256
               (base32
-                "12j9200iyg6d0yr84r25hcpq8qqzfaa08klbhvgrqpflpfcljz4z"))
+                "12w1mxacml1w8zvl1hpn786cs77y056b9hxv7q1kq482bgc2si0v"))
              (snippet
               ;; As seen in commit b0a275a5492125a13020cd095fe9934e0b5e7c6a.
               #~(begin (use-modules (guix build utils))
@@ -34,6 +34,7 @@
  #:use-module (gnu packages anthy)
  #:use-module (gnu packages boost)
  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpp)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages dictionaries)
@@ -95,7 +96,7 @@ client.")
 (define-public fcitx5
  (package
    (name "fcitx5")
-    (version "5.1.16")
+    (version "5.1.19")
    (source
     (origin
       (method url-fetch)
@@ -103,9 +104,14 @@ client.")
             "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
             version "_dict.tar.zst"))
       (sha256
-        (base32 "0lwp90wjrkiws121rqn9kzdz6p1ncsk18dkmbv0zi37yqx2mv180"))))
+        (base32 "1ngsadqdrwy99w63dmk493gg56j7r991v6pq1nwkx6apib9ykpc0"))
+       (snippet
+        #~(begin
+            (use-modules (guix build utils))
+            (delete-file-recursively "third_party")))))
    (arguments
-     (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF")))
+     (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF"
+                                     "-DUSE_SYSTEM_YOGA=ON")))
    (build-system cmake-build-system)
    (inputs
     (list cairo
@@ -118,12 +124,12 @@ client.")
           gettext-minimal
           glib
           iso-codes/pinned
-           json-c
           libevent
           libuv
           libxcb
           libxkbcommon
           libxkbfile
+           nlohmann-json
           pango
           `(,util-linux "lib")         ;For libuuid.
           wayland
@@ -132,7 +138,8 @@ client.")
           xcb-util
           xcb-util-keysyms
           xcb-util-wm
-           xkeyboard-config))
+           xkeyboard-config
+           yoga))
    (native-inputs
     (list extra-cmake-modules
           zstd
@@ -141,6 +148,11 @@ client.")
     (list (search-path-specification
            (variable "FCITX_ADDON_DIRS")
            (files '("lib/fcitx5")))
+           (search-path-specification
+            (variable "GUIX_GTK2_IM_MODULE_FILE")
+            (file-type 'regular)
+            (separator #f)
+            (files '("lib/gtk-2.0/2.10.0/immodules-gtk2.cache")))
           (search-path-specification
            (variable "GUIX_GTK3_IM_MODULE_FILE")
            (file-type 'regular)
@@ -154,7 +166,7 @@ client.")
 (define-public fcitx5-lua
  (package
    (name "fcitx5-lua")
-    (version "5.0.15")
+    (version "5.0.16")
    (source
     (origin
       (method url-fetch)
@@ -162,7 +174,7 @@ client.")
             "https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
             version ".tar.zst"))
       (sha256
-        (base32 "1yp5z97m8n7fwvxps1gn8pflg69j3yawgabz36bpd4wl43zkgchg"))))
+        (base32 "1zjiyadhqq8hijjv09khyj2shaw3ri4jgmb1ql67w9366wd0ykj2"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -171,7 +183,7 @@ client.")
    (inputs
     (list fcitx5 lua gettext-minimal))
    (native-inputs
-     (list extra-cmake-modules))
+     (list extra-cmake-modules pkg-config))
    (home-page "https://github.com/fcitx/fcitx5-lua")
    (synopsis "Lua support for Fcitx 5")
    (description "Fcitx5-lua allows writing Fcitx5 extension in Lua.")
@@ -180,14 +192,14 @@ client.")
 (define-public libime
  (package
    (name "libime")
-    (version "1.1.12")
+    (version "1.1.14")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
                           version "_dict.tar.zst"))
       (sha256
-        (base32 "02n6xbbxfckzx5sqrclnh4cvqlnj9c5rpys07kd8r8m51paqzigq"))))
+        (base32 "17r54fd6whvcxn389k4ah9mj1fc61zgama5nhiv1ilx40n1hnnpv"))))
    (build-system cmake-build-system)
    (inputs
     (list fcitx5 boost (list zstd "lib")))
@@ -202,7 +214,7 @@ editors.")
 (define-public fcitx5-gtk
  (package
    (name "fcitx5-gtk")
-    (version "5.1.4")
+    (version "5.1.6")
    (source
     (origin
       (method url-fetch)
@@ -210,7 +222,7 @@ editors.")
                           "/fcitx5-gtk/fcitx5-gtk-"
                           version ".tar.zst"))
       (sha256
-        (base32 "0lwl17mbfm3pxpd3y7h4sxf77npr16hyzygrc7a6v26bx6ycbkqx"))))
+        (base32 "0qj5gjdnrxcyz6a455b4379iwnzazw5a6c6dyk6wz0d2bgainc75"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -324,7 +336,7 @@ IM module for GTK+3 applications.
 (define-public fcitx5-qt
  (package
    (name "fcitx5-qt")
-    (version "5.1.11")
+    (version "5.1.13")
    (source
     (origin
       (method url-fetch)
@@ -332,7 +344,7 @@ IM module for GTK+3 applications.
                           "/fcitx5-qt/fcitx5-qt-"
                           version ".tar.zst"))
       (sha256
-        (base32 "0mc396zfafs34jraj9fdk0wyzvdzg4xi605rhrd492xcpf25b59v"))))
+        (base32 "1yawhwnycrqp1flik3hc2vskvsyjfm6rkcdhsqnawix22r2n1wl0"))))
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags
@@ -363,7 +375,7 @@ for Qt based application.")
 (define-public fcitx5-anthy
  (package
    (name "fcitx5-anthy")
-    (version "5.1.8")
+    (version "5.1.10")
    (source
     (origin
       (method url-fetch)
@@ -371,7 +383,7 @@ for Qt based application.")
                           "/fcitx5-anthy/fcitx5-anthy-"
                           version ".tar.zst"))
       (sha256
-        (base32 "1kv930nxz6q8ijb319fnnkzdyigbi36f2cwijnv4sy3rd0nykxrv"))))
+        (base32 "11h7b687xj2k1hp7dqj6wh5y6i55cm8m5pqbi5vbflgg0cy5v1mp"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f)) ;; no tests
@@ -387,7 +399,7 @@ the Anthy input method.")
 (define-public fcitx5-skk
  (package
    (name "fcitx5-skk")
-    (version "5.1.8")
+    (version "5.1.10")
    (source
     (origin
       (method git-fetch)
@@ -396,14 +408,14 @@ the Anthy input method.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "11h6y7rv6yppp7iy8csy7r2pi2mlnjgl8h4h8ghfwab1gm7v32fn"))))
+        (base32 "1fjiyx6dyiqxlypr1k4024lnc077xsnx4qwrwx9hj3yjdni5f2p0"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f      ; no tests
           #:configure-flags
-           #~(list (string-append "-DSKK_DEFAULT_PATH="
+           #~(list (string-append "-DSKK_PATH="
                                  #$(this-package-input "skk-jisyo")
-                                  "/share/skk/SKK-JISYO.L"))))
+                                  "/share/skk"))))
    (native-inputs
     (list extra-cmake-modules gobject-introspection
           pkg-config gettext-minimal))
@@ -423,14 +435,14 @@ backend.")
 (define-public fcitx5-unikey
  (package
    (name "fcitx5-unikey")
-    (version "5.1.8")
+    (version "5.1.10")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/fcitx/fcitx5-unikey")
                    (commit version)))
              (sha256
-               (base32 "1nai5v6r367iwj8yxg4flv41my57l88l9vy0id9wr3hvrvls9v31"))
+               (base32 "1ddg5648r8jbdr8khawfhl26020snvrlgjwppw5rlh4iw3a4m143"))
              (file-name (git-file-name name version))))
    (build-system qt-build-system)
    (arguments
@@ -450,14 +462,14 @@ backend.")
 (define-public fcitx5-chewing
  (package
    (name "fcitx5-chewing")
-    (version "5.1.9")
+    (version "5.1.11")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/fcitx/fcitx5-chewing")
                    (commit version)))
              (sha256
-               (base32 "1mgpxvmxfbqy8gymdsdmspgknh0pc751dm5rsrvdvfbd5lsa6pn6"))
+               (base32 "1x4a4vcb7vg9dx0f2bjrb2v6dcr8cwxnm8gdd47fkxqn890rgrnc"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -479,7 +491,7 @@ backend.")
 (define-public fcitx5-chinese-addons
  (package
    (name "fcitx5-chinese-addons")
-    (version "5.1.10")
+    (version "5.1.12")
    (source
     (origin
       (method url-fetch)
@@ -487,7 +499,7 @@ backend.")
                           "/fcitx5-chinese-addons/fcitx5-chinese-addons-"
                           version "_dict.tar.zst"))
       (sha256
-        (base32 "11gnywigqys3gndb175nxk10k1ld3xvwd6kggqnxs95imc2004dd"))))
+        (base32 "09kk8r6pcxjhivwv4z5cdv2pqy0ry8ngnfbrcmwagzyq2jq9p2cr"))))
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags
@@ -540,7 +552,7 @@ including input methods previous bundled inside Fcitx 4:
 (define-public fcitx5-configtool
  (package
    (name "fcitx5-configtool")
-    (version "5.1.11")
+    (version "5.1.13")
    (source
     (origin
       (method url-fetch)
@@ -548,7 +560,7 @@ including input methods previous bundled inside Fcitx 4:
             "https://download.fcitx-im.org/fcitx5"
             "/fcitx5-configtool/fcitx5-configtool-" version ".tar.zst"))
       (sha256
-        (base32 "1c5pw6p33z7lyk16jr1w72snazdc4q83ywn0gsk68qgmmfql5qr1"))))
+        (base32 "1sr8ri68qbkgvnj9pr5yw680zq506h26ymfmyz7ihw5ri14a6klr"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -661,7 +673,7 @@ for Fcitx 5 with following color variants:
 (define-public fcitx5-rime
  (package
    (name "fcitx5-rime")
-    (version "5.1.12")
+    (version "5.1.13")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://download.fcitx-im.org/fcitx5"
@@ -669,7 +681,7 @@ for Fcitx 5 with following color variants:
                                  ".tar.zst"))
              (sha256
               (base32
-                "1blqfk8zpzd5v2r7gwjy12jbnsh26pcvad8q4mmhlg5j10yppg03"))))
+                "03wcdgdhkvw5341vjv3idyksykm65y0873vkcrsi16dsp8w0h7i8"))))
    (build-system cmake-build-system)
    (arguments
     '(#:tests? #f ;no tests
@@ -700,7 +712,7 @@ output.")
 (define-public fcitx5-hangul
  (package
    (name "fcitx5-hangul")
-    (version "5.1.7")
+    (version "5.1.9")
    (source
     (origin
       (method git-fetch)
@@ -709,7 +721,7 @@ output.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "02lkbwg25jr4hazjyxcy69midfsmxc0ksbdrfwbmqcfa3kz5d9gb"))))
+        (base32 "0ja5faara4xz8waccpa5gbi3prh02hh3gpf915czhbkihffby6ng"))))
    (build-system cmake-build-system)
    (native-inputs (list extra-cmake-modules pkg-config gettext-minimal))
    (inputs (list fcitx5 libhangul))
@@ -88,6 +88,7 @@
  #: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 guile)
  #:use-module (gnu packages haskell-xyz)
@@ -761,7 +762,7 @@ from a mounted file system.")
  ;; completions by running a native bcachefs binary at build time.
  (package
    (name "bcachefs-tools-minimal")
-    (version "1.35.1")
+    (version "1.37.4")
    (source
     (origin
       (method git-fetch)
@@ -770,7 +771,7 @@ from a mounted file system.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
+        (base32 "17041jphzbg0ppxlc1acr3d73zyn02spjvi5my30wak8xh9n6nan"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -968,20 +969,13 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
 (define-public bcachefs-linux-module
  (package
    (name "bcachefs-linux-module")
-    (version "1.35.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://evilpiepirate.org/git/bcachefs-tools.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
+    (version (package-version bcachefs-tools-minimal))
+    (source (package-source bcachefs-tools-minimal))
    (build-system linux-module-build-system)
    (arguments
     (list
-      #:tests? #f ;no 'check' target
+      #:make-flags #~(list "BCACHEFS_DKMS=1")
+      #:tests? #f                       ;no 'check' target
      #:source-directory "build/src/fs/bcachefs"
      #:phases
      #~(modify-phases %standard-phases
@@ -990,18 +984,14 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
              (with-output-to-file ".version"
                (lambda ()
                  (display #$version)))))
-          (add-after 'unpack 'patch-source
-            (lambda _
-              (substitute* "Makefile"
-                ;; Remove unnecessary dependencies
-                (("^.*PKG_CONFIG.*$")
-                 ""))))
-          (add-before 'configure 'prepare-build-dir
-            (lambda _
-              (invoke "make" "install_dkms"
-                      (string-append "DESTDIR="
-                                     (getcwd) "/") "DKMSDIR=build/"))))))
-    (home-page (package-home-page bcachefs-tools-minimal/static))
+          (add-before 'configure 'prepare-build-directory
+            (lambda* (#:key make-flags #:allow-other-keys)
+              (apply invoke "make" "install_dkms"
+                     (string-append "DESTDIR="
+                                    (getcwd) "/")
+                     "DKMSDIR=build/"
+                     make-flags))))))
+    (home-page (package-home-page bcachefs-tools-minimal))
    (synopsis "Bcachefs Linux kernel module")
    (description
     "This package provides the Linux kernel module for Bcachefs.
@@ -2140,10 +2130,79 @@ the XDG directory specification from @file{~/.@var{name}} to
@file{~/.config/@var{name}}.")
      (license license:gpl2+))))

+(define-public s5cmd
+  (package
+    (name "s5cmd")
+    (version "2.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/peak/s5cmd")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1y1bwma6f68j00jfdjxvw5flp9l4cdys7dgkrr0yvfz68lk9a17v"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (delete-file-recursively "vendor")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:install-source? #f
+      #:import-path "github.com/peak/s5cmd/v2"
+      #:test-flags
+      #~(list "-vet=off"
+              ;; cp_test.go:74: assertion failed: text/plain; charset=utf-8
+              ;; (tc.expectedContentType string) != text/html; charset=utf-8
+              ;; (string)
+              "-skip" "TestGuessContentType")
+      #:test-subdirs
+      ;; build flag -mod=vendor only valid when using modules
+      ;; /<...>/peak/s5cmd/v2/e2e/util_test.go:417 +0x3b9
+      ;; /<...>/peak/s5cmd/v2/e2e/main_test.go:12 +0x65
+      #~(list "command/..."
+              "orderedwriter/..."
+              "progressbar/..."
+              "storage/..."
+              "storage/url/..."
+              "strutil/...")
+      #:phases
+      #~(modify-phases %standard-phases
+	  (add-after 'install 'rename-binaries
+	    (lambda _
+	      (rename-file
+	       (string-append #$output "/bin/v2")
+	       (string-append #$output "/bin/s5cmd")))))))
+    (native-inputs
+     (list go-github-com-aws-aws-sdk-go
+           go-github-com-cheggaaa-pb-v3
+           go-github-com-google-go-cmp
+           go-github-com-hashicorp-go-multierror
+           go-github-com-iancoleman-strcase
+           go-github-com-igungor-gofakes3
+           go-github-com-karrick-godirwalk
+           go-github-com-kballard-go-shellquote
+           go-github-com-lanrat-extsort-1.0.2
+           go-github-com-termie-go-shutil
+           go-github-com-urfave-cli-v2
+           go-go-uber-org-mock
+           go-gotest-tools-v3
+           go-honnef-co-go-tools
+           go-mvdan-cc-unparam))
+    (home-page "https://github.com/peak/s5cmd")
+    (synopsis "Parallel S3 and local filesystem execution tool")
+    (description
+     "@code{s5cmd} is a fast S3 and local filesystem execution tool.  It comes
+with support for a multitude of operations including tab completion and
+wildcard support for files, which can be handy for object storage workflow
+while working with large number of files.")
+    (license license:expat)))
+
 (define-public squashfuse
  (package
    (name "squashfuse")
-    (version "0.1.105")
+    (version "0.6.1")
    (source
     (origin
       (method git-fetch)
@@ -2152,7 +2211,7 @@ the XDG directory specification from @file{~/.@var{name}} to
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224"))))
+        (base32 "16ds2xlk6hb5cggi6di8s0aalir3mrx7rk24rw5daad1xw4dbq0y"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2190,7 +2249,8 @@ memory-efficient.")
                 (install-file "fuseprivate.h"
                               (string-append #$output
                                              "/include/squashfuse/")))))))))
-    (inputs (list fuse-for-appimage
+    (inputs (list `(,fuse "out")
+                  `(,fuse "static")
                  `(,zstd "lib")
                  `(,zstd "static")
                  `(,zlib "out")
@@ -766,7 +766,7 @@ require Coincurve.")
 (define-public electrum
  (package
    (name "electrum")
-    (version "4.7.1")
+    (version "4.7.2")
    (source
     (origin
       (method git-fetch)
@@ -775,7 +775,7 @@ require Coincurve.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "171jbap3khzwkyxg730sasfj01qiip396sgyiwr1i6yq5fxd23pi"))))
+        (base32 "05y3w9jhpfxd7frzlilqvsfggrgfzcml2spc2qb5xx9j4q62hnmx"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2016, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
@@ -84,7 +84,6 @@
  #:use-module (gnu packages linux)
  #:use-module (gnu packages mtools)
  #:use-module (gnu packages pciutils)
-  #:use-module (gnu packages pciutils)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
@@ -524,162 +523,6 @@ Loke and Heimdall communicate via the custom Samsung-developed protocol typicall
 referred to as the \"Odin 3 protocol\".")
    (license license:expat)))

-(define-public ifdtool
-  (package
-    (name "ifdtool")
-    (version "25.09")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://review.coreboot.org/coreboot")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/ifdtool")))
-          (delete 'configure))           ; no configure script
-      #:tests? #f))                    ; no test suite
-    (home-page "https://doc.coreboot.org/util/ifdtool/")
-    (synopsis "Intel Firmware Descriptor dumper")
-    (description "This package provides @command{ifdtool}, a program to
-dump Intel Firmware Descriptor data of an image file.")
-    (license license:gpl2)))
-
-(define-public bincfg
-  (package
-    (name "bincfg")
-    (version "25.09")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://review.coreboot.org/coreboot")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; no test suite
-      #:make-flags
-      #~(list
-         (string-append "CC=" #$(cc-for-target)))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure) ; no configure script
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/bincfg")))
-          (add-after 'build 'build-binaries
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (for-each
-               (lambda (target result)
-                 (apply invoke "make" (string-append "gen-" target) make-flags)
-                 (rename-file result
-                              (string-append target ".bin")))
-               (list
-                ;; generate GbE for X200
-                "gbe-ich9m"
-                ;; generate GbE for X220/x230
-                "gbe-82579LM"
-                ;; generate IFD for X200
-                "ifd-x200")
-               (list
-                "flashregion_3_gbe.bin"
-                "flashregion_3_gbe.bin"
-                "flashregion_0_fd.bin"))))
-          ;; The Makefile has no install target.
-          (replace 'install
-            (lambda _
-              (let ((bin (string-append #$output "/bin"))
-                    (lib (string-append #$output "/lib/bincfg"))
-                    (data (string-append #$output "/share/bincfg")))
-                ;; Install the program
-                (install-file "bincfg" bin)
-                ;; And its data
-                (for-each
-                 (lambda (path)
-                   (install-file path data))
-                 (append (find-files "." ".*\\.set")
-                         (find-files "." ".*\\.spec")))
-                ;; And the files generated with the data
-                (for-each
-                 (lambda (path)
-                   (install-file path lib))
-                 (find-files "." ".*\\.bin"))))))))
-    (native-inputs (list bison flex))
-    (home-page "https://coreboot.org")
-    (synopsis "Encoder/decoder for binary formats described in text files")
-    (description "
-The bincfg program comes with specifications files for the following binary
-formats:
-@itemize
-@item Various DDR3 and DDR4 SPD
-@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
-@item Configuration data for the Intel Gigabit Ethernet controller present in
-      the Intel ICH9-M chipset.
-@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
-@item Configuration data for the ITE IT8718F SuperIO
-@end itemize
-It also comes with example files generated by bincfg.")
-    (license license:gpl3+)))
-
-(define-public intelmetool
-  (package
-    (name "intelmetool")
-    (version "25.09")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://review.coreboot.org/coreboot")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f                       ;no test suite
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/intelmetool")))
-          (delete 'configure) ;no configure script
-          (delete 'check))))
-    (inputs (list pciutils zlib))
-    (home-page
-     "https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
-    (synopsis "Intel Management Engine tools")
-    (description "This package provides tools for working with Intel
-Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
-@code{sudo rmmod mei} before using this tool.  Also pass
-@code{iomem=relaxed} to the Linux kernel command line.")
-    (license license:gpl2)
-
-    ;; This is obviously an Intel thing, plus it requires <cpuid.h>.
-    (supported-systems '("x86_64-linux" "i686-linux"))))
-
 (define-public me-cleaner
  (package
    (name "me-cleaner")
@@ -26,7 +26,6 @@
  #:use-module (guix gexp)
  #:use-module (guix utils)
  #:use-module (gnu packages)
-  #:use-module (gnu packages bootstrap)
  #:use-module (gnu packages m4)
  #:use-module (gnu packages man)
  #:use-module (gnu packages bison)
@@ -44,9 +43,18 @@
                    "flex-" version ".tar.gz"))
              (sha256
               (base32
-                "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))
-              (patches (search-patches "flex-fix-make-dependencies.patch"))))
+                "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))))
    (build-system gnu-build-system)
+    (inputs
+     (let ((bison-for-tests
+            (package
+              (inherit bison)
+              (arguments
+               ;; Disable tests, since they require flex.
+               (substitute-keyword-arguments arguments
+                 ((#:tests? _ #f) #f)))
+              (inputs (alist-delete "flex" (package-inputs bison))))))
+       `(("bison" ,bison-for-tests))))
    (arguments
     (if (%current-target-system)
         (list #:configure-flags
@@ -55,29 +63,21 @@
         '()))
    ;; m4 is not present in PATH when cross-building
    (native-inputs
-     (let ((bison-for-tests
-            (package
-             (inherit bison)
-             (arguments
-              ;; Disable tests, since they require flex.
-              (substitute-keyword-arguments arguments
-                ((#:tests? _ #f) #f)))
-             (inputs (modify-inputs inputs
-                       (delete "flex"))))))
-       (list bison-for-tests help2man m4)))
+     (list help2man m4))
    (propagated-inputs (list m4))
    (home-page "https://github.com/westes/flex")
    (synopsis "Fast lexical analyser generator")
    (description
-     "Flex is a tool for generating scanners.  A scanner, sometimes called a
-tokenizer, is a program which recognizes lexical patterns in text.  The flex
-program reads user-specified input files, or its standard input if no file
-names are given, for a description of a scanner to generate.  The description
-is in the form of pairs of regular expressions and C code, called rules.  Flex
-generates a C source file named @file{lex.yy.c}, which defines the function
-@code{yylex()}.  The @file{lex.yy.c} can be compiled and linked to produce an
-executable.  When the executable is run, it analyzes its input for occurrences
-of text matching the regular expressions for each rule.  Whenever it finds a
-match, it executes the corresponding C code.")
+     "Flex is a tool for generating scanners.  A scanner, sometimes
+called a tokenizer, is a program which recognizes lexical patterns in
+text.  The flex program reads user-specified input files, or its standard
+input if no file names are given, for a description of a scanner to
+generate.  The description is in the form of pairs of regular expressions
+and C code, called rules.  Flex generates a C source file named,
+\"lex.yy.c\", which defines the function yylex().  The file \"lex.yy.c\"
+can be compiled and linked to produce an executable.  When the executable
+is run, it analyzes its input for occurrences of text matching the
+regular expressions for each rule.  Whenever it finds a match, it
+executes the corresponding C code.")
    (license (non-copyleft "file://COPYING"
                           "See COPYING in the distribution."))))
@@ -52,6 +52,7 @@
      (uri (git-reference
              (url "https://github.com/fltk/fltk")
              (commit (string-append "release-" version))))
+      (file-name (git-file-name name version))
      (sha256
       (base32 "0pnifyhhvcqfjd6iaa4m14kvfyqhjjdw0aqbcizcdhhqrl6q4pjg"))))
   (build-system gnu-build-system)
@@ -5559,6 +5559,39 @@ technical and idiosyncratic feel—perfect for headers and pull-quotes.  Made to
 work well together with Mona Sans.")
    (license license:silofl1.1)))

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

 (define-public font-peppercarrot
  (package
@@ -28,7 +28,8 @@
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python))
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build))

 ;;; Please: Try to add new module packages in alphabetic order.
 ;;;
@@ -144,7 +145,7 @@ a.s.o.
 (define-public fortran-mctc-lib
  (package
    (name "fortran-mctc-lib")
-    (version "0.3.2")
+    (version "0.5.1")
    (source
     (origin
       (method git-fetch)
@@ -154,7 +155,7 @@ a.s.o.
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1gabdxllx2pcw1mbv4gw9zpn6817ikz9ql8xs9w86wswd6f0m5kl"))))
+         "1wp8apv0psl2hkhlrd5pgnhbxk8zpxa0ijkhcnb09klbxcsi8p5f"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -243,7 +244,7 @@ calculate partial charges used in the DFT-D4 model.")
 (define-public fortran-simple-dftd3
  (package
    (name "fortran-simple-dftd3")
-    (version "1.2.1")
+    (version "1.3.0")
    (source
     (origin
       (method git-fetch)
@@ -252,7 +253,7 @@ calculate partial charges used in the DFT-D4 model.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0aygmnax3vwz2x3ad7syksfjca4zc85nyslsibs0wg8wqfsmr33k"))))
+        (base32 "1602pwmxa8qjllgj7k9hq2bm4s838f6qzr7mpc0rbh28gm00c1fw"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -265,7 +266,8 @@ calculate partial charges used in the DFT-D4 model.")
     (list gfortran
           pkg-config
           python-minimal
-           python-cffi))
+           python-cffi
+           python-setuptools))
    (inputs
     (list fortran-mctc-lib
           fortran-mstore
@@ -1150,6 +1150,60 @@ GNOME Shell.  The @command{localectl} command-line tool allows you to interact
 with localed.  This package is extracted from the broader systemd package.")
    (license license:lgpl2.1+)))

+(define-public gardenhostd
+  (package
+   (name "gardenhostd")
+   (version "1.1")
+   (source (origin
+            (method git-fetch)
+            (uri (git-reference
+                  (url "https://codeberg.org/axtlos/gardenhostd.git")
+                  (commit (string-append "v" version))))
+            (file-name (git-file-name name version))
+            (sha256
+             (base32
+              "1q0pdh0imc2ggb26cddl62hx6fmz6z4hqj2352a4k9wxyn5kfiam"))))
+   (build-system meson-build-system)
+   (arguments
+    (list
+     #:imported-modules `(,@%meson-build-system-modules
+                          ,@%pyproject-build-system-modules)
+     #:modules '(((guix build pyproject-build-system) #:prefix pyproject:)
+                 (guix build meson-build-system)
+                 (guix build utils))
+     #:phases
+     #~(modify-phases %standard-phases
+         (add-after 'install 'remove-extra-files
+           (lambda _
+             (with-directory-excursion #$output
+               (delete-file-recursively "etc/init.d")
+               (rmdir "etc"))))
+         ;; See <https://codeberg.org/guix/guix/issues/7579>.
+         (add-after 'install 'wrap-search-paths
+           (lambda _
+             (wrap-program (string-append #$output "/libexec/gardenhostd")
+               `("GUIX_PYTHONPATH" prefix
+                 ,(map
+                   (lambda (package)
+                     (string-append
+                      package "/lib/python"
+                      (pyproject:python-version #$(this-package-input "python"))
+                      "/site-packages"))
+                   ;; Avoids references to meson’s libraries.
+                   (list #$(this-package-input "python")
+                         #$(this-package-input "python-pygobject"))))))))))
+   (inputs
+    (list bash-minimal
+          python
+          python-pygobject))
+   (home-page "https://codeberg.org/axtlos/gardenhostd")
+   (synopsis "Minimal Python implementation of systemd-hostnamed")
+   (description "This package is a partial implementation of the
+systemd-hostnamed daemon.  It provides the @code{org.freedesktop.hostname1}
+D-Bus interface, which helps applications like GNOME Settings retrieve and
+modify the system’s hostname, as well as set a pretty hostname for display.")
+   (license license:gpl3+)))
+
 (define-public packagekit
  (package
    (name "packagekit")
@@ -2862,7 +2916,7 @@ to the C library @code{uchardet} to increase performance.")
 (define-public udiskie
  (package
    (name "udiskie")
-    (version "2.6.1")
+    (version "2.6.2")
    (source
     (origin
       (method git-fetch)
@@ -2871,7 +2925,7 @@ to the C library @code{uchardet} to increase performance.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0ngr8sdzd32mxamzfh82ar8m40z52lx91339b7dq3in0cr5r1ynp"))))
+        (base32 "0zc23yf2sw1m21xkfbpfjzbp7xykqjwq56fr2nxzlc02n7g6iqgk"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -30,7 +30,7 @@
 ;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2017-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2018 okapi <okapi@firemail.cc>
 ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
 ;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
@@ -97,6 +97,7 @@
 ;;; Copyright © 2025 Aiden Isik <aidenisik+git@member.fsf.org>
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
+;;; Copyright © 2026 Nikita Alkhovik <forgoty13@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -114,40 +115,32 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

@@ -483,7 +484,7 @@ mouse and joystick control, and original music.")
      (source (origin
                (method git-fetch)
                (uri (git-reference
-                      (url "https://git.sr.ht/~drummyfish/Anarch")
+                      (url "https://gitlab.com/drummyfish/anarch")
                      (commit commit)))
                (file-name (git-file-name name version))
                (sha256
@@ -3964,7 +3965,7 @@ that beneath its ruins lay buried an ancient evil.")
 (define-public angband
  (package
    (name "angband")
-    (version "4.2.5")
+    (version "4.2.6")
    (source
     (origin
       (method git-fetch)
@@ -3973,7 +3974,7 @@ that beneath its ruins lay buried an ancient evil.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0kg6npbfy42mhggsqvs04khc8198i980z52xm59pws29698qazaw"))
+        (base32 "0hgzdvlh0j42w4q9kch9xvhnbvcrypac01xhpksw35gj9my887cp"))
       (modules '((guix build utils)))
       (snippet
        ;; So, some of the sounds/graphics/tilesets are under different
@@ -3989,12 +3990,55 @@ that beneath its ruins lay buried an ancient evil.")
           (substitute* "lib/Makefile"
             ;; And don't try to invoke makefiles in the directories we removed.
             (("gamedata customize help screens fonts tiles sounds icons user")
-              "gamedata customize help screens user"))))))
+              "gamedata customize help screens user"))
+           ;; Remove nonfree .dll files too.
+           (delete-file-recursively "src/win")))))
    (build-system gnu-build-system)
    (arguments
-     `(#:tests? #f                      ; no check target
-       #:configure-flags (list (string-append "--bindir=" %output "/bin"))))
-    (native-inputs (list autoconf automake))
+     `(#:configure-flags (list (string-append "--bindir=" %output "/bin"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fix-infinite-loop-on-sighup
+           ;; XXX Release 4.2.6 has a major bug where sending the process a
+           ;; SIGHUP when closing the terminal causes it to infinite loop
+           ;; waiting for input: https://github.com/angband/angband/issues/6558
+           ;; Reevaluate for future versions.
+           (lambda _
+             (substitute* "src/ui-signals.c"
+               (("(SIGHUP, )SIG_IGN" _ first)
+                (string-append first "handle_signal_abort")))))
+         (add-before 'check 'skip-failing-tests
+           (lambda _
+             (let ((to-skip '(;; some of these may be fixable, but most try to
+                              ;; create a directory in the user's home directory.
+                              ;; Rather than reading environment variables, they
+                              ;; lookup the username using getpwnam(3) and manually
+                              ;; construct the string.
+                              ;; Generic "Suite died":
+                              "game/basic"
+                              "game/mage"
+                              ;; "Cannot create '//.angband/Angband'":
+                              "effects/chain"
+                              "effects/destruction"
+                              "effects/earthquake"
+                              "object/info"
+                              "object/slays"
+                              "player/calc-inventory"
+                              "player/combine-pack"
+                              "player/digging"
+                              "player/inven-carry-num"
+                              "player/inven-wield"
+                              "player/timed"
+                              ;; This file likes to read /etc/passwd
+                              "z-file/path-normalize")))
+               (substitute* "src/tests/Makefile"
+                 (("include \\$\\(SUITES\\)" all)
+                  (string-append all "\nTESTPROGS := $(filter-out "
+                                 (string-join to-skip " ")
+                                 ", $(TESTPROGS))")))))))))
+    (native-inputs (list autoconf
+                         automake
+                         perl)) ;for tests
    (inputs (list ncurses))
    (home-page "https://rephial.org/")
    (synopsis "Dungeon exploration roguelike")
@@ -4233,11 +4277,11 @@ interface or via an external visual interface such as GNU XBoard.")
               (("TestIOTouchDragAnywhere (test_integration)" all _) _))))
         (add-before 'bootstrap 'autoreconf
           (lambda _
-	     ;; automake is out of date in the source
-	     ;; autoreconf updates the automake scripts
-	     (invoke "autoreconf")
-	     ;; Build fails when autom4te.cache exists.
-	     (delete-file-recursively "autom4te.cache")
+             ;; automake is out of date in the source
+             ;; autoreconf updates the automake scripts
+             (invoke "autoreconf")
+             ;; Build fails when autom4te.cache exists.
+             (delete-file-recursively "autom4te.cache")
             #t))
         (add-after 'install 'delete-freedinkedit-desktop
           (lambda* (#:key outputs #:allow-other-keys)
@@ -4567,6 +4611,105 @@ for common mesh file formats, and collision detection.")
    (home-page "https://irrlicht.sourceforge.io/")
    (license license:zlib)))

+(define-public pegasus-frontend
+  (let ((commit "c3462e68bf3a178420b44f356998255f8d82a113")
+        (revision "weekly_2024w38"))
+    (package
+      (name "pegasus-frontend")
+      (version (git-version "0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mmatyas/pegasus-frontend")
+               (commit commit)))
+         (sha256
+          (base32 "1p350nlbif33mw5cbqxwli5yf47dxpransxlj2wp8xvh4w1rb3jx"))
+         (file-name (git-file-name name version))))
+      (build-system qt-build-system)
+      (arguments
+       (list
+        #:qtbase qtbase-5
+        #:make-flags
+        #~(list (string-append "INSTALL_DESKTOPDIR="
+                               #$output "/share/applications")
+                (string-append "INSTALL_ICONDIR="
+                               #$output "/share/icons/hicolor"))
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'copy-modules
+              (lambda* (#:key inputs #:allow-other-keys)
+                (copy-recursively #$(this-package-native-input
+                                     "SortFilterProxyModel")
+                                  "./thirdparty/SortFilterProxyModel")
+                (copy-recursively #$(this-package-native-input
+                                     "pegasus-theme-grid")
+                                  "./src/themes/pegasus-theme-grid")
+                (copy-recursively #$(this-package-native-input
+                                     "pegasus-frontend-translations") "./lang")))
+            (add-before 'check 'prepare-test-env
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (setenv "QT_QPA_PLATFORM" "offscreen")
+                  (setenv "QT_QUICK_BACKEND" "software"))))
+            (add-after 'qt-wrap 'gst-wrap
+              (lambda* (#:key inputs #:allow-other-keys)
+                (wrap-program (string-append #$output "/bin/pegasus-fe")
+                  `("GST_PLUGIN_PATH" suffix
+                    ,(search-path-as-list '("lib/gstreamer-1.0")
+                                          (map cdr inputs)))))))))
+      (inputs (list sdl2
+                    bash-minimal
+                    qtbase-5
+                    qtsvg-5
+                    qtdeclarative-5
+                    qtgraphicaleffects
+                    qtmultimedia-5
+                    qtgamepad-5
+                    gst-plugins-base
+                    gst-plugins-bad
+                    gst-plugins-good))
+      (native-inputs (list qttools-5
+                           (origin
+                             (method git-fetch)
+                             (uri (git-reference
+                                   (url
+                                    "https://github.com/mmatyas/pegasus-frontend-translations")
+                                   (commit
+                                    "46c7cecec745bdd4c61bfc7ecb967156ad208642")))
+                             (file-name "pegasus-frontend-translations")
+                             (sha256 (base32
+                                      "0rvlx199wdrjxr8pgibga556zf4njq4w2n31fdirqgb631rgyqxd")))
+                           (origin
+                             (method git-fetch)
+                             (uri (git-reference
+                                   (url
+                                    "https://github.com/mmatyas/pegasus-theme-grid")
+                                   (commit
+                                    "5951db6f2a4fe0db6a4fd6f00da1f280cadfa536")))
+                             (file-name "pegasus-theme-grid")
+                             (sha256 (base32
+                                      "1nfnq6lppdm9ni6jk48l1i7hk90m8w2p13swl5nr4zwczln8dbz1")))
+                           (origin
+                             (method git-fetch)
+                             (uri (git-reference
+                                   (url
+                                    "https://github.com/mmatyas/SortFilterProxyModel")
+                                   (commit
+                                    "2061f8136ba372fd06c1928a610258b7d88cb144")))
+                             (file-name "SortFilterProxyModel")
+                             (sha256 (base32
+                                      "16va8fcf7v6kfm8r9zym0516qrk4vlsy5wmpd3r3002wpz8q39h2")))))
+      (synopsis
+       "Graphical frontend for launching and managing game collection")
+      (description
+       "Pegasus is a graphical frontend for browsing your game library and
+  launching all kinds of games from the same place. It's focusing on
+  customizability, cross platform support (including embedded)
+  and high performance.")
+      (home-page "https://pegasus-frontend.org")
+      (license license:gpl3+))))
+
 (define-public mars
  ;; No official release since 2013: use the latest commit.
  (let ((commit   "84664cda094efe6e49d9b1550e4f4f98c33eefa2")
@@ -4905,7 +5048,7 @@ Protocol).")
 (define-public extremetuxracer
  (package
    (name "extremetuxracer")
-    (version "0.8.2")
+    (version "0.8.4")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -4913,7 +5056,7 @@ Protocol).")
                    version "/etr-" version ".tar.xz"))
              (sha256
               (base32
-                "0knd22lzhzqih1w92y6m7yxha376c6ydl22wy4xm6jg2x5jlk1qw"))))
+                "1rbk8zqfzzk90znf3f5lqqa12j0n6pm2qgwzabzmlnkm1k68acps"))))
    (build-system gnu-build-system)
    (native-inputs
     (list pkg-config))
@@ -5378,7 +5521,7 @@ falling, themeable graphics and sounds, and replays.")
    (name "wesnoth")
    ;; Even-numbered minor versions indicate stable versions:
    ;; https://wiki.wesnoth.org/ReleasingWesnoth#Version_numbering
-    (version "1.18.6")
+    (version "1.18.7")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -5387,7 +5530,7 @@ falling, themeable graphics and sounds, and replays.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0cdlczxczqgzdaqwydb9gfgi7d9jc39li72p2rb5nk1rlgfff79s"))))
+                "0hdrp4xm9d8kj8id2g5q0wwdwykx4a0f1cs8a7fghmv0czryfv7f"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                  ;no test target
@@ -6606,7 +6749,7 @@ in-window at 640x480 resolution or fullscreen.")
 (define-public warzone2100
  (package
    (name "warzone2100")
-    (version "4.6.1")
+    (version "4.6.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/warzone2100/releases/"
@@ -6622,7 +6765,7 @@ in-window at 640x480 resolution or fullscreen.")
                                 "inih" "re2" "utf8proc" "utfcpp")))))
              (sha256
                (base32
-                  "02x5ihkpfkpjxwvh00d8yqzd796af7d684nk96hzhhq28qw5bb16"))))
+                  "0fmiy0pm56yy69c0nhynjdiaslwlfg8cdvfl5s78g5pzdi1y47s3"))))
    (build-system cmake-build-system)
    (arguments (list #:configure-flags #~'("-GNinja"
                                           "-DWZ_DISTRIBUTOR=Guix"
@@ -6659,7 +6802,7 @@ in-window at 640x480 resolution or fullscreen.")
                  opusfile
                  physfs
                  re2
-                  sdl2
+                  sdl3
                  sqlite
                  utf8proc
                  utfcpp
@@ -8148,7 +8291,7 @@ fish.  The whole game is accompanied by quiet, comforting music.")
 (define-public crawl
  (package
    (name "crawl")
-    (version "0.34.0")
+    (version "0.34.1")
    (source
     (origin
       (method git-fetch)
@@ -8157,7 +8300,7 @@ fish.  The whole game is accompanied by quiet, comforting music.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "16fsvrzcndrplw8zcn6nh8459x8zl5xdnf9r9hzh4ll2a4w9dkcr"))
+        (base32 "09x4n4w3rw8sldwprb03yg1igwh4m09iw00g2iq30466jryys6bv"))
       (patches (search-patches "crawl-upgrade-saves.patch"))))
    (build-system gnu-build-system)
    (inputs
@@ -9100,7 +9243,7 @@ elements to achieve a simple goal in the most complex way possible.")
 (define-public the-powder-toy
  (package
    (name "the-powder-toy")
-    (version "99.3.384")
+    (version "99.5.394")
    (source
     (origin
       (method git-fetch)
@@ -9109,7 +9252,7 @@ elements to achieve a simple goal in the most complex way possible.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0l067j0bbzvr0i2prxrgb0af4xdpl648x741jgnyp4bjzdbm61x7"))
+        (base32 "0wd0sg3lpl9xafyj76syvpdjh574cxjmxaf9kssfjjxs20y3hjn8"))
       (snippet
        #~(begin (use-modules (guix build utils))
                 (substitute* "meson.build"
@@ -10100,7 +10243,7 @@ your score gets higher, you level up and the blocks fall faster.")
                                     "-DES_USE_SYSTEM_LIBRARIES=1")
           #:make-flags #~(list (string-append "PREFIX=" #$output))
           #:build-type "Release"
-	   #:tests? (not (target-x86-32?))
+           #:tests? (not (target-x86-32?))
           #:phases
           #~(modify-phases %standard-phases
               (add-after 'unpack 'fix-paths
@@ -11084,7 +11227,7 @@ levels to unlock.")
 (define-public simgear
  (package
    (name "simgear")
-    (version "2024.1.4")
+    (version "2024.1.5")
    (source
     (origin
       (method git-fetch)
@@ -11096,7 +11239,7 @@ levels to unlock.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1k855yxq06gv42f83c3k9hrsz05xxj6vi1c60227zm0dx3jkb4jq"))
+        (base32 "1ygdc8xkrj7qzm9zklibb1v5w3jp718707zmiwl8fn63sxanbqsq"))
       (modules '((guix build utils)))
       (snippet
        '(begin
@@ -11148,7 +11291,7 @@ and also provides the base for the FlightGear Flight Simulator.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0xlpry1g5xci4qmj37rjk4sdhg9zada0vw6a047gsm7cq5p7pkxk"))
+        (base32 "0hpfvacnba2kcyjwm01lkrqkz0gccvljjil8b0ai42l38hxn5r5h"))
       (modules '((guix build utils)))
       (snippet
        '(begin
@@ -11232,12 +11375,12 @@ and also provides the base for the FlightGear Flight Simulator.")
       ("flightgear-data"
        ,(origin
           (method url-fetch)
-           (uri (string-append "mirror://sourceforge/flightgear/release-"
+           (uri (string-append "https://mirrors.ibiblio.org/flightgear/ftp/release-"
                               (version-major+minor version) "/"
                               "FlightGear-" version "-data.txz"))
           (sha256
            (base32
-             "0pgwxpm5cdm0y6klrmpqspmhmqsfxshz4jljw2kd4wy18fqzd1s6"))))))
+             "0d81yz9jqmg2jzw5rm769pl1j18pvh2mjkx61l13kw76ja8p6159"))))))
    (home-page "https://www.flightgear.org/")
    (synopsis "Flight simulator")
    (description "The goal of the FlightGear project is to create a
@@ -11312,46 +11455,33 @@ to remap axis and buttons and a way to calibrate joysticks.")
 (define-public jumpnbump
  (package
    (name "jumpnbump")
-    (version "1.61")
+    (version "1.70")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                    (url "https://gitlab.com/LibreGames/jumpnbump.git")
-                    (commit version)))
+                     (url "https://gitlab.com/LibreGames/jumpnbump.git")
+                     (commit version)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "12lwl5sl5n009nb83r8l4lakb9286csqdf1ynpmwwydy17giqsdp"))))
+                "1irpssijxrfrjm023v642dl3aw4ldlv95fh073jlpdpl1mwqz71a"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:make-flags
-       (list "CC=gcc"
-             (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:tests? #f                      ;no test
-       #:phases
-       (modify-phases %standard-phases
-         ;; There is no configure script
-         (replace 'configure
-           (lambda _
-             (substitute* "Makefile"
-               (("-funroll-loops")
-                "-funroll-loops -fcommon")
-               (("SDL_CFLAGS =")
-                "SDL_CFLAGS = -fcommon"))))
-         (add-after 'unpack 'fix-sdl-path
-           ;; XXX: For some reason, `sdl2-config' reports stand-alone SDL
-           ;; directory, not SDL-union provided as an input to the package.
-           ;; We force the latter with "--prefix=" option.
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("sdl2-config" command)
-                (string-append command " --prefix=" (assoc-ref inputs "sdl")))))))))
+     (list
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              (string-append "PREFIX=" #$output)
+              "SYSINSTALL=1")
+      #:tests? #f                       ;no test
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure))))        ;no configure script
    (inputs
-     `(("bzip2" ,bzip2)
-       ("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net)))
-       ("zlib" ,zlib)))
+     (list bzip2
+           (sdl-union (list sdl2 sdl2-mixer sdl2-net))
+           zlib))
    (native-inputs
-     `(("gettext" ,gettext-minimal)))   ;for msgfmt
+     (list gettext-minimal))            ;for msgfmt
    (home-page "https://gitlab.com/LibreGames/jumpnbump")
    (synopsis "Multiplayer platform game with bunnies")
    (description "You, as a bunny, have to jump on your opponents to make them
@@ -11487,7 +11617,7 @@ player adaptability for character progression.")
 (define-public li-ri
  (package
    (name "li-ri")
-    (version "3.1.5")
+    (version "3.1.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -11496,7 +11626,7 @@ player adaptability for character progression.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1fd5hl9qhgvyix51la8sl34jzk4mcin8sai05gidy2r2grb1dy4s"))))
+                "09r6l0sbxp3q750kpbrx513yrafmg7a2769j4wgx812lsk92n3hg"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #false              ;no tests
@@ -12154,7 +12284,7 @@ for using any UCI engine and also to connect UCI engines to Lichess and IRC.")
        (base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv"))))
    (build-system glib-or-gtk-build-system)
    (inputs (list automake autoconf pkg-config intltool
-		  gettext-minimal libtool glib gtk+-2 boost))
+                  gettext-minimal libtool glib gtk+-2 boost))
    (arguments (list #:tests? #f))  ; No tests in source.
    (home-page "http://nine-mens-morris.net/downloads.html")
    (synopsis "Implementation of the board game Nine Men's Morris")
@@ -13378,8 +13508,8 @@ rules to solve permissions issues.")

 (define-public steam-devices-udev-rules
  ;; Last release from 2019-04-10
-  (let ((commit "13443480a64fe8f10676606bd57da6de89f8ccb1")
-        (revision "1"))
+  (let ((commit "7dde9ecb3c386363ecd9bd0a3b77e4756d200704")
+        (revision "2"))
    (package
      (name "steam-devices-udev-rules")
      (version (git-version "1.0.0.61" revision commit))
@@ -13391,7 +13521,7 @@ rules to solve permissions issues.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "0i086gmnk93q76sw1laa9br6b7zj2r6nrrw7d64y4q9wcrlxw2bi"))))
+                  "0w0xkgi9fpvdbpl57f8fy2nwy2icm6iag39b8ifpkijlxgclx1p3"))))
      (build-system copy-build-system)
      (arguments
       '(#:install-plan '(("./" "lib/udev/rules.d"
@@ -41,13 +41,13 @@
 (define-public gawk
  (package
   (name "gawk")
-   (version "5.3.2")
+   (version "5.3.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/gawk/gawk-" version
                                ".tar.xz"))
            (sha256
-             (base32 "1k699kfajwzw4dyw1m9h9kld1gdv00nfy04b2f952w6y15jlihzq"))))
+             (base32 "02x97iyl9v84as4rkdrrkfk2j4vy4r3hpp3rkp3gh3qxs79id76a"))))
   (build-system gnu-build-system)
   (arguments
    (list #:phases
@@ -56,7 +56,7 @@
                (lambda* (#:key inputs #:allow-other-keys)
                  ;; Refer to the right shell.
                  (let ((/bin/sh (search-input-file inputs "bin/sh")))
-                    (substitute* '("io.c" "builtin.c")
+                    (substitute* "io.c"
                      (("/bin/sh") /bin/sh))

                    ;; When cross-compiling, remove dependencies on the
@@ -73,7 +73,7 @@
                  ;; Remove dependency on 'more' (from util-linux), which
                  ;; would needlessly complicate bootstrapping.
                  (substitute* "test/Makefile"
-                    (("\\| \\$\\$\\{PAGER:-more\\}") ""))
+                    (("\\| more") ""))

                  ;; Adjust the shebang in that file since it is then diff'd
                  ;; against the actual test output.
@@ -80,16 +80,16 @@ where the OS part is overloaded to denote a specific ABI---into GCC
  (cond ((string-match "^mips64el.*gnuabin?64$" target)
         ;; Triplets recognized by glibc as denoting the N64 ABI; see
         ;; ports/sysdeps/mips/preconfigure.
-         #~(list "--with-abi=64"))
+         '("--with-abi=64"))

        ((string-match "^arm.*-gnueabihf$" target)
-         #~(list "--with-arch=armv7-a"
-                 "--with-float=hard"
-                 "--with-mode=thumb"
-                 "--with-fpu=neon"))
+         '("--with-arch=armv7-a"
+           "--with-float=hard"
+           "--with-mode=thumb"
+           "--with-fpu=neon"))

        ((string-match "x86_64-linux-gnux32" target)
-         #~(list "--with-abi=mx32"))
+         '("--with-abi=mx32"))

        ((and (string-suffix? "-gnu" target)
              (not (string-contains target "-linux")))
@@ -97,24 +97,36 @@ where the OS part is overloaded to denote a specific ABI---into GCC
         ;; with:
         ;;   libcilkrts/runtime/os-unix.c:388:2: error: #error "Unknown architecture"
         ;; Cilk has been removed from GCC 8 anyway.
-         #~(list "--disable-libcilkrts"))
+         '("--disable-libcilkrts"))

        ;; glibc needs the 128-bit long double type on these architectures.
        ((or (string-prefix? "powerpc64le-" target)
             (string-prefix? "powerpc-" target))
-         #~(list "--with-long-double-128"))
+         '("--with-long-double-128"))

        ;; GCC 11.3.0's <libgcov.h> includes <sys/mman.h>, which MinGW lacks:
        ;; <https://bugs.gentoo.org/show_bug.cgi?id=843989>.
        ((target-mingw? target)
-         #~(list "--disable-gcov"))
+         '("--disable-gcov"))

        (else
         ;; TODO: Add `arm.*-gnueabi', etc.
-         #~(list))))
+         '())))

 (define-public gcc-base
  (let* ((stripped? #t)      ;whether to strip the compiler, not the libraries
+         (maybe-target-tools
+          (lambda ()
+            ;; Return the `_FOR_TARGET' variables that are needed when
+            ;; cross-compiling GCC.
+            (let ((target (%current-target-system)))
+              (if target
+                  (map (lambda (var tool)
+                         (string-append (string-append var "_FOR_TARGET")
+                                        "=" target "-" tool))
+                       '("CC"  "CXX" "LD" "AR" "NM" "OBJDUMP" "RANLIB" "STRIP")
+                       '("gcc" "g++" "ld" "ar" "nm" "objdump" "ranlib" "strip"))
+                  '()))))
         (libdir
          (let ((base '(or (assoc-ref outputs "lib")
                           (assoc-ref outputs "out"))))
@@ -122,7 +134,45 @@ where the OS part is overloaded to denote a specific ABI---into GCC
              ;; Return the directory that contains lib/libgcc_s.so et al.
              (if (%current-target-system)
                  `(string-append ,base "/" ,(%current-target-system))
-                  base)))))
+                  base))))
+         (configure-flags
+          (lambda ()
+            ;; This is terrible.  Since we have two levels of quasiquotation,
+            ;; we have to do this convoluted thing just so we can insert the
+            ;; contents of (maybe-target-tools).
+            (list 'quasiquote
+                  (append
+                   '("--enable-plugin"
+                     "--enable-languages=c,c++,objc,obj-c++"
+                     "--disable-multilib"
+                     "--with-system-zlib"
+
+                     ;; No pre-compiled libstdc++ headers, to save space.
+                     "--disable-libstdcxx-pch"
+
+                     "--with-local-prefix=/no-gcc-local-prefix"
+
+                     ;; With a separate "lib" output, the build system
+                     ;; incorrectly guesses GPLUSPLUS_INCLUDE_DIR, so force
+                     ;; it.  (Don't use a versioned sub-directory, that's
+                     ;; unnecessary.)
+                     ,(string-append "--with-gxx-include-dir="
+                                     (assoc-ref %outputs "out")
+                                     "/include/c++")
+
+                     ,(let ((libc (assoc-ref %build-inputs "libc")))
+                        (if libc
+                            (string-append "--with-native-system-header-dir=" libc
+                                           "/include")
+                            "--without-headers")))
+
+                   ;; Pass the right options for the target triplet.
+                   (let ((triplet
+                          (or (%current-target-system)
+                              (nix-system->gnu-triplet (%current-system)))))
+                     (gcc-configure-flags-for-triplet triplet))
+
+                   (maybe-target-tools))))))
    (hidden-package
     (package
       (name "gcc")
@@ -152,239 +202,201 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                            texinfo-5))

       (arguments
-        (list
-         #:out-of-source? #t
-         #:configure-flags
-         #~(append
-            (list "--enable-plugin"
-                  "--enable-languages=c,c++,objc,obj-c++"
-                  "--disable-multilib"
-                  "--with-system-zlib"
+        `(#:out-of-source? #t
+          #:configure-flags ,(configure-flags)

-                  ;; No pre-compiled libstdc++ headers, to save space.
-                  "--disable-libstdcxx-pch"
+          #:make-flags
+          ;; None of the flags below are needed when doing a Canadian cross.
+          ;; TODO: Simplify this.
+          ,(if (%current-target-system)
+               (if stripped?
+                   ''("CFLAGS=-g0 -O2")
+                   ''())
+               `(let* ((libc        (assoc-ref %build-inputs "libc"))
+                       (libc-native (or (assoc-ref %build-inputs "libc-native")
+                                        libc)))
+                  `(,@(if libc
+                          (list (string-append "LDFLAGS_FOR_TARGET="
+                                               "-B" libc "/lib "
+                                               "-Wl,-dynamic-linker "
+                                               "-Wl," libc
+                                               ,(glibc-dynamic-linker)))
+                          '())

-                  "--with-local-prefix=/no-gcc-local-prefix"
+                    ;; Native programs like 'genhooks' also need that right.
+                    ,(string-append "LDFLAGS="
+                                    "-Wl,-rpath=" libc-native "/lib "
+                                    "-Wl,-dynamic-linker "
+                                    "-Wl," libc-native ,(glibc-dynamic-linker))
+                    ,(string-append "BOOT_CFLAGS=-O2 "
+                                    ,(if stripped? "-g0" "-g")))))

-                  ;; With a separate "lib" output, the build system
-                  ;; incorrectly guesses GPLUSPLUS_INCLUDE_DIR, so force
-                  ;; it.  (Don't use a versioned sub-directory, that's
-                  ;; unnecessary.)
-                  (string-append "--with-gxx-include-dir="
-                                 #$output "/include/c++")
+          #:tests? #f

-                  (let ((libc (assoc-ref %build-inputs "libc")))
-                    (if libc
-                        (string-append "--with-native-system-header-dir=" libc
-                                       "/include")
-                        "--without-headers")))
-
-            ;; Pass the right options for the target triplet.
-            #$(gcc-configure-flags-for-triplet
-               (or (%current-target-system)
-                   (nix-system->gnu-triplet (%current-system))))
-
-            ;; Return the `_FOR_TARGET' variables that are needed when
-            ;; cross-compiling GCC.
-            #$(let ((target (%current-target-system)))
-                (if target
-                    #~(map (lambda (var tool)
-                             (string-append (string-append var "_FOR_TARGET")
-                                            "=" #$target "-" tool))
-                           '("CC"  "CXX" "LD" "AR" "NM" "OBJDUMP" "RANLIB" "STRIP")
-                           '("gcc" "g++" "ld" "ar" "nm" "objdump" "ranlib" "strip"))
-                    #~(list))))
-         #:make-flags
-         (cond
-          ((and (%current-target-system) stripped?)
-           #~(list "CFLAGS=-g0 -O2"))
-          ((%current-target-system)
-           #~(list)) ;None of the flags are needed when doing a Canadian cross.
-          (else
-           #~(let* ((libc (assoc-ref %build-inputs "libc"))
-                    (libc-native (or (assoc-ref %build-inputs "libc-native")
-                                     libc))
-                    (loader #$(glibc-dynamic-linker)))
-               (cons*
-                ;; Native programs like 'genhooks' need that right.
-                (string-append "LDFLAGS="
-                               "-Wl,-rpath=" libc-native "/lib "
-                               "-Wl,-dynamic-linker "
-                               "-Wl," libc-native loader)
-                (string-append "BOOT_CFLAGS=-O2 "
-                               (if #$stripped? "-g0" "-g"))
-                (if libc
-                    (list (string-append "LDFLAGS_FOR_TARGET="
-                                         "-B" libc "/lib "
-                                         "-Wl,-dynamic-linker "
-                                         "-Wl," libc loader))
-                    (list))))))
-         #:tests? #f
-
-         #:phases
-         #~(modify-phases %standard-phases
-             (add-before 'configure 'relax-gcc-14s-strictness
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let ((bash (search-input-file inputs "/bin/bash"))
-                       (wrapper (string-append (getcwd) "/gcc.sh"))
-                       (stage-wrapper (string-append (getcwd) "/stage-gcc.sh")))
-                   (with-output-to-file wrapper
-                     (lambda _
-                       (format #t "#! ~a
+          #:phases
+          (modify-phases %standard-phases
+            (add-before 'configure 'relax-gcc-14s-strictness
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((bash (assoc-ref inputs "bash"))
+                      (wrapper (string-append (getcwd) "/gcc.sh"))
+                      (stage-wrapper (string-append (getcwd) "/stage-gcc.sh")))
+                  (with-output-to-file wrapper
+                    (lambda _
+                      (format #t "#! ~a/bin/bash
 exec gcc \"$@\" \
    -Wno-error=implicit-function-declaration"
-                               bash)))
-                   (chmod wrapper #o555)
-                   (with-output-to-file stage-wrapper
-                     (lambda _
-                       (format #t "#! ~a
+                              bash)))
+                  (chmod wrapper #o555)
+                  (with-output-to-file stage-wrapper
+                    (lambda _
+                      (format #t "#! ~a/bin/bash
 exec \"$@\" \
    -Wno-error=implicit-function-declaration"
-                               bash)))
-                   (chmod stage-wrapper #o555)
-                   ;; Rather than adding CC to #:configure-flags and
-                   ;; STAGE_CC_WRAPPER to #:make-flags, we add them to the
-                   ;; environment in this easily removable stage.
-                   (cond (#$(%current-target-system) ;cross-build?
-                          (setenv "CC_FOR_BUILD" wrapper))
-                         (else
-                          (setenv "CC" wrapper)
-                          (setenv "STAGE_CC_WRAPPER" stage-wrapper))))))
-             (add-before 'configure 'pre-configure
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 (let ((libdir #$(libdir))
-                       (libc   (assoc-ref inputs "libc")))
-                   (when libc
-                     ;; The following is not performed for `--without-headers'
-                     ;; cross-compiler builds.
+                              bash)))
+                  (chmod stage-wrapper #o555)
+                  ;; Rather than adding CC to #:configure-flags and
+                  ;; STAGE_CC_WRAPPER to #:make-flags, we add them to the
+                  ;; environment in this easily removable stage.
+                  (cond (,(%current-target-system) ;cross-build?
+                         (setenv "CC_FOR_BUILD" wrapper))
+                        (else
+                         (setenv "CC" wrapper)
+                         (setenv "STAGE_CC_WRAPPER" stage-wrapper))))))
+            (add-before 'configure 'pre-configure
+              (lambda* (#:key inputs outputs #:allow-other-keys)
+                (let ((libdir ,(libdir))
+                      (libc   (assoc-ref inputs "libc")))
+                  (when libc
+                    ;; The following is not performed for `--without-headers'
+                    ;; cross-compiler builds.

-                     ;; Join multi-line definitions of GLIBC_DYNAMIC_LINKER* into a
-                     ;; single line, to allow the next step to work properly.
-                     (for-each
-                      (lambda (x)
-                        (substitute* (find-files "gcc/config"
-                                                 "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
-                          (("(#define (GLIBC|GNU_USER)_DYNAMIC_LINKER.*)\\\\\n$" _ line)
-                           line)))
-                      '(1 2 3))
+                    ;; Join multi-line definitions of GLIBC_DYNAMIC_LINKER* into a
+                    ;; single line, to allow the next step to work properly.
+                    (for-each
+                     (lambda (x)
+                       (substitute* (find-files "gcc/config"
+                                                "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
+                         (("(#define (GLIBC|GNU_USER)_DYNAMIC_LINKER.*)\\\\\n$" _ line)
+                          line)))
+                     '(1 2 3))

-                     ;; Fix the dynamic linker's file name.
-                     (substitute* (find-files "gcc/config"
-                                              "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
-                       (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ \t]*).*$"
-                         _ gnu-user suffix)
-                        (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
-                                gnu-user suffix
-                                (string-append libc #$(glibc-dynamic-linker)))))
+                    ;; Fix the dynamic linker's file name.
+                    (substitute* (find-files "gcc/config"
+                                             "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
+                      (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ \t]*).*$"
+                        _ gnu-user suffix)
+                       (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
+                               gnu-user suffix
+                               (string-append libc ,(glibc-dynamic-linker)))))

-                     ;; Tell where to find libstdc++, libc, and `?crt*.o', except
-                     ;; `crt{begin,end}.o', which come with GCC.
-                     (substitute* (find-files "gcc/config"
-                                              "^gnu-user.*\\.h$")
-                       (("#define GNU_USER_TARGET_LIB_SPEC (.*)$" _ suffix)
-                        ;; Help libgcc_s.so be found (see also below.)  Always use
-                        ;; '-lgcc_s' so that libgcc_s.so is always found by those
-                        ;; programs that use 'pthread_cancel' (glibc dlopens
-                        ;; libgcc_s.so when pthread_cancel support is needed, but
-                        ;; having it in the application's RUNPATH isn't enough; see
-                        ;; <http://sourceware.org/ml/libc-help/2013-11/msg00023.html>.)
-                        ;;
-                        ;; NOTE: The '-lgcc_s' added below needs to be removed in a
-                        ;; later phase of %gcc-static.  If you change the string
-                        ;; below, make sure to update the relevant code in
-                        ;; %gcc-static package as needed.
-                        (format #f "#define GNU_USER_TARGET_LIB_SPEC \
+                    ;; Tell where to find libstdc++, libc, and `?crt*.o', except
+                    ;; `crt{begin,end}.o', which come with GCC.
+                    (substitute* (find-files "gcc/config"
+                                             "^gnu-user.*\\.h$")
+                      (("#define GNU_USER_TARGET_LIB_SPEC (.*)$" _ suffix)
+                       ;; Help libgcc_s.so be found (see also below.)  Always use
+                       ;; '-lgcc_s' so that libgcc_s.so is always found by those
+                       ;; programs that use 'pthread_cancel' (glibc dlopens
+                       ;; libgcc_s.so when pthread_cancel support is needed, but
+                       ;; having it in the application's RUNPATH isn't enough; see
+                       ;; <http://sourceware.org/ml/libc-help/2013-11/msg00023.html>.)
+                       ;;
+                       ;; NOTE: The '-lgcc_s' added below needs to be removed in a
+                       ;; later phase of %gcc-static.  If you change the string
+                       ;; below, make sure to update the relevant code in
+                       ;; %gcc-static package as needed.
+                       (format #f "#define GNU_USER_TARGET_LIB_SPEC \
 \"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib -lgcc_s}} \" ~a"
-                                libc libc libdir suffix))
-                       (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
-                        (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
+                               libc libc libdir suffix))
+                      (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
+                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"
 ~a"
-                                libc line)))
+                               libc line)))

-                     ;; The rs6000 (a.k.a. powerpc) config in GCC does not use
-                     ;; GNU_USER_* defines.  Do the above for this case.
-                     (substitute*
-                         "gcc/config/rs6000/sysv4.h"
-                       (("#define LIB_LINUX_SPEC (.*)$" _ suffix)
-                        (format #f "#define LIB_LINUX_SPEC \
+                    ;; The rs6000 (a.k.a. powerpc) config in GCC does not use
+                    ;; GNU_USER_* defines.  Do the above for this case.
+                    (substitute*
+                        "gcc/config/rs6000/sysv4.h"
+                      (("#define LIB_LINUX_SPEC (.*)$" _ suffix)
+                       (format #f "#define LIB_LINUX_SPEC \
 \"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib -lgcc_s}} \" ~a"
-                                libc libc libdir suffix))
-                       (("#define	STARTFILE_LINUX_SPEC.*$" line)
-                        (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
+                               libc libc libdir suffix))
+                      (("#define	STARTFILE_LINUX_SPEC.*$" line)
+                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"
 ~a"
-                                libc line))))
+                               libc line))))

-                   (when (file-exists? "gcc/config/rs6000")
-                     ;; Force powerpc libdir to be /lib and not /lib64
-                     (substitute* (find-files "gcc/config/rs6000")
-                       (("/lib64") "/lib")))
+                  (when (file-exists? "gcc/config/rs6000")
+                    ;; Force powerpc libdir to be /lib and not /lib64
+                    (substitute* (find-files "gcc/config/rs6000")
+                      (("/lib64") "/lib")))

-                   ;; Don't retain a dependency on the build-time sed.
-                   (substitute* "fixincludes/fixincl.x"
-                     (("static char const sed_cmd_z\\[\\] =.*;")
-                      "static char const sed_cmd_z[] = \"sed\";"))
+                  ;; Don't retain a dependency on the build-time sed.
+                  (substitute* "fixincludes/fixincl.x"
+                    (("static char const sed_cmd_z\\[\\] =.*;")
+                     "static char const sed_cmd_z[] = \"sed\";"))

-                   ;; Aarch64 support didn't land in GCC until the 4.8 series.
-                   (when (file-exists? "gcc/config/aarch64")
-                     ;; Force Aarch64 libdir to be /lib and not /lib64
-                     (substitute* "gcc/config/aarch64/t-aarch64-linux"
-                       (("lib64") "lib")))
+                  ;; Aarch64 support didn't land in GCC until the 4.8 series.
+                  (when (file-exists? "gcc/config/aarch64")
+                    ;; Force Aarch64 libdir to be /lib and not /lib64
+                    (substitute* "gcc/config/aarch64/t-aarch64-linux"
+                      (("lib64") "lib")))

-                   ;; The STARTFILE_PREFIX_SPEC prevents gcc from finding the
-                   ;; gcc:lib output, which causes ld to not find -lgcc_s.
-                   (when (file-exists? "gcc/config/riscv")
-                     (substitute* '("gcc/config/riscv/linux.h"
-                                    "gcc/config/riscv/riscv.h")  ; GCC < 10
-                       (("define STARTFILE_PREFIX_SPEC")
-                        "define __STARTFILE_PREFIX_SPEC")))
+                  ;; The STARTFILE_PREFIX_SPEC prevents gcc from finding the
+                  ;; gcc:lib output, which causes ld to not find -lgcc_s.
+                  (when (file-exists? "gcc/config/riscv")
+                    (substitute* '("gcc/config/riscv/linux.h"
+                                   "gcc/config/riscv/riscv.h")  ; GCC < 10
+                      (("define STARTFILE_PREFIX_SPEC")
+                      "define __STARTFILE_PREFIX_SPEC")))

-                   (when (file-exists? "libbacktrace")
-                     ;; GCC 4.8+ comes with libbacktrace.  By default it builds
-                     ;; with -Werror, which fails with a -Wcast-qual error in glibc
-                     ;; 2.21's stdlib-bsearch.h.  Remove -Werror.
-                     (substitute* "libbacktrace/configure"
-                       (("WARN_FLAGS=(.*)-Werror" _ flags)
-                        (string-append "WARN_FLAGS=" flags)))
+                  (when (file-exists? "libbacktrace")
+                    ;; GCC 4.8+ comes with libbacktrace.  By default it builds
+                    ;; with -Werror, which fails with a -Wcast-qual error in glibc
+                    ;; 2.21's stdlib-bsearch.h.  Remove -Werror.
+                    (substitute* "libbacktrace/configure"
+                      (("WARN_FLAGS=(.*)-Werror" _ flags)
+                       (string-append "WARN_FLAGS=" flags)))

-                     (when (file-exists? "libsanitizer/libbacktrace")
-                       ;; Same in libsanitizer's bundled copy (!) found in 4.9+.
-                       (substitute* "libsanitizer/libbacktrace/Makefile.in"
-                         (("-Werror")
-                          ""))))
+                    (when (file-exists? "libsanitizer/libbacktrace")
+                      ;; Same in libsanitizer's bundled copy (!) found in 4.9+.
+                      (substitute* "libsanitizer/libbacktrace/Makefile.in"
+                        (("-Werror")
+                         ""))))

-                   ;; Add a RUNPATH to libstdc++.so so that it finds libgcc_s.
-                   ;; See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354>
-                   ;; and <http://bugs.gnu.org/20358>.
-                   (substitute* "libstdc++-v3/src/Makefile.in"
-                     (("^OPT_LDFLAGS = ")
-                      "OPT_LDFLAGS = -Wl,-rpath=$(libdir) "))
+                  ;; Add a RUNPATH to libstdc++.so so that it finds libgcc_s.
+                  ;; See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354>
+                  ;; and <http://bugs.gnu.org/20358>.
+                  (substitute* "libstdc++-v3/src/Makefile.in"
+                    (("^OPT_LDFLAGS = ")
+                     "OPT_LDFLAGS = -Wl,-rpath=$(libdir) "))

-                   ;; Move libstdc++*-gdb.py to the "lib" output to avoid a
-                   ;; circularity between "out" and "lib".  (Note:
-                   ;; --with-python-dir is useless because it imposes $(prefix) as
-                   ;; the parent directory.)
-                   (substitute* "libstdc++-v3/python/Makefile.in"
-                     (("pythondir = .*$")
-                      (string-append "pythondir = " libdir "/share"
-                                     "/gcc-$(gcc_version)/python\n")))
+                  ;; Move libstdc++*-gdb.py to the "lib" output to avoid a
+                  ;; circularity between "out" and "lib".  (Note:
+                  ;; --with-python-dir is useless because it imposes $(prefix) as
+                  ;; the parent directory.)
+                  (substitute* "libstdc++-v3/python/Makefile.in"
+                    (("pythondir = .*$")
+                     (string-append "pythondir = " libdir "/share"
+                                    "/gcc-$(gcc_version)/python\n")))

-                   ;; Avoid another circularity between the outputs: this #define
-                   ;; ends up in auto-host.h in the "lib" output, referring to
-                   ;; "out".  (This variable is used to augment cpp's search path,
-                   ;; but there's nothing useful to look for here.)
-                   (substitute* "gcc/config.in"
-                     (("PREFIX_INCLUDE_DIR")
-                      "PREFIX_INCLUDE_DIR_isnt_necessary_here")))))
+                  ;; Avoid another circularity between the outputs: this #define
+                  ;; ends up in auto-host.h in the "lib" output, referring to
+                  ;; "out".  (This variable is used to augment cpp's search path,
+                  ;; but there's nothing useful to look for here.)
+                  (substitute* "gcc/config.in"
+                    (("PREFIX_INCLUDE_DIR")
+                     "PREFIX_INCLUDE_DIR_isnt_necessary_here")))))

-             (add-after 'configure 'post-configure
-               (lambda _
-                 ;; Don't store configure flags, to avoid retaining references to
-                 ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
-                 (substitute* "Makefile"
-                   (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
-                    "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))))))
+            (add-after 'configure 'post-configure
+              (lambda _
+                ;; Don't store configure flags, to avoid retaining references to
+                ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
+                (substitute* "Makefile"
+                  (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
+                   "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))))))
       (native-search-paths %gcc-search-paths)
       (properties `((gcc-libc . ,(assoc-ref inputs "libc"))))
       (synopsis "GNU Compiler Collection")
@@ -428,21 +440,21 @@ Go.  It also includes runtime support libraries for these languages.")
            `((srfi srfi-1)
              ,@modules))
           ((#:phases phases)
-            #~(modify-phases #$phases
-                (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                  (lambda* (#:key inputs #:allow-other-keys)
-                    (let ((libc (assoc-ref inputs "libc"))
-                          (gcc (assoc-ref inputs  "gcc")))
-                      (setenv "CPLUS_INCLUDE_PATH"
-                              (string-join (fold delete
-                                                 (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                               #\:)
-                                                 (list (string-append libc "/include")
-                                                       (string-append gcc "/include/c++")))
-                                           ":"))
-                      (format #t
-                              "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                              (getenv "CPLUS_INCLUDE_PATH"))))))))))
+            `(modify-phases ,phases
+               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let ((libc (assoc-ref inputs "libc"))
+                         (gcc (assoc-ref inputs  "gcc")))
+                     (setenv "CPLUS_INCLUDE_PATH"
+                             (string-join (fold delete
+                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                              #\:)
+                                                (list (string-append libc "/include")
+                                                      (string-append gcc "/include/c++")))
+                                          ":"))
+                     (format #t
+                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
    (supported-systems (fold delete %supported-systems
                             '("aarch64-linux" "riscv64-linux"
                               "powerpc64le-linux" "x86_64-gnu")))))
@@ -486,21 +498,21 @@ Go.  It also includes runtime support libraries for these languages.")
           ;; For native builds of some GCC versions the C++ include path needs to
           ;; be adjusted so it does not interfere with GCC's own build processes.
           ((#:phases phases)
-            #~(modify-phases #$phases
-                (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                  (lambda* (#:key inputs #:allow-other-keys)
-                    (let ((libc (assoc-ref inputs "libc"))
-                          (gcc (assoc-ref inputs  "gcc")))
-                      (setenv "CPLUS_INCLUDE_PATH"
-                              (string-join (fold delete
-                                                 (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                               #\:)
-                                                 (list (string-append libc "/include")
-                                                       (string-append gcc "/include/c++")))
-                                           ":"))
-                      (format #t
-                              "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                              (getenv "CPLUS_INCLUDE_PATH"))))))))))
+            `(modify-phases ,phases
+               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let ((libc (assoc-ref inputs "libc"))
+                         (gcc (assoc-ref inputs  "gcc")))
+                     (setenv "CPLUS_INCLUDE_PATH"
+                             (string-join (fold delete
+                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                              #\:)
+                                                (list (string-append libc "/include")
+                                                      (string-append gcc "/include/c++")))
+                                          ":"))
+                     (format #t
+                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
    (supported-systems (fold delete %supported-systems
                             '("riscv64-linux" "x86_64-gnu")))
    (inputs
@@ -969,8 +981,7 @@ It also includes runtime support libraries for these languages.")
              (patches (search-patches "gcc-12-strmov-store-file-names.patch"
                                       "gcc-5.0-libvtv-runpath.patch"
                                       "gcc-13-libsanitizer-no-crypt.patch"
-                                       "gcc-libstdc++-newer-gcc.patch"
-                                       "gcc-mangle-guix-store.patch"))
+                                       "gcc-libstdc++-newer-gcc.patch"))
              (modules '((guix build utils)))
              (snippet gcc-canadian-cross-objdump-snippet)))
    (arguments
@@ -1001,8 +1012,7 @@ It also includes runtime support libraries for these languages.")
               (base32
                "0fna78ly417g69fdm4i5f3ms96g8xzzjza8gwp41lqr5fqlpgp70"))
              (patches (search-patches "gcc-12-strmov-store-file-names.patch"
-                                       "gcc-5.0-libvtv-runpath.patch"
-                                       "gcc-mangle-guix-store.patch"))
+                                       "gcc-5.0-libvtv-runpath.patch"))
              (modules '((guix build utils)))
              (snippet gcc-canadian-cross-objdump-snippet)))
    (arguments (substitute-keyword-arguments arguments
@@ -1035,8 +1045,7 @@ It also includes runtime support libraries for these languages.")
                "0knj4ph6y7r7yhnp1v4339af7mki5nkh7ni9b948433bhabdk3s3"))
              (patches (search-patches "gcc-12-strmov-store-file-names.patch"
                                       "gcc-5.0-libvtv-runpath.patch"
-                                       "gcc-hurd-split-stack.patch"
-                                       "gcc-mangle-guix-store.patch"))
+                                       "gcc-hurd-split-stack.patch"))
              (modules '((guix build utils)))
              (snippet gcc-canadian-cross-objdump-snippet)))
    (arguments
@@ -1187,17 +1196,10 @@ using compilers other than GCC."
          #$@(if (version>=? (package-version gcc) "11")
                 #~((add-after 'unpack 'hide-gcc-headers
                      (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                        ;; Depending on the actual gcc input, two locations
-                        ;; candidates to check to get gcc from the file tree.
-                        (let* ((gcc-nested (false-if-exception
-                                            (search-input-directory
-                                             (or native-inputs inputs)
-                                             "libexec/gcc")))
-                               (gcc-nested (or gcc-nested
-                                               (search-input-file
-                                                (or native-inputs inputs)
-                                                "bin/gcc")))
-                               (gcc (dirname (dirname gcc-nested))))
+                        (let ((gcc (assoc-ref (or native-inputs inputs)
+                                              #$(if (%current-target-system)
+                                                    "cross-gcc"
+                                                    "gcc"))))
                          ;; Fix a regression in GCC 11 where the GCC headers
                          ;; shadows glibc headers when building libstdc++.  An
                          ;; upstream fix was added in GCC 11.3.0, but it only
@@ -2936,7 +2936,7 @@ to the OSM opening hours specification.")
 (define-public josm
  (package
    (name "josm")
-    (version "19539")
+    (version "19555")
    (source (origin
              (method svn-fetch)
              (uri (svn-reference
@@ -2945,7 +2945,7 @@ to the OSM opening hours specification.")
                     (recursive? #f)))
              (sha256
               (base32
-                "05kslpvdwl4fldjzl6m2kmqvbmjv5yvipfavg01l30ywhw2c7v7v"))
+                "0kpshdj8kf9ag7h1qqrh9jqc6c9iv8v369mk60a8g7cbzf0xpblw"))
              (file-name (string-append name "-" version "-checkout"))
              (modules '((guix build utils)))
            (snippet
@@ -13,7 +13,6 @@
 ;;; Copyright © 2020 EuAndreh <eu@euandre.org>
 ;;; Copyright © 2022, 2024, 2025 gemmaro <gemmaro.dev@gmail.com>
 ;;; Copyright © 2023 Maxim Cournoyer maxim@guixotic.coop>
-;;; Copyright © 2026 Robin Templeton <robin@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,21 +57,24 @@
 (define-public gettext-minimal
  (package
    (name "gettext-minimal")
-    (version "1.0")
+    (version "0.23.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/gettext/gettext-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "06jgjxnm5xhw0d0zwl9birlwfxfgfqhk9q029j3h9941r5wrpnc5"))))
+                "0j8fijicvg8jkrisgsqbpnbmfb2mz3gx2p6pcwip82731yb7i9aj"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                            ;9 MiB of HTML
    (inputs
     (list libunistring
           libxml2
-           libtextstyle))
+           ;; TODO: ncurses is only needed for the 'libtextstyle' library.
+           ;; The next version of gettext can use a separate libtextstyle,
+           ;; but for now we include it here in 'gettext-minimal'.
+           ncurses))
    (arguments
     (list #:configure-flags #~'("--with-included-libunistring=no"
                                 "--with-included-libxml=no")
@@ -91,11 +93,11 @@
                     (("/bin/pwd") "pwd"))))
               (add-before 'check 'patch-tests
                 (lambda* (#:key inputs #:allow-other-keys)
-                   ;;libgettextlib-1.0.so => not found
+                   ;;libgettextlib-0.23.so => not found
                   (substitute* "gettext-tools/gnulib-tests/test-execute.sh"
                     (("^#!.*" all)
                      (string-append all "exit 77;\n")))
-                   (let* ((bash (search-input-file inputs "bin/sh")))
+                   (let* ((bash (which "sh")))
                     ;; Some of the files we're patching are
                     ;; ISO-8859-1-encoded, so choose it as the default
                     ;; encoding so the byte encoding is preserved.
@@ -104,7 +106,7 @@
                           (find-files "gettext-tools/tests"
                                       "^(lang-sh|msg(exec|filter)-[0-9])")
                         (("#![[:blank:]]/bin/sh")
-                          (string-append "#!" bash)))
+                          (format #f "#!~a" bash)))

                       (substitute* (cons "gettext-tools/src/msginit.c"
                                          (find-files "gettext-tools/gnulib-tests"
@@ -116,26 +118,12 @@
                         (("/bin/pwd")
                          "pwd"))

-                       #$@(if (string=? "riscv64-linux" (%current-system))
-                              ;; Unmodified test-lock will fail or crash riscv64
-                              #~((substitute* "gettext-tools/gnulib-tests/test-lock.c"
-                                   (("#define DO_TEST_RWLOCK 1")
-                                    "#define DO_TEST_RWLOCK 0")))
-                              #~())
                       #$@(if (target-hurd?)
                              #~((substitute*
                                     "gettext-tools/gnulib-tests/Makefile.in"
                                   ;; See 'coreutils' for the rationale.
                                   ((" test-tls\\$\\(EXEEXT\\) ") " ")))
                              '())))))
-               (add-after 'install 'patch-gettext.sh
-                 (lambda _
-                   ;; This matches only the relevant command invocations, but
-                   ;; is sensitive to the formatting of gettext.sh.  (The
-                   ;; string "gettext" appears in program output.)
-                   (substitute* (string-append #$output "/bin/gettext.sh")
-                     (("(^  |`|; )(gettext|ngettext|envsubst)" _ prefix program)
-                      (string-append prefix #$output "/bin/" program)))))
          #$@(if (%current-target-system)
                 #~((add-after 'install 'patch-cross-shebangs
                      (lambda _
@@ -163,31 +151,30 @@ translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
                  (cpe-name . "gettext")))
    (license gpl3+)))                             ;some files are under GPLv2+

-;; Starting with gettext 0.24 some gnulib files are no longer public.
-;; keep this here to easily fix autoreconf
-(define-public gettext-minimal-0.23
+(define-public gettext-minimal-0.21
  (package/inherit gettext-minimal
-    (version "0.23.1")
+    (version "0.21")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/gettext/gettext-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "0j8fijicvg8jkrisgsqbpnbmfb2mz3gx2p6pcwip82731yb7i9aj"))))
+                "04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))
+              (patches (search-patches "gettext-libunicode-update.patch"))))
    (arguments
     (substitute-keyword-arguments arguments
-       ((#:make-flags flags)
-        ;; these gnulib tests fail with newer libunistring
-        #~(cons (string-append "XFAIL_TESTS="
-                               "test-uc_tolower "
-                               "test-ctype_alnum "
-                               "test-ctype_alpha "
-                               "test-ctype_graph "
-                               "test-ctype_lower "
-                               "test-ctype_print "
-                               "test-ctype_punct "
-                               "test-ctype_upper") #$flags))))))
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'touch-test
+              (lambda _
+                (with-output-to-file "gettext-tools/gnulib-tests/test-execute.sh"
+                  (lambda _ (display "")))))
+            (add-before 'check 'patch-test
+              (lambda _
+                ;; This test fails with ggc-14.
+                (substitute* "gettext-tools/tests/xgettext-javascript-6"
+                  (("^#!.*" all) (string-append all "exit 77;\n")))))))))))

 ;; Use that name to avoid clashes with Guile's 'gettext' procedure.
 ;;
@@ -216,17 +203,22 @@ translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
 (define-public libtextstyle
  (package
    (name "libtextstyle")
-    (version (package-version gnu-gettext))
-    (source (package-source gnu-gettext))
+    (version "0.21")
+    (source (origin
+              (inherit (package-source gnu-gettext))
+              (uri (string-append "mirror://gnu/gettext/gettext-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      #:configure-flags #~(list "--disable-static")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "libtextstyle"))))))
+     '(#:configure-flags '("--disable-static")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'chdir
+                    (lambda _
+                      (chdir "libtextstyle")
+                      #t)))))
    ;; libtextstyle bundles libxml2, glib (a small subset thereof), and
    ;; libcroco, but it purposefully prevents users from using an external
    ;; copy, to reduce the startup time of programs using libtextstyle.
@@ -398,7 +398,8 @@ that is extensible via a plugin system.")
                        ;; environment, as it could cause Gimp to crash (see
                        ;; bug#77921).
                        `("GI_TYPELIB_PATH" prefix
-                          (,(getenv "GI_TYPELIB_PATH")))
+                          (,(getenv "GI_TYPELIB_PATH")
+                           ,(string-append #$output "/lib/girepository-1.0")))
                        `("GUIX_PYTHONPATH" prefix
                          (,(getenv "GUIX_PYTHONPATH")))
                        `("GDK_PIXBUF_MODULE_FILE" =
@@ -19,10 +19,12 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gkrellm)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
+  #:use-module (guix utils)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages pkg-config)
@@ -31,32 +33,27 @@
 (define-public gkrellm
  (package
    (name "gkrellm")
-    (version "2.3.11")
+    (version "2.5.1")
    (source
     (origin
-      (method url-fetch)
-      (uri (string-append "http://gkrellm.srcbox.net/releases/gkrellm-"
-                          version ".tar.bz2"))
-      (sha256
-       (base32 "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"))))
+       (method url-fetch)
+       (uri (string-append "https://gkrellm.srcbox.net/releases/gkrellm-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32 "0qvy2xmwmfy5f0g09yn9lr262shnx82ba04r5il2wj4qscg3r7h8"))))
    (build-system gnu-build-system)
-    (inputs
-     `(("gettext" ,gettext-minimal)
-       ("gtk+" ,gtk+-2)
-       ("libice" ,libice)
-       ("libsm" ,libsm)))
-    (native-inputs
-     (list pkg-config))
+    (inputs (list gtk+-2 libsm))
+    (native-inputs (list gettext-minimal pkg-config))
    (arguments
-     `(#:tests? #f                      ; there is no check target
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))           ; no configure script
-       #:make-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (list (string-append "INSTALLROOT=" out)
-               "CC=gcc"))))
-    (home-page "http://gkrellm.srcbox.net/")
+     (list
+      #:tests? #f ;there is no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)) ;no configure script
+      #:make-flags
+      #~(list (string-append "INSTALLROOT=" #$output)
+              (string-append "CC=" #$(cc-for-target)))))
+    (home-page "https://gkrellm.srcbox.net/")
    (synopsis "System monitors")
    (description
     "GKrellM is a single process stack of system monitors which supports
@@ -39,6 +39,7 @@
  #:use-module (gnu packages bash)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages ebook)
  #:use-module (gnu packages enchant)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
@@ -524,7 +525,8 @@ like automatic language detection, text-to-speech and clipboard buttons.")
                            #:vendor-dir "vendor"
                            #:cargo-target #$(cargo-triplet)
                            args))
-                   '(unpack-rust-crates
+                   '(prepare-rust-crates
+                     unpack-rust-crates
                     configure
                     check-for-pregenerated-files
                     patch-cargo-checksums))))))))
@@ -595,7 +597,8 @@ Transmission, and can be used to control remote Transmission instances.")
                        #:vendor-dir "vendor"
                        #:cargo-target #$(cargo-triplet)
                        args))
-               '(unpack-rust-crates
+               '(prepare-rust-crates
+                 unpack-rust-crates
                 configure
                 check-for-pregenerated-files
                 patch-cargo-checksums)))))))
@@ -679,7 +682,7 @@ and a high score table.")
 (define-public komikku
  (package
    (name "komikku")
-    (version "1.99.0")
+    (version "50.1.0")
    (source
     (origin
       (method git-fetch)
@@ -689,7 +692,7 @@ and a high score table.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
+         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -738,8 +741,10 @@ and a high score table.")
           python-cloudscraper
           python-colorthief
           python-dateparser
+           python-ebooklib
           python-emoji
           python-keyring
+           python-jxlpy
           python-lxml
           python-magic
           python-natsort
@@ -775,7 +780,7 @@ developed with the aim of being used with the Librem 5 phone.")
 (define-public komikku-servers
  (package
    (name "komikku-servers")
-    (version "1.99.0")
+    (version "50.1.0")
    (source
     (origin
       (method git-fetch)
@@ -785,7 +790,7 @@ developed with the aim of being used with the Librem 5 phone.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
+         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
    (build-system copy-build-system)
    (arguments
     (list
@@ -1335,6 +1335,74 @@ animation of closing windowed applications.")
 GNOME Shell, including the top panel, dash and overview.")
    (license license:gpl3)))

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

+(define-public papers
+  (package
+    (name "papers")
+    (version "50.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/papers/"
+                                  (version-major version) "/"
+                                  "papers-" version ".tar.xz"))
+              (sha256
+               (base32 "01dws72fb19i9jwp3r0khr7ym2ns51fifdzafb5dcr5w8vmj06rh"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:glib-or-gtk? #t
+      #:configure-flags
+      #~(list (string-append "-Dc_link_args=-Wl,-rpath=" #$output "/lib"))
+      #:imported-modules `(,@%meson-build-system-modules
+                           ,@%cargo-build-system-modules)
+      #:modules `(((guix build cargo-build-system) #:prefix cargo:)
+                  (guix build meson-build-system)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'prepare-for-build
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false")
+                (("update_desktop_database: true")
+                 "update_desktop_database: false"))
+              (substitute* "meson.build"
+                (("'Cargo.lock',")
+                  ""))
+              (delete-file "Cargo.lock")))
+          (add-after 'configure 'prepare-cargo-build-system
+            (lambda args
+              (for-each
+               (lambda (phase)
+                 (format #t "Running cargo phase: ~a~%" phase)
+                 (apply (assoc-ref cargo:%standard-phases phase)
+                        #:vendor-dir "vendor"
+                        #:cargo-target #$(cargo-triplet)
+                        args))
+               '(unpack-rust-crates
+                 configure
+                 check-for-pregenerated-files
+                 patch-cargo-checksums))
+
+              (setenv "RUSTFLAGS"
+                      (string-append (or (getenv "RUSTFLAGS") "")
+                                     " -C link-arg=-Wl,-rpath,"
+                                     #$output "/lib")))))))
+    (native-inputs
+     (cons* blueprint-compiler
+            gettext-minimal
+            `(,glib "bin")
+            gobject-introspection
+            gi-docgen
+            itstool
+            pkg-config
+            rust
+            `(,rust "cargo")
+            (or (and=> (%current-target-system)
+                       (compose list make-rust-sysroot))
+                '())))
+    (inputs
+     (cons* appstream
+            djvulibre
+            exempi
+            gtk
+            libadwaita
+            libarchive
+            libspelling
+            libtiff
+            nautilus                    ; for nautilus extension
+            poppler-next
+            zlib
+            (cargo-inputs 'papers)))
+    (home-page "https://apps.gnome.org/Papers")
+    ;; TODO: drop “new” when updating to GNOME 49 or newer.
+    (synopsis "GNOME's new document viewer")
+    (description "Papers is a document viewer capable of displaying multiple
+and single page document formats like PDF and DejaVu.")
+    (license license:gpl2+)))
+
 (define-public gsettings-desktop-schemas
  (package
    (name "gsettings-desktop-schemas")
@@ -10541,7 +10628,6 @@ playing media, scanning, and much more.")
           cheese
           decibels
           epiphany
-           evince
           file-roller
           gnome-calculator
           gnome-calendar
@@ -10561,6 +10647,7 @@ playing media, scanning, and much more.")
           localsearch
           loupe
           nautilus
+           papers
           simple-scan
           showtime
           xdg-desktop-portal-gnome
@@ -11257,20 +11344,20 @@ basically a text box in which notes can be written.")
 (define-public gucharmap
  (let ((unicode-files
         '(("Blocks.txt"
-            "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1")
+            "05fbpc7miqpv7yic5xkm74ybzxkaf5r58ww21a1iwxqr3apyzvf0")
           ("DerivedAge.txt"
-            "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6")
+            "160r7wwidj3c2jl4cw3am0c5d0l7qndis9xx38h0y8fwidvdzv7q")
           ("NamesList.txt"
-            "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61")
+            "1x1smmn2kmy8clf6ny2njln75i888lidckc6ssyp2gdhgasdrkhd")
           ("Scripts.txt"
-            "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx")
+            "1grmn3bd4m0rcmz544h94kimlj3gf1f343s8177ddrxfmg9m0plz")
           ("UnicodeData.txt"
-            "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap")
+            "0327jqfw2hyq8x986cfhwrp717r2jl7ydjjwvzp7biarrcfzq7if")
           ("Unihan.zip"
-            "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"))))
+            "0pjbyf77lbaxdhwidvpgp81cw13lfhlaw1ynn9vsmkssahmqp97p"))))
    (package
      (name "gucharmap")
-      (version "12.0.1")
+      (version "17.0.1")
      (source
       (origin
         (method url-fetch)
@@ -11279,16 +11366,19 @@ basically a text box in which notes can be written.")
                             name "-" version ".tar.xz"))
         (sha256
          (base32
-           "0m915hm2b2d6r3vs1l80rqpssvg78pv8j6nv54yg62kzknnqmpir"))))
-      (build-system glib-or-gtk-build-system)
+           "0sfixlmk7qajcvls6kv2hfczmjafjcr54aczwcdfmp5jjll4m17r"))))
+      (build-system meson-build-system)
      (arguments
       `(#:modules ((ice-9 match)
-                    (guix build glib-or-gtk-build-system)
+                    (guix build meson-build-system)
                    (guix build utils))
+         #:glib-or-gtk? #t
         #:configure-flags
         (list
-          "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
-          "--with-unicode-data=../unicode-data")
+          "-Ducd_path=../unicode-data"
+          "-Dvapi=false"
+          ;; gtk-doc fails because it didn't generate a devhelp2 file
+          "-Ddocs=false")
         #:phases
         (modify-phases %standard-phases
           (add-after 'unpack 'prepare-unicode-data
@@ -11301,26 +11391,26 @@ basically a text box in which notes can be written.")
                           ',unicode-files))
               #t)))))
      (native-inputs
-       `(("desktop-file-utils" ,desktop-file-utils)
-         ("glib:bin" ,glib "bin")       ; for glib-compile-resources.
-         ("gobject-introspection" ,gobject-introspection)
-         ("intltool" ,intltool)
-         ("itstool" ,itstool)
-         ("pkg-config" ,pkg-config)
-         ,@(map (match-lambda
-                  ((file hash)
-                   `(,file
-                     ,(origin
-                        (method url-fetch)
-                        (uri (string-append
-                              "http://www.unicode.org/Public/12.0.0/ucd/"
-                              file))
-                        (sha256 (base32 hash))))))
-                unicode-files)
-         ("unzip" ,unzip)))
+        (cons* desktop-file-utils
+               (list glib "bin")
+               gobject-introspection
+               intltool
+               itstool
+               pkg-config
+               python
+               unzip
+               (map (match-lambda
+                      ((file hash)
+                       (origin
+                         (method url-fetch)
+                         (uri (string-append
+                                "https://www.unicode.org/Public/17.0.0/ucd/"
+                                file))
+                         (sha256 (base32 hash)))))
+                    unicode-files)))
      (inputs
-       `(("gtk+" ,gtk+)
-         ("xmllint" ,libxml2)))
+       (list gtk+
+             libxml2))
      (home-page "https://wiki.gnome.org/Apps/Gucharmap")
      (synopsis "Unicode character picker and font browser")
      (description
@@ -165,14 +165,14 @@ tool to extract metadata from a file and print the results.")
 (define-public libmicrohttpd
  (package
   (name "libmicrohttpd")
-   (version "1.0.2")
+   (version "1.0.3")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
                                version ".tar.gz"))
            (sha256
             (base32
-              "1ix843yqhcl8d5gh5652pw2scx4p5n836ca80ymms5rl136lycnz"))))
+              "0shj6kk4xp3k45vv696bzgx4s2jzpvhp11syck1zb70rmrxba5kq"))))
   (build-system gnu-build-system)
   (arguments
    (list #:configure-flags
@@ -43,34 +43,33 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

 (define-public libgpg-error
@@ -934,7 +935,22 @@ software.")))
    (inherit pinentry-tty)
    (name "pinentry-qt")
    (arguments
-     `(#:configure-flags '("--enable-fallback-curses")))
+     (list #:configure-flags
+           #~(list "--enable-fallback-curses")
+           #:imported-modules
+           (append %default-gnu-imported-modules
+                   %qt-build-system-modules)
+           #:modules
+           '((guix build utils)
+             (guix build gnu-build-system)
+             ((guix build qt-build-system) #:prefix qt:))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'qt-wrap
+                 (lambda args
+                   (apply (assoc-ref qt:%standard-phases 'qt-wrap)
+                          #:qtbase #$(this-package-input "qtbase")
+                          args))))))
    (inputs
     (modify-inputs inputs
       (prepend qtbase qtwayland)))
@@ -48,6 +48,34 @@
  #:use-module (gnu packages xml)
  #:use-module (ice-9 match))

+(define-public fsviewer
+  (package
+    (name "fsviewer")
+    (version "0.2.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/roblillack/fsviewer")
+              (commit (string-append "v" version))))
+       (sha256
+        (base32
+         "067fvbq7b4lbnn1flmwf8lm0vq4n6qz5yz6hhab30l4gksfk51cg"))
+       (file-name (git-file-name name version))))
+    (build-system cmake-build-system)
+    (arguments (list #:tests? #f))      ;no tests
+    (inputs
+     (list windowmaker libxmu libxpm))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://github.com/roblillack/fsviewer")
+    (synopsis "File viewer for Window Maker")
+    (description "FSViewer is a NeXT FileViewer lookalike for Window
+Maker supporting browser mode and list mode.  This version is a fork of
+FSViewer.app originally written by George Clernon (1998-99) and later
+maintained by Guido Scholz (2002-07).")
+    (license license:gpl2)))
+
 (define-public gnustep-make
  (package
    (name "gnustep-make")
@@ -117,7 +145,7 @@ GCC runtime.
 (define-public windowmaker
  (package
    (name "windowmaker")
-    (version "0.95.9")
+    (version "0.96.0")
    (synopsis "NeXTSTEP-like window manager")
    (source (origin
              (method url-fetch)
@@ -126,60 +154,58 @@ GCC runtime.
                    "wmaker-" version "/WindowMaker-" version ".tar.gz"))
              (sha256
               (base32
-                "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj"))))
+                "0vbgjbqnv2gcpimnrh2fc383gxcdfhgz1j3f2lfa4jng4fx31qag"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:modules ((guix build gnu-build-system)
+     (list
+      #:modules '((guix build gnu-build-system)
                  (guix build utils)
                  (ice-9 match))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'pre-configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; 'wmaker' wants to invoke 'wmaker.inst' the first time,
-             ;; and the 'wmsetbg', so make sure it uses the right ones.
-             ;; We can't use a wrapper here because that would pollute
-             ;; $PATH in the whole session.
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin")))
-               (substitute* "src/main.c"
-                 (("\"wmaker\\.inst")
-                  (string-append "\"" bin "/wmaker.inst")))
-               (substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
-                 (("\"wmsetbg")
-                  (string-append "\"" bin "/wmsetbg")))
-               ;; Add enough cells to the command character array to
-               ;; allow passing our large path to the wmsetbg binary.
-               ;; The path to wmsetbg in Guix requires 67 extra characters.
-               (substitute* "src/defaults.c"
-                 (("len = strlen\\(text\\) \\+ 40;")
-                  (string-append "len = strlen(text) + 107;"))))))
-         (add-after 'install 'install-xsession
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (xsessions (string-append out "/share/xsessions")))
-               (mkdir-p xsessions)
-               (call-with-output-file
-                   (string-append xsessions "/windowmaker.desktop")
-                 (lambda (port)
-                   (format port "~
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'pre-configure
+            (lambda _
+              ;; 'wmaker' wants to invoke 'wmaker.inst' the first time,
+              ;; and the 'wmsetbg', so make sure it uses the right ones.
+              ;; We can't use a wrapper here because that would pollute
+              ;; $PATH in the whole session.
+              (let* ((bin (string-append #$output "/bin")))
+                (substitute* "src/main.c"
+                  (("\"wmaker\\.inst")
+                   (string-append "\"" bin "/wmaker.inst")))
+                (substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
+                  (("\"wmsetbg")
+                   (string-append "\"" bin "/wmsetbg")))
+                ;; Add enough cells to the command character array to
+                ;; allow passing our large path to the wmsetbg binary.
+                ;; The path to wmsetbg in Guix requires 67 extra characters.
+                (substitute* "src/defaults.c"
+                  (("len = strlen\\(text\\) \\+ 40;")
+                   (string-append "len = strlen(text) + 107;"))))))
+          (add-after 'install 'install-xsession
+            (lambda _
+              (let* ((xsessions (string-append #$output "/share/xsessions")))
+                (mkdir-p xsessions)
+                (call-with-output-file
+                    (string-append xsessions "/windowmaker.desktop")
+                  (lambda (port)
+                    (format port "~
                    [Desktop Entry]~@
                    Name=Window Maker~@
                    Comment=~a~@
                    Exec=~a/bin/wmaker~@
                    Type=Application~%"
-                           (string-map (match-lambda
-                                         (#\newline #\space)
-                                         (chr chr))
-                                       ,synopsis) out))))))
-         (add-after 'install-xsession 'wrap
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin")))
-               ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
-               ;; etc., so make sure everything is in $PATH.
-               (wrap-program (string-append bin "/wmaker.inst")
-                 `("PATH" ":" prefix (,bin)))))))))
+                            (string-map (match-lambda
+                                          (#\newline #\space)
+                                          (chr chr))
+                                        #$synopsis) #$output))))))
+          (add-after 'install-xsession 'wrap
+            (lambda _
+              (let* ((bin (string-append #$output "/bin")))
+                ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
+                ;; etc., so make sure everything is in $PATH.
+                (wrap-program (string-append bin "/wmaker.inst")
+                  `("PATH" ":" prefix (,bin)))))))))
    (inputs
     (list bash-minimal                 ;for wrap-program
           fontconfig
@@ -604,9 +604,10 @@ in the case of Firefox, it is browser/locales/all-locales."
    "zh-CN"
    "zh-TW"))

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

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

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

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

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

 ;; Provides the "comm" folder which is inserted into the icecat source.
 ;; Avoids the duplication of Icecat's source tarball.  Pick the changeset that
 ;; matches the most recent tag of the form 'THUNDERBIRD_140_2_0esr_RELEASE'.
+;; Please also update the commit of thunderbird-comm-l10n to match the
+;; changeset used by thunderbird-comm-source.
 (define thunderbird-comm-source
  (origin
    (method hg-fetch)
    (uri (hg-reference
          (url "https://hg.mozilla.org/releases/comm-esr140")
-          (changeset "aa377fbf351e6b10b053e6afa421755c82d5fcf7")))
+          (changeset "427d792f23672fc4adbe9436ce7dddbb2bfb287a")))
    (file-name (string-append "thunderbird-" %icedove-version "-checkout"))
    (sha256
     (base32
-      "0595jg1qbwclzi9qssljqkisrm2dn99rzxzaz2mcfi7b1kvbfaki"))
+      "09fj375a0zb5kgvw94f13997zhcj67a4g5ylpdbjzfql0chh572p"))
    (patches (search-patches "icedove-observer-fix.patch"))))

 ;;; To regenerate, see the `format-locales' helper defined above.
@@ -1342,7 +1348,8 @@ testing.")
  ;; The commit to use can be found in the mail/locales/l10n-changesets.json
  ;; file in Thunderbird's source (e.g.:
  ;; <https://hg-edge.mozilla.org/releases/comm-esr140/file/efb07defaa2d56105675dc1d936af581ebfd8ffa/mail/locales/l10n-changesets.json>)
-  (let* ((commit "b6fd3d6c75ba35d91fe131a654df76ca86f35ac5")
+  ;; where the hash in the URL is the changeset from thunderbird-comm-source.
+  (let* ((commit "7c86eab97e77f00ca7ed8f224d38338a3ed46693")
         (revision "0")
         (version (git-version %icedove-version revision commit)))
    (origin
@@ -1353,7 +1360,7 @@ testing.")
      (file-name (git-file-name "thunderbird-l10n" version))
      (sha256
       (base32
-        "0n4df6kv70a6mxxsqwc83nhj8vl7acv9bcbf07nkcsjjxh3szvqc")))))
+        "1navma2gwcgbbiwcwrc5lrx2jk3qmrnrc6i8pvhb8156pz4cg5nd")))))

 (define icedove-source
  (let ((name (string-append "icedove-" %icedove-version)))
--- a/Show More
+++ b/Show More