gnu: libarchive: Reference libraries absolutely via configure flags.

* gnu/packages/backup.scm (libarchive) [#:configure-flags]: Add 'LIBS' flag. [#:phases] {add--L-in-libarchive-pc}: Delete phase. Change-Id: I85f623043e98b82e46b9afe18c0be53cc7961d4b Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop> Modified-by: Maxim Cournoyer <maxim@guixotic.coop>
gnu: libarchive: Update to 3.8.3.
2026-07-23 06:54:05 +02:00 · 2025-11-20 14:37:54 +09:00 · 2025-11-20 14:20:03 +09:00 · 2025-11-20 14:00:22 +09:00 · 2025-11-20 11:44:20 +09:00 · 2025-11-19 09:42:50 +09:00
252 changed files with 23410 additions and 15890 deletions
@@ -12,6 +12,15 @@ gnu/packages/audio\.scm                            @guix/audio
 gnu/packages/fluidplug\.scm                        @guix/audio
 gnu/packages/xiph\.scm                             @guix/audio

+gnu/packages/elixir(-.+|)\.scm$                    @guix/beam
+guix/build/mix-build-system\.scm                   @guix/beam
+guix/build-system/mix\.scm                         @guix/beam
+gnu/packages/erlang(-.+|)\.scm$                    @guix/beam
+guix/build/rebar-build-system\.scm                 @guix/beam
+guix/build-system/rebar\.scm                       @guix/beam
+guix/import/hexpm\.scm                             @guix/beam
+guix/scripts/import/hexpm\.scm                     @guix/beam
+
 gnu/packages/commencement\.scm                     @guix/bootstrap
 gnu/packages/mes\.scm                              @guix/bootstrap

@@ -45,7 +54,6 @@ guix/diagnostics\.scm                              @guix/core
 guix/discovery\.scm                                @guix/core
 guix/docker\.scm                                   @guix/core
 guix/download\.scm                                 @guix/core
-guix/elf\.scm                                      @guix/core
 guix/ftp-client\.scm                               @guix/core
 guix/gexp\.scm                                     @guix/core
 guix/git-authenticate\.scm                         @guix/core
@@ -118,6 +126,14 @@ guix/build/gnu-build-system\.scm                   @guix/core-packages
 guix/build/utils\.scm                              @guix/core-packages
 guix/build-system/gnu\.scm                         @guix/core-packages

+gnu/packages/crypto\.scm                           @guix/crypto
+gnu/packages/gnupg\.scm                            @guix/crypto
+gnu/packages/nettle\.scm                           @guix/crypto
+gnu/packages/password-utils\.scm                   @guix/crypto
+gnu/packages/security-token\.scm                   @guix/crypto
+gnu/packages/ssh\.scm                              @guix/crypto
+gnu/packages/tls\.scm                              @guix/crypto
+
 gnu/packages/debian\.scm                           @guix/debian

 \.texi$                                            @guix/documentation
@@ -202,7 +202,6 @@ MODULES =					\
  guix/ftp-client.scm				\
  guix/http-client.scm				\
  guix/gnupg.scm				\
-  guix/elf.scm					\
  guix/profiling.scm				\
  guix/store.scm				\
  guix/cvs-download.scm				\
@@ -267,6 +266,7 @@ MODULES =					\
  guix/build/kconfig.scm			\
  guix/build/linux-module-build-system.scm	\
  guix/build/store-copy.scm			\
+  guix/build/io.scm				\
  guix/build/json.scm				\
  guix/build/pack.scm				\
  guix/build/utils.scm				\
@@ -10116,6 +10116,34 @@ directory, the parameter @code{#:javascript-files} can be used to
 specify a list of file names to feed to the minifier.
@end defvar

+@defvar mix-build-system
+This is a variable exported by @code{guix build-system mix}.  It implements
+the standard build procedure used by Elixr programs with
+@url{https://hexdocs.pm/mix/Mix.html,Mix}, which consists
+of running @command{mix compile}, thereby creating bytecode.
+
+The API is similar to the @var{gnu-build-system}, with some specifics for
+Elixir:
+@itemize
+@item
+@code{#:tests?} is a boolean, @code{#true} by default, determining whether tests
+for the current build have to be run or not.
+@item
+@code{#:test-flags} is a list of arguments append to the @command{mix test}
+invocation.  It defaults to @code{'()}.
+@item
+@code{#:mix-exs}, changes the full path to the @code{mix.exs}
+file.  It defaults to @code{"mix.exs"}.  Please refer to
+@url{https://hexdocs.pm/mix/Mix.html#module-environment-variables,upstream}
+documentation for more details.
+@item
+@code{#:mix-path}, appends extra code paths.  It
+defaults to @code{#f}.  Please refer to
+@url{https://hexdocs.pm/mix/Mix.html#module-environment-variables,upstream}
+documentation for more details.
+@end itemize
+@end defvar
+
@defvar mozilla-build-system
 This variable is exported by @code{(guix build-system mozilla)}.  It
 sets the @code{--target} and @code{--host} configuration flags to what
@@ -15502,10 +15530,34 @@ the updater for @uref{https://www.stackage.org, Stackage} packages.
 the updater for @uref{https://crates.io, Crates} packages.
@item launchpad
 the updater for @uref{https://launchpad.net, Launchpad} packages.
+
@item generic-html
-a generic updater that crawls the HTML page where the source tarball of
-the package is hosted, when applicable, or the HTML page specified by
-the @code{release-monitoring-url} property of the package.
+a generic updater that crawls, by default, the HTML page where the
+source tarball of the package is hosted, when applicable.  Behavior can
+be customized with the following package properties:
+
+@table @code
+@item release-monitoring-url
+an alternate URL to crawl;
+
+@item release-file-regexp
+an regular expression matching release file names, whose first
+subexpression must correspond to the version string.
+@end table
+
+Here is an example package with a custom release monitoring URL and a
+regexp matching an unconventional release file name (it's unconventional
+due to the use of upper case letter and the lack of a hyphen before the
+version string):
+
+@lisp
+(package
+  ;; @dots{}
+  (home-page "http://example.org/software/the-package.html")
+  (properties
+    `((release-monitoring-url . ,home-page)
+      (release-file-regexp . "ThePackage([0-9\\.]+)\\.tgz"))))
+@end lisp

@item generic-git
 a generic updater for packages hosted on Git repositories.  It tries to
@@ -29851,6 +29903,7 @@ remote servers.  Run @command{man smtpd.conf} for more information.
@item @code{log-file} (default: @code{"/var/log/mail.log"})
 The file location for the OpenSMTPD log file.  Logging occurs in the
 foreground via the Shepherd, i.e. OpenSMTPD does not detach.
+When set to @code{#f} OpenSMTPD will instead detach and log to the syslog.

@item @code{setgid-commands?} (default: @code{#t})
 Make the following commands setgid to @code{smtpq} so they can be
@@ -31748,6 +31801,50 @@ Owner's group of the broker process.
@end table
@end deftp

+@subsubheading Mollysocket Service
+
+@url{https://github.com/mollyim/mollysocket,Mollysocket} is a UnifiedPush
+provider for the messaging app @url{https://molly.im,Molly}, a fork of Signal.
+
+@defvar mollysocket-service-type
+The Mollysocket service.  Takes @code{mollysocket-configuration} as its value.
+By default, this service listens on port 8020 for any Molly client.
+@end defvar
+
+@deftp {Data Type} mollysocket-configuration
+The configuration for Mollysocket, with the following fields:
+
+@table @asis
+@item @code{package} (default: @code{mollysocket})
+The Mollysocket package to use.
+
+@item @code{host} (default: @code{"0.0.0.0"})
+Address for the webserver to listen on. It is recommended that this be set to
+localhost, and instead configure a TLS-supporting reverse proxy in front of it.
+
+@item @code{port} (default: @code{8020})
+Port for the webserver to listen on.
+
+@item @code{webserver} (default: @code{#t})
+Whether the webserver sould be enabled. If disabled, the server is considered to
+be in airgapped mode, and clients must be configured likewise.
+
+@item @code{allowed-endpoints} (default: @code{'("*")})
+Allowlist of UnifiedPush distributor endpoints, represented as IP addresses or
+domain names. Addresses on the local network must be specified explicitly.
+
+@item @code{allowed-uuids} (default: @code{'("*")})
+Allowlist of Signal account UUIDs.
+
+@item @code{db} (default: @code{"/var/lib/mollysocket/db.sqlite"})
+Path to the Mollysocket database. Will be created if it doesn't exist.
+
+@item @code{vapid-key-file} (default: @code{"/var/lib/mollysocket/vapid.key"})
+Path to the VAPID key used to authorize requests to the UnifiedPush distributor.
+Will be created if it doesn't exist.
+@end table
+@end deftp
+
@node Telephony Services
@subsection Telephony Services

@@ -37689,6 +37786,251 @@ The verbosity level of the daemon.
@end table
@end deftp

+
+
+@subsubheading Autofs Service
+@cindex autofs
+@cindex automount
+
+The autofs service automatically mounts and unmounts filesystems.  It
+can mount both network and local storage, but is most often used to
+manage NFS mounts.
+
+A typical configuration might look like:
+
+@lisp
+(operating-system
+  (services
+   (append
+    (list
+     (service nfs-service-type (nfs-configuration))
+     (service autofs-service-type
+              (autofs-configuration
+               (mounts
+                (list
+                 (autofs-indirect-map
+                  (mount-point "/net/home")
+                  (entries
+                   (list
+                    ;; Accessing /net/home/foo will mount
+                    ;; big.network.server:/home/foo.
+                    (autofs-map-entry
+                     (type "nfs")
+                     (device "big.network.server:/home/&")
+                     (mount-point "*"))))))))))
+    %base-services)))
+@end lisp
+
+@deftp {Data Type} autofs-indirect-map
+Available @code{autofs-indirect-map} fields are:
+
+@table @asis
+@item @code{mount-point} (type: string)
+Where to mount the indirect map.
+
+@item @code{entries} (default: @code{()}) (type: autofs-map-entries)
+Entries in this map.
+
+@end table
+@end deftp
+
+@deftp {Data Type} autofs-map-entry
+Available @code{autofs-map-entry} fields are:
+
+@table @asis
+@item @code{type} (default: @code{"auto"}) (type: string)
+The type of the filesystem.
+
+@item @code{device} (type: string)
+Device or remote host to mount.  May contain special character @code{&},
+which can be referenced in the @var{mount-point} field.
+
+@item @code{mount-point} (type: string)
+Directory to mount this device on.  Map entries come in two flavors:
+direct and indirect.  Direct entries map a single device to a single
+mountpoint, while indirect entries can map multiple devices to multiple
+mountpoints.  A direct entry has a @var{mount-point} beginning with
+@code{/}, representing the absolute path of the directory to mount the
+device on.  For example:
+
+@lisp
+(autofs-map-entry
+ (type "ext4")
+ (device "/dev/sdb1")
+ (mount-point "/mnt/external-disk"))
+@end lisp
+
+An indirect entry has a @var{mount-point} not beginning with @code{/},
+representing the subdirectory within the parent indirect map for this
+entry.  Indirect maps may also use the special character @code{*}, which
+will be replaced with the value of special character @code{&} in the
+@var{device} field of this entry.  For example:
+
+@lisp
+(autofs-indirect-map
+ (mount-point "/devices")
+ (entries
+  (list
+   ;; Automount any block device r/o by ID.
+   (autofs-map-entry
+    (type "auto")
+    (mount-point "ro/uuid/*")
+    (device "/dev/disk/by-id/&")
+    (options '(ro)))
+   ;; Automount any block device by UUID.
+   (autofs-map-entry
+    (type "auto")
+    (mount-point "rw/uuid/*")
+    (device "/dev/disk/by-uuid/&")))))
+@end lisp
+
+@item @code{options} (default: @code{()}) (type: file-system-options)
+List of mount options.  Some options are simple flags, such as ro,
+noexec, nosuid, etc.  These may be expressed as strings or symbols.
+Other options also accept a value.  These are expressed as pairs of
+@code{(option .  value)}.  @code{option} may be a string or symbol, as
+with flags.  @code{value} may be a string, symbol, or number.  Example:
+@code{(ro (errors .  remount-ro) noexec)}
+
+@end table
+@end deftp
+
+@deftp {Data Type} autofs-configuration
+Available @code{autofs-configuration} fields are:
+
+@table @asis
+@item @code{autofs} (default: @code{autofs}) (type: package)
+The autofs package to use.
+
+@item @code{mounts} (default: @code{()}) (type: autofs-mount-maps)
+Mount maps to manage.  This is a list of either direct map entries or
+indirect mount maps.
+
+@item @code{timeout} (default: @code{300}) (type: conf-integer)
+Sets the default mount timeout in seconds.
+
+@item @code{master-wait} (default: @code{10}) (type: conf-integer)
+Sets the default maximum number of retries (actual iterations is half
+this, each is delayed by 2 seconds before retrying) waiting for the
+master map to become available if it cannot be read at program start.
+This can be longer if the map source itself waits for availability (such
+as sss).
+
+@item @code{negative-timeout} (default: @code{60}) (type: conf-integer)
+Set the default timeout for caching failed key lookups.
+
+@item @code{mount-verbose?} (default: @code{#f}) (type: conf-boolean)
+Use the verbose flag when spawning mount(8), and log some process info
+about the requestor and its parent.
+
+@item @code{mount-wait} (default: @code{-1}) (type: conf-integer)
+Set the default time to wait for a response from a spawned mount(8)
+before sending it a SIGTERM.  Note that we still need to wait for the
+RPC layer to timeout before the sub-process exits so this isn't ideal
+but it is the best we can do.  The default is to wait until mount(8)
+returns without intervention.
+
+@item @code{umount-wait} (default: @code{12}) (type: conf-integer)
+Set the default time to wait for a response from a spawned umount(8)
+before sending it a SIGTERM.  Note that we still need to wait for the
+RPC layer to timeout before the sub-process exits so this isn't ideal
+but it is the best we can do.
+
+@item @code{browse-mode?} (default: @code{#t}) (type: conf-boolean)
+Should maps be browsable by default?
+
+@item @code{mount-nfs-default-protocol} (default: @code{3}) (type: conf-integer)
+Set the default protocol that mount.nfs(8) uses when performing a mount.
+Autofs needs to know the default NFS protocol that mount.nfs(8) uses so
+it can do special case handling for its availability probe for different
+NFS protocols.  Since we can't identify this default automatically we
+need to set it in the autofs configuration.
+
+@item @code{append-options?} (default: @code{#t}) (type: conf-boolean)
+When #t, global options are appended to map entry options.  When #f, map
+entry options replace the global options.
+
+@item @code{logging} (type: conf-log-level)
+Default log level.  May be #:none, #:verbose, or #:debug.
+
+@item @code{force-standard-program-map-env?} (default: @code{#f}) (type: conf-boolean)
+Override the use of a prefix with standard environment variables when a
+program map is executed.  Since program maps are run as the privileged
+user setting these standard environment variables opens automount(8) to
+potential user privilege escalation when the program map is written in a
+language that can load components from, for example, a user home
+directory.
+
+@item @code{map-hash-table-size} (default: @code{1024}) (type: conf-integer)
+This configuration option may be used to change the number of hash table
+slots.  This configuration option affects the overhead of searching the
+map entry cache for map entries when there are a large number of
+entries.  It affects the number of entries that must be looked at to
+locate a map entry in the map entry cache.  For example, the default of
+1024 and a direct map with 8000 entries would result in each slot
+containing an average of 8 entries, which should be acceptable.  However,
+if excessive CPU usage is observed during automount lookups increasing
+this option can reduce the CPU overhead considerably because it reduces
+the length of the search chains.  Note that the number of entries in a
+map doesn't necessarily relate to the number of entries used in the map
+entry cache.  There are two distinct cases where the map hash table can
+make a significant difference, direct maps and indirect maps that use
+the "browse" option.  For indirect maps that do not use the "browse"
+option entries are added to the map entry cache at lookup so the number
+of active cache entries, in this case, is usually much less than the
+number of entries in the map.  In this last case it would be unusual for
+the map entry cache to grow large enough to warrant increasing the
+default before an event that cleans stale entries, a map re-read for
+example.
+
+@item @code{use-hostname-for-mounts?} (default: @code{#f}) (type: conf-boolean)
+NFS mounts where the host name resolves to more than one IP address are
+probed for availability and to establish the order in which mounts to
+them should be tried.  To ensure that mount attempts are made only to
+hosts that are responding and are tried in the order of hosts with the
+quickest response the IP address of the host needs to be used for the
+mount.  If it is necessary to use the hostname given in the map entry
+for the mount regardless, then set this option to #t.  Be aware that if
+this is done there is no defense against the host name resolving to one
+that isn't responding and while the number of attempts at a successful
+mount will correspond to the number of addresses the host name resolves
+to the order will also not correspond to fastest responding hosts.
+
+@item @code{disable-not-found-message?} (default: @code{#f}) (type: conf-boolean)
+The original request to add this log message needed it to be
+unconditional.  That produces, IMHO, unnecessary noise in the log so a
+configuration option has been added to provide the ability to turn it
+off.
+
+@item @code{use-ignore-mount-option?} (default: @code{#f}) (type: conf-boolean)
+An option to enable the use of autofs pseudo option "disable".  This
+option is used as a hint to user space that the mount entry should be
+omitted from mount table listings.  The default is #f to avoid
+unexpected changes in behaviour and so is an opt-in setting.
+
+@item @code{sss-master-map-wait} (default: @code{0}) (type: conf-integer)
+Set the time to wait and retry if sssd is unable to read the master map
+at program start.  Default is 0 (don't wait) or 10 if sss supports
+returning EHSTDOWN when the provider isn't available.  If the sss
+library upports returning EHOSTDOWN when the provider is down then this
+value is how long to wait between re‐ tries reading the master map.  When
+reading dependent maps or looking up a map key this value is multiplied
+by the number of retries that would be used when reading the master map.
+
+@item @code{use-mount-request-log-id?} (default: @code{#f}) (type: conf-boolean)
+Set whether to use a mount request log id so that log entries for
+specific mount requests can be easily identified in logs that have
+multiple concurrent requests.
+
+@end table
+
+@end deftp
+
+
+@c %end of fragment
+
+
+
@node Samba Services, Continuous Integration, Network File System, Services
@subsection Samba Services

@@ -47560,8 +47902,13 @@ The @option{--share} and @option{--expose} options can also be passed to
 the generated script to bind-mount additional directories into the
 container.

+The generated script also supports the @option{--pid-file} option to
+write the container process ID to a file. This can be used, along with
+@command{guix container exec} to execute scripts within the container
+(@pxref{Invoking guix container}).
+
@quotation Note
-This option requires Linux-libre 3.19 or newer.
+The @code{container} action requires Linux-libre 3.19 or newer.
@end quotation

@end table
@@ -464,6 +464,21 @@ already exists.  Lookup team IDs among CURRENT-TEAMS."
                      "gnu/packages/fluidplug.scm"
                      "gnu/packages/xiph.scm")))

+(define-team beam
+  (team 'beam
+        #:name "Erlang/Elixir/BEAM team"
+        #:description "The virtual machine at the core of the Erlang Open
+Telecom Platform (OTP), Erlang and Elxir languages and packages, development
+of Rebar and Mix build systems and Hex.pm importer."
+        #:scope (list (make-regexp* "^gnu/packages/elixir(-.+|)\\.scm$")
+                      "guix/build/mix-build-system.scm"
+                      "guix/build-system/mix.scm"
+                      (make-regexp* "^gnu/packages/erlang(-.+|)\\.scm$")
+                      "guix/build/rebar-build-system.scm"
+                      "guix/build-system/rebar.scm"
+                      "guix/import/hexpm.scm"
+                      "guix/scripts/import/hexpm.scm")))
+
 (define-team bootstrap
  (team 'bootstrap
        #:name "Bootstrap"
@@ -510,7 +525,6 @@ already exists.  Lookup team IDs among CURRENT-TEAMS."
              "guix/discovery.scm"
              "guix/docker.scm"
              "guix/download.scm"
-              "guix/elf.scm"
              "guix/ftp-client.scm"
              "guix/gexp.scm"
              "guix/git-authenticate.scm"
@@ -941,6 +955,20 @@ release."
                      "guix/scripts/import/crate.scm"
                      "tests/import/crate.scm")))

+(define-team crypto
+  (team 'crypto
+        #:name "Crypto team"
+        #:description
+        "Secrets, passwords, cryptography and security related packages."
+        #:scope (list
+                 "gnu/packages/crypto.scm"
+                 "gnu/packages/gnupg.scm"
+                 "gnu/packages/nettle.scm"
+                 "gnu/packages/password-utils.scm"
+                 "gnu/packages/security-token.scm"
+                 "gnu/packages/ssh.scm"
+                 "gnu/packages/tls.scm")))
+
 (define-team science
  (team 'science
        #:name "Science team"
@@ -1072,7 +1100,7 @@ the \"texlive\" importer."
 (define-member (person "Andreas Enge"
                       "andreas@enge.fr"
                       "enge")
-  bootstrap core-packages lxqt science tex)
+  bootstrap core-packages crypto lxqt science tex)

 (define-member (person "Tanguy Le Carrour"
                       "tanguy@bioneland.org"
@@ -1279,7 +1307,7 @@ the \"texlive\" importer."
 (define-member (person "Cayetano Santos"
                       "csantosb@inventati.org"
                       "csantosb")
-  ai emacs electronics hpc)
+  ai emacs electronics hpc crypto)

 (define-member (person "Greg Hogan"
                       "code@greghogan.com"
@@ -1328,7 +1356,7 @@ the \"texlive\" importer."
 (define-member (person "Giacomo Leidi"
                       "goodoldpaul@autistici.org"
                       "fishinthecalculator")
-  audio)
+  audio beam)

 (define-member (person "Saku Laesvuori"
                       "saku@laesvuori.fi"
@@ -1360,6 +1388,16 @@ the \"texlive\" importer."
                       "atai")
  ai)

+(define-member (person "Pierre-Henry Fröhring"
+                       "contact@phfrohring.com"
+                       "phfrohring")
+  beam)
+
+(define-member (person "Igorj Gorjaĉev"
+                       "igor@goryachev.org"
+                       "delitrem")
+  beam)
+

 (define (find-team name)
  (or (hash-ref %teams (string->symbol name))
@@ -0,0 +1,60 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2025 Giacomo Leidi <goodoldpaul@autistici.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 file returns a manifest of packages built using the mix-build-system.
+;;; It is used to assist continuous integration of the beam-team branch.
+;;;
+;;;
+;;; You can use it to build all covered packages with:
+;;;
+;;;  ./pre-inst-env guix build -m etc/teams/beam/elixir-manifest.scm
+;;;
+;;; or to update them with:
+;;;
+;;;  ./pre-inst-env guix refresh -u -m etc/teams/beam/elixir-manifest.scm
+
+(use-modules (guix packages)
+             (guix profiles)
+             (guix gexp)
+             (guix build-system)
+             (ice-9 match)
+             (srfi srfi-1)
+             (srfi srfi-26))
+
+(define* (has-mix-build-system? build-system #:key modules #:allow-other-keys)
+  (or (eq? (build-system-name build-system) 'mix)
+      (any
+       (match-lambda
+         (('guix 'build 'mix-build-system) #t)
+         ('((guix build mix-build-system) . _) #t)
+         (_ #f))
+       (cond
+        ((gexp? modules) (gexp->approximate-sexp modules))
+        ((pair? modules) modules)
+        (else '())))))
+
+(manifest
+  (map package->manifest-entry
+       (fold-packages
+        (lambda (package lst)
+          (if (apply has-mix-build-system?
+                     (package-build-system package)
+                     (package-arguments package))
+              (cons package lst)
+              lst))
+        (list))))
@@ -0,0 +1,60 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2025 Giacomo Leidi <goodoldpaul@autistici.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 file returns a manifest of packages built using the rebar-build-system.
+;;; It is used to assist continuous integration of the beam-team branch.
+;;;
+;;;
+;;; You can use it to build all covered packages with:
+;;;
+;;;  ./pre-inst-env guix build -m etc/teams/beam/erlang-manifest.scm
+;;;
+;;; or to update them with:
+;;;
+;;;  ./pre-inst-env guix refresh -u -m etc/teams/beam/erlang-manifest.scm
+
+(use-modules (guix packages)
+             (guix profiles)
+             (guix gexp)
+             (guix build-system)
+             (ice-9 match)
+             (srfi srfi-1)
+             (srfi srfi-26))
+
+(define* (has-rebar-build-system? build-system #:key modules #:allow-other-keys)
+  (or (eq? (build-system-name build-system) 'rebar)
+      (any
+       (match-lambda
+         (('guix 'build 'rebar-build-system) #t)
+         ('((guix build rebar-build-system) . _) #t)
+         (_ #f))
+       (cond
+        ((gexp? modules) (gexp->approximate-sexp modules))
+        ((pair? modules) modules)
+        (else '())))))
+
+(manifest
+  (map package->manifest-entry
+       (fold-packages
+        (lambda (package lst)
+          (if (apply has-rebar-build-system?
+                     (package-build-system package)
+                     (package-arguments package))
+              (cons package lst)
+              lst))
+        (list))))
@@ -21,7 +21,6 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu build linux-modules)
-  #:use-module (guix elf)
  #:use-module (guix glob)
  #:use-module (guix build syscalls)
  #:use-module ((guix build utils) #:select (find-files invoke))
@@ -39,6 +38,7 @@
  #:use-module (ice-9 match)
  #:use-module (ice-9 rdelim)
  #:autoload   (ice-9 pretty-print) (pretty-print)
+  #:use-module (system vm elf)
  #:export (dot-ko
            ensure-dot-ko
            module-formal-name
@@ -23,6 +23,7 @@
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages xorg)
  #:use-module (gnu packages wm)
  #:use-module (gnu services)
  #:use-module (gnu services shepherd)
@@ -71,7 +72,8 @@ environment variables set for a Wayland desktop session."
                                     niri
                                     xdg-desktop-portal
                                     xdg-desktop-portal-gnome
-                                     xdg-desktop-portal-gtk)))))
+                                     xdg-desktop-portal-gtk
+                                     xwayland-satellite)))))
   (description "Install and configure Niri, a scrollable tiling Wayland
 compositor.  This service starts Niri as a user-level desktop session with
 proper environment variables set for Wayland compatibility.  It ensures Niri
@@ -187,7 +187,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/calcurse.scm			\
  %D%/packages/ccache.scm			\
  %D%/packages/cdrom.scm			\
-  %D%/packages/cedille.scm			\
  %D%/packages/certs.scm			\
  %D%/packages/check.scm			\
  %D%/packages/chemistry.scm			\
@@ -254,6 +253,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/docker.scm			\
  %D%/packages/documentation.scm		\
  %D%/packages/dpdk.scm        \
+  %D%/packages/duckdb.scm			\
  %D%/packages/dvtm.scm				\
  %D%/packages/easyrpg.scm			\
  %D%/packages/ebook.scm			\
@@ -609,7 +609,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/rust-sources.scm			\
  %D%/packages/samba.scm			\
  %D%/packages/sagemath.scm			\
-  %D%/packages/sawfish.scm			\
  %D%/packages/scanner.scm			\
  %D%/packages/scheme.scm			\
  %D%/packages/spreadsheet.scm			\
@@ -1247,11 +1246,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/esmtp-add-lesmtp.patch		\
  %D%/packages/patches/esound-c99.patch         		\
  %D%/packages/patches/exercism-disable-self-update.patch	\
-  %D%/packages/patches/extempore-unbundle-external-dependencies.patch	\
  %D%/packages/patches/extundelete-e2fsprogs-1.44.patch		\
  %D%/packages/patches/fail2ban-fix-sshd-filter.patch           \
  %D%/packages/patches/fail2ban-paths-guix-conf.patch		\
  %D%/packages/patches/faiss-tests-CMakeLists-find-googletest.patch	\
+  %D%/packages/patches/falcosecurity-libs-bpf-probes-fix.patch  \
  %D%/packages/patches/falcosecurity-libs-shared-build.patch	\
  %D%/packages/patches/farstream-gupnp.patch                         \
  %D%/packages/patches/farstream-make.patch                          \
@@ -1294,6 +1293,7 @@ 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	\
@@ -1617,7 +1617,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/irrlicht-link-against-needed-libs.patch	\
  %D%/packages/patches/isl-0.11.1-aarch64-support.patch		\
  %D%/packages/patches/ispell-for-linphone-cmake.patch		\
-  %D%/packages/patches/jamesdsp-fix-bulid-on-pipewire-1.4.0.patch\
  %D%/packages/patches/jami-find-package-avutil.patch		\
  %D%/packages/patches/jami-libjami-headers-search.patch	\
  %D%/packages/patches/jami-qwindowkit.patch			\
@@ -1762,6 +1761,13 @@ dist_patch_DATA =						\
  %D%/packages/patches/libmpeg2-global-symbol-test.patch	\
  %D%/packages/patches/liblinphone-jsoncpp.patch		\
  %D%/packages/patches/libphonenumber-reproducible-build.patch	\
+  %D%/packages/patches/plotutils-c23.patch                      \
+  %D%/packages/patches/plotutils-configure-c99.patch            \
+  %D%/packages/patches/plotutils-cxx17-fix.patch                \
+  %D%/packages/patches/plotutils-format-security.patch          \
+  %D%/packages/patches/plotutils-libxmi.patch                   \
+  %D%/packages/patches/plotutils-makefile.patch                 \
+  %D%/packages/patches/plotutils-rangecheck.patch               \
  %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch	\
  %D%/packages/patches/libquicktime-ffmpeg.patch 		\
  %D%/packages/patches/libsecret-fix-test-paths.patch		\
@@ -1777,8 +1783,6 @@ 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			\
@@ -1787,6 +1791,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/libvdpau-va-gl-unbundle.patch		\
  %D%/packages/patches/libvpx-CVE-2016-2818.patch		\
  %D%/packages/patches/libxcb-path-max.patch			\
+  %D%/packages/patches/libxmi-gcc15.patch 			\
+  %D%/packages/patches/libxmi-implicit.patch			\
  %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch	\
  %D%/packages/patches/libwpd-gcc-compat.patch			\
  %D%/packages/patches/libxt-guix-search-paths.patch		\
@@ -2089,6 +2095,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/perl-5.14-no-sys-dirs.patch		\
  %D%/packages/patches/perl-autosplit-default-time.patch	\
  %D%/packages/patches/perl-class-methodmaker-reproducible.patch \
+  %D%/packages/patches/perl-crypt-des-implicit-func-decl.patch	\
  %D%/packages/patches/perl-image-exiftool-CVE-2021-22204.patch	\
  %D%/packages/patches/perl-net-amazon-s3-moose-warning.patch	\
  %D%/packages/patches/perl-net-dns-resolver-programmable-fix.patch	\
@@ -2133,7 +2140,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/psm-ldflags.patch			\
  %D%/packages/patches/psm-repro.patch				\
  %D%/packages/patches/pstoedit-fix-gcc12.patch			\
-  %D%/packages/patches/pstoedit-fix-plainC.patch		\
  %D%/packages/patches/pstoedit-pkglibdir.patch			\
  %D%/packages/patches/pulseaudio-fix-mult-test.patch		\
  %D%/packages/patches/pulseaudio-longer-test-timeout.patch	\
@@ -2245,6 +2251,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch 	\
  %D%/packages/patches/rottlog-direntry.patch 			\
  %D%/packages/patches/ruby-actionpack-remove-browser-tests.patch	\
+  %D%/packages/patches/ruby-activesupport-fix-deprecation-warning.patch	\
  %D%/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch	\
  %D%/packages/patches/ruby-chunky-png-ruby-3-2-support.patch	\
  %D%/packages/patches/ruby-hiredis-use-system-hiredis.patch	\
@@ -2359,6 +2366,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/texi2html-document-encoding.patch	\
  %D%/packages/patches/texi2html-i18n.patch			\
  %D%/packages/patches/texmacs-wayland-hidpi.patch	\
+  %D%/packages/patches/texlive-bin-luaoutputdir-test.patch      \
  %D%/packages/patches/thefuck-test-environ.patch		\
  %D%/packages/patches/thefuck-remove-broken-tests.patch	\
  %D%/packages/patches/tidy-CVE-2015-5522+5523.patch		\
@@ -2484,6 +2492,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch	\
  %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch	\
  %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch	\
+  %D%/packages/patches/xpra-5.0-install_libs.patch              \
+  %D%/packages/patches/xpra-5.0-systemd-run.patch              \
  %D%/packages/patches/xpra-6.0-systemd-run.patch		\
  %D%/packages/patches/xpra-6.1-install_libs.patch		\
  %D%/packages/patches/xterm-370-explicit-xcursor.patch		\
@@ -77,36 +77,43 @@
    (build-system glib-or-gtk-build-system)
    (outputs '("out" "bin"))
    (arguments
-     `(#:tests? #f                      ; Tests require drivers
-       #:configure-flags
-       (list "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
-             "--disable-static"
-             "--enable-fake")
-       #:phases
-       (modify-phases %standard-phases
-         ,@(if (this-package-native-input "config")
-               `((add-after 'unpack 'update-config-scripts
-                   (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                     (for-each
-                       (lambda (dir)
-                         (for-each (lambda (file)
-                                     (install-file
-                                       (search-input-file
-                                         (or native-inputs inputs)
-                                         (string-append "/bin/" file)) dir))
-                                   '("config.guess" "config.sub")))
-                       '("." "libltdl")))))
-               '()))))
+     (list
+      #:tests? #f                       ; Tests require drivers
+      #:configure-flags
+      #~(list "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
+              "--disable-static"
+              "--enable-fake")
+      #:phases
+      #~(modify-phases %standard-phases
+          #$@(if (this-package-native-input "config")
+                 #~((add-after 'unpack 'update-config-scripts
+                      (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                        (for-each
+                         (lambda (dir)
+                           (for-each
+                            (lambda (file)
+                              (install-file
+                               (search-input-file
+                                (or native-inputs inputs)
+                                (string-append "/bin/" file)) dir))
+                            (list "config.guess" "config.sub")))
+                         (list "." "libltdl")))))
+                 (list)))))
    (native-inputs
     (append
-       (if (or (target-aarch64?)
-               (target-ppc64le?)
-               (target-riscv64?))
-           (list config)
-           '())
-       (list latex2html pkg-config python-wrapper swig)))
+      (if (or (target-aarch64?)
+              (target-ppc64le?)
+              (target-riscv64?))
+          (list config)
+          (list))
+      (list latex2html
+            pkg-config
+            python-wrapper
+            swig)))
    (inputs
-     (list glib gtk+-2 libusb-compat))
+     (list glib
+           gtk+-2
+           libusb-compat))
    (synopsis "Portable Braille Library")
    (description "Libbraille is a library to easily access Braille displays and
 terminals.")
@@ -40,7 +40,7 @@
 (define-public acl
  (package
    (name "acl")
-    (version "2.3.1")
+    (version "2.3.2")
    (source
     (origin
      (method url-fetch)
@@ -48,7 +48,7 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "1bqi7hj0xkpivwg7lx5cv3yvs9ks1i6azvpgbvfpzcq1i736233n"))))
+        "0z1gi82zc2xcbchfagd7apn2s7camaagj8y6hmysl1wpcanxnasz"))))
    (build-system gnu-build-system)
    (arguments
     `(#:modules ((ice-9 ftw)
@@ -2718,7 +2718,7 @@ command.")
      #:tests? #f ; no tests
      ;; Make sure the (rarely updated) package 'imagemagick/stable'
      ;; does not end up in the closure.
-      #:disallowed-references (list imagemagick/stable)
+      #:disallowed-references (list (this-package-native-input "imagemagick"))
      #:modules '((guix build qt-build-system)
                  ((guix build gnu-build-system) #:prefix gnu:)
                  (guix build utils))
@@ -4668,7 +4668,7 @@ information tool.")
 (define-public fastfetch-minimal
  (package
    (name "fastfetch-minimal")
-    (version "2.54.0")
+    (version "2.55.0")
    (source
     (origin
       (method git-fetch)
@@ -4677,7 +4677,7 @@ information tool.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0iw58idc45x505rhix3mqymnfbk1r7jc10alyry9qypflalqwkqx"))
+        (base32 "1vqw0r0h8clb302bzbmfxpkz54kx6sd661nm50vvhijham8x7mlb"))
       (modules '((guix build utils)))
       (snippet '(begin
                   (delete-file-recursively "src/3rdparty")))))
@@ -40,13 +40,15 @@
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/AppImage/type2-runtime")
-               (commit commit)))
+                (url "https://github.com/AppImage/type2-runtime")
+                (commit commit)))
         (file-name (git-file-name name version))
         (sha256
          (base32 "0954crhlbapxis96g1s0vfpf78ybr64zvjalak387ksxj560g44x"))))
+      (build-system gnu-build-system)
      (arguments
       (list
+        #:tests? #f                     ; No tests
        #:make-flags
        #~(list "-Csrc/runtime" "runtime-fuse3"
                (string-append "CC=" #$(cc-for-target))
@@ -60,34 +62,33 @@
        `((guix build gnu-build-system)
          (guix build utils)
          (ice-9 binary-ports))
-        #:phases #~(modify-phases %standard-phases
-                     (delete 'configure)
-                     (delete 'check)    ; No tests.
-                     (replace 'install
-                       (lambda _
-                         (install-file "src/runtime/runtime-fuse3"
-                                       (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")
-                                           (logior O_WRONLY))))
-                           (seek port 8 SEEK_SET)
-                           (put-bytevector port #vu8(#x41 #x49 #x02))
-                           (close-port port)))))
-        #:disallowed-references (list squashfuse-for-appimage
-                                      fuse-for-appimage
-                                      (gexp-input zstd "static")
-                                      (gexp-input zlib "static"))))
+        #:phases
+        #~(modify-phases %standard-phases
+            (delete 'configure)
+            (replace 'install
+              (lambda _
+                (install-file "src/runtime/runtime-fuse3"
+                              (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")
+                                  (logior O_WRONLY))))
+                  (seek port 8 SEEK_SET)
+                  (put-bytevector port #vu8(#x41 #x49 #x02))
+                  (close-port port)))))
+        #:disallowed-references
+        (list (this-package-input "squashfuse-for-appimage")
+              (this-package-input "fuse")
+              (gexp-input (this-package-input "zstd") "static")
+              (gexp-input (this-package-input "zlib") "static"))))
      ;; Only needed at build time.
      (inputs (list squashfuse-for-appimage
                    fuse-for-appimage
                    `(,zstd "static")
                    `(,zlib "static")))
-      (build-system gnu-build-system)
-      (home-page "https://github.com/AppImage/type2-runtime")
      (synopsis "Runtime for executing AppImages")
      (description "The runtime is the executable part of every AppImage.  It mounts
 the payload via @acronym{FUSE} and executes the entrypoint, allowing users to run
@@ -96,4 +97,5 @@ ensures that the AppImage can access its bundled libraries and resources seamles
 providing a consistent environment across different Linux distributions.  In the
 absence of @acronym{FUSE}, the AppImage can still be started using the
@option{--appimage-extract-and-run} flag.")
+      (home-page "https://github.com/AppImage/type2-runtime")
      (license license:expat))))
@@ -7915,36 +7915,6 @@ well as ephemerides services
     (list python-numpy))
    (synopsis "Python library for Source Extraction and Photometry")))

-(define-public python-sep-pjw
-  (package
-    (name "python-sep-pjw")
-    (version "1.3.8")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "sep_pjw" version))
-       (sha256
-        (base32 "0lhxfq1acc6qc8nszfdrpwq6dizaypz3b6frknfv5qm59mb488r0"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags #~(list "test.py")))
-    (native-inputs
-     (list python-cython
-           python-pytest
-           python-setuptools
-           python-setuptools-scm
-           python-wheel))
-    (propagated-inputs
-     (list python-numpy
-           python-sep))
-    (home-page "https://github.com/PJ-Watson/sep-pjw")
-    (synopsis "Alternative fork of SEP library")
-    (description
-     "This package provides an alternative maintained fork of SEP python
-library with bug fixtures.")
-    (license (list license:expat license:lgpl3+ license:bsd-3))))
-
 (define-public python-sgp4
  (package
    (name "python-sgp4")
@@ -252,7 +252,7 @@ promoting the market for advanced audio.")
 (define-public wildmidi
  (package
    (name "wildmidi")
-    (version "0.4.4")
+    (version "0.4.6")
    (source
     (origin
       (method git-fetch)
@@ -262,7 +262,7 @@ promoting the market for advanced audio.")
         (commit (string-append name "-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "08fbbsvw6pkwwqarjwcvdp8mq4zn5sgahf025hynwc6rvf4sp167"))))
+        (base32 "0cc8vg2alyzakmm132vljx228arisqcnfqh8xyjnnczr5vryqa5k"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f ; No target
@@ -872,120 +872,129 @@ purposes developed at Queen Mary, University of London.")
    (license license:gpl2+)))

 (define-public jamesdsp
-  (package
-    (name "jamesdsp")
-    (version "2.7.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri
-        (git-reference
-          (url "https://github.com/Audio4Linux/JDSP4Linux")
-          (commit version)
-          ;; Recurse GraqhicEQWidget, FlatTabWidget, LiquidEqualizerWidget and
-          ;; EELEditor.
-          (recursive? #t)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "17vx12kbvwxvb69vzrlb82mrgf6sl3plyk71g9f39p49ialdsnbr"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Unbundle 3rd party libraries.
-        '(begin
-           ;; Delete the bundled 3rd party libraries.
-           (for-each delete-file-recursively
-            (list "3rdparty"
-                  "src/subprojects/EELEditor/3rdparty"
-                  "src/subprojects/EELEditor/QCodeEditor"
-                  "src/subprojects/EELEditor/src/EELEditor-Linker.pri"))
-           (with-directory-excursion "src"
-             (substitute* "src.pro"
-               ;; Do not use bundled 3rd party libraries.
-               ((".*3rdparty.*") "")
-               ;; Link required libraries from system.
-               (("-ldl")
-                (string-join '("-ldl"
-                               "-lasync++"
-                               "-lQCodeEditor"
-                               "-lqcustomplot"
-                               "-lqtadvanceddocking-qt6"
-                               "-lqtcsv"
-                               "-lwaf")
-                               " ")))
-             ;; Fix including WAF headers.
-             (substitute* "MainWindow.cpp"
-                       (("<Animation") "<WAF/Animation"))
-             ;; Do not use resources from the bundled docking-system.
-             (substitute* '("interface/fragment/AppManagerFragment.ui")
-               ((".*location.*3rdparty.*") "")
-               ((" resource=.*>") ">"))
-             (with-directory-excursion "subprojects/EELEditor/src"
-               ;; Do not use bundled QCodeEditor and docking-system.
-               (substitute* "EELEditor.pri"
-                 ((".*(QCodeEditor|docking-system).*") ""))
-               ;; Do not link to bundled docking-system.
+  (let ((commit "53cf0989681ba38755208c8aec063f29ed8586d3")
+        (revision "0"))
+    (package
+      (name "jamesdsp")
+      (version (git-version "2.7.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+            (url "https://github.com/Audio4Linux/JDSP4Linux")
+            (commit commit)
+            ;; Recurse GraqhicEQWidget, FlatTabWidget, LiquidEqualizerWidget and
+            ;; EELEditor.
+            (recursive? #t)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1b5612gr2gfmj1h5hdzfa9xxdwixia06a34n2zs04cra94clif9i"))
+         (modules '((guix build utils)))
+         (snippet
+          ;; Unbundle 3rd party libraries.
+          '(begin
+             ;; Delete the bundled 3rd party libraries.
+             (for-each delete-file-recursively
+              (list "3rdparty"
+                    "src/subprojects/EELEditor/3rdparty"
+                    "src/subprojects/EELEditor/QCodeEditor"
+                    "src/subprojects/EELEditor/src/EELEditor-Linker.pri"))
+             (with-directory-excursion "src"
               (substitute* "src.pro"
-                 ((".*EELEditor-Linker.*") ""))
-               ;; Fix including headers from the system.
-               (substitute* (find-files "." "\\.(cpp|h)$")
-                 (("#include <Dock") "#include <qtadvanceddocking-qt6/Dock")
-                 (("#include <FloatingDock")
-                  "#include <qtadvanceddocking-qt6/FloatingDock")
-                 (("#include <QSyntaxStyle")
-                  "#include <QCodeEditor/QSyntaxStyle")
-                 (("#include <QStyleSyntaxHighlighter")
-                  "#include <QCodeEditor/QStyleSyntaxHighlighter")
-                 (("#include <QHighlightRule")
-                  "#include <QCodeEditor/QHighlightRule")
-                 (("#include <QLanguage") "#include <QCodeEditor/QLanguage")
-                 (("#include <QCodeEditor\\.hpp")
-                  "#include <QCodeEditor/QCodeEditor.hpp"))))))
-       (patches (search-patches "jamesdsp-fix-bulid-on-pipewire-1.4.0.patch"))))
-    (build-system qt-build-system)
-    (arguments
-     (list #:qtbase qtbase
-           #:tests? #f ;no tests
-           #:phases
-           #~(modify-phases %standard-phases
-               ;; Configure using qmake.
-               (replace 'configure
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (invoke "qmake" (string-append "PREFIX=" #$output))))
-               (add-after 'install 'install-icon
-                 (lambda _
-                   (let ((pixmaps (string-append #$output "/share/pixmaps")))
-                     (mkdir-p pixmaps)
-                     (copy-file "resources/icons/icon.png"
-                                (string-append pixmaps "/jamesdsp.png")))))
-               (add-after 'install-icon 'create-desktop-entry-file
-                 (lambda _
-                   (make-desktop-entry-file
-                    (string-append #$output
-                                  "/share/applications/jamesdsp.desktop")
-                    #:name "JamesDSP"
-                    #:comment "Audio effect processor"
-                    #:keywords '("equalizer" "audio" "effect")
-                    #:categories '("AudioVideo" "Audio")
-                    #:exec (string-append #$output "/bin/jamesdsp")
-                    #:icon (string-append #$output "/share/pixmaps/jamesdsp.png")
-                    #:startup-notify #f))))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list asyncplusplus
-           glibmm-2.66
-           libarchive
-           pipewire
-           qcodeeditor
-           qcustomplot
-           qt-advanced-docking-system
-           qtcsv
-           qtpromise
-           qtsvg
-           qtwidgetanimationframework))
-    (home-page "https://github.com/Audio4Linux/JDSP4Linux")
-    (synopsis "Audio effect processor for PipeWire and PulseAudio clients")
-    (description "JamesDSP is an audio effect processor for PipeWire and
+                 ;; Do not use bundled 3rd party libraries.
+                 ((".*3rdparty.*") "")
+                 ;; Link required libraries from system.
+                 (("-ldl")
+                  (string-join '("-ldl"
+                                 "-lasync++"
+                                 "-lQCodeEditor"
+                                 "-lqcustomplot"
+                                 "-lqtadvanceddocking-qt6"
+                                 "-lqtcsv"
+                                 "-lwaf")
+                                 " ")))
+               ;; Fix including WAF headers.
+               (substitute* "MainWindow.cpp"
+                         (("<Animation") "<WAF/Animation"))
+               ;; Do not use resources from the bundled docking-system.
+               (substitute* '("interface/fragment/AppManagerFragment.ui")
+                 ((".*location.*3rdparty.*") "")
+                 ((" resource=.*>") ">"))
+               (with-directory-excursion "subprojects/EELEditor/src"
+                 ;; Do not use bundled QCodeEditor and docking-system.
+                 (substitute* "EELEditor.pri"
+                   ((".*(QCodeEditor|docking-system).*") ""))
+                 ;; Do not link to bundled docking-system.
+                 (substitute* "src.pro"
+                   ((".*EELEditor-Linker.*") ""))
+                 ;; Fix including headers from the system.
+                 (substitute* (find-files "." "\\.(cpp|h)$")
+                   (("#include <Dock") "#include <qtadvanceddocking-qt6/Dock")
+                   (("#include <FloatingDock")
+                    "#include <qtadvanceddocking-qt6/FloatingDock")
+                   (("#include <QSyntaxStyle")
+                    "#include <QCodeEditor/QSyntaxStyle")
+                   (("#include <QStyleSyntaxHighlighter")
+                    "#include <QCodeEditor/QStyleSyntaxHighlighter")
+                   (("#include <QHighlightRule")
+                    "#include <QCodeEditor/QHighlightRule")
+                   (("#include <QLanguage") "#include <QCodeEditor/QLanguage")
+                   (("#include <QCodeEditor\\.hpp")
+                    "#include <QCodeEditor/QCodeEditor.hpp"))))))))
+      (build-system qt-build-system)
+      (arguments
+       (list #:qtbase qtbase
+             #:tests? #f ;no tests
+             #:parallel-build? #f ;fails on some systems
+             #:modules '((guix build qt-build-system)
+                         ((guix build gnu-build-system) #:prefix gnu:)
+                         (guix build utils))
+             #:phases
+             #~(modify-phases %standard-phases
+                 ;; Configure using qmake.
+                 (replace 'configure
+                   (lambda _
+                     (invoke "qmake" (string-append "PREFIX=" #$output))))
+                 (replace 'build (assoc-ref gnu:%standard-phases 'build))
+                 (replace 'check (assoc-ref gnu:%standard-phases 'check))
+                 (replace 'install (assoc-ref gnu:%standard-phases 'install))
+                 (add-after 'install 'install-icon
+                   (lambda _
+                     (let ((pixmaps (string-append #$output "/share/pixmaps")))
+                       (mkdir-p pixmaps)
+                       (copy-file "resources/icons/icon.png"
+                                  (string-append pixmaps "/jamesdsp.png")))))
+                 (add-after 'install-icon 'create-desktop-entry-file
+                   (lambda _
+                     (make-desktop-entry-file
+                      (string-append #$output
+                                    "/share/applications/jamesdsp.desktop")
+                      #:name "JamesDSP"
+                      #:comment "Audio effect processor"
+                      #:keywords '("equalizer" "audio" "effect")
+                      #:categories '("AudioVideo" "Audio")
+                      #:exec (string-append #$output "/bin/jamesdsp")
+                      #:icon (string-append #$output
+                                            "/share/pixmaps/jamesdsp.png")
+                      #:startup-notify #f))))))
+      (native-inputs
+       (list pkg-config))
+      (inputs
+       (list asyncplusplus
+             glibmm-2.66
+             libarchive
+             pipewire
+             qcodeeditor
+             qcustomplot
+             qt-advanced-docking-system
+             qtcsv
+             qtpromise
+             qtsvg
+             qtwidgetanimationframework))
+      (home-page "https://github.com/Audio4Linux/JDSP4Linux")
+      (synopsis "Audio effect processor for PipeWire and PulseAudio clients")
+      (description "JamesDSP is an audio effect processor for PipeWire and
 PulseAudio clients, featuring:
@itemize
@item Automatic bass boost: Frequency-detecting bass-boost
@@ -1007,7 +1016,7 @@ PulseAudio clients, featuring:
 dynamic code outline window, console output support and detailed error
 messages with inline code highlighting
@end itemize")
-    (license license:gpl3+)))
+      (license license:gpl3+))))

 (define ardour-bundled-media
  (origin
@@ -1158,6 +1167,16 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
           perl
           pkg-config
           unzip))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "LADSPA_PATH")
+            (files '("lib/ladspa")))
+           (search-path-specification
+            (variable "LV2_PATH")
+            (files '("lib/lv2")))
+           (search-path-specification
+            (variable "LXVST_PATH")
+            (files '("lib/lxvst")))))
    (home-page "https://ardour.org")
    (synopsis "Digital audio workstation")
    (description
@@ -1596,7 +1615,7 @@ plugins are provided.")
 (define-public cable
  (package
    (name "cable")
-    (version "0.9.8.1")
+    (version "0.9.21")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1605,10 +1624,7 @@ plugins are provided.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0pzafiim1cnxrngk6nzmpx9sx1lc6qrqjrrcxg1qpigcrjvrfjs2"))
-              (modules '((guix build utils)))
-              (snippet
-               '(delete-file-recursively "Arch packages"))))
+                "1c7fy92nwp2m96asls460s83xapzcc6pqvplmg5rqds1rddiva2h"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1629,21 +1645,7 @@ plugins are provided.")
              (install-file "jack-plug.svg"
                            (string-append #$output "/share/icons/hicolor/scalable/apps/"))
              (install-file "com.github.magillos.cable.desktop"
-                            (string-append #$output "/share/applications/"))))
-          (add-after 'install-more 'wrap-executables
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let* ((pyversion
-                      #$(version-major+minor (package-version
-                                              (this-package-input "python"))))
-                     (lib (string-append #$output "/lib/python" pyversion
-                                         "/site-packages"))
-                     (file
-                      (string-append lib "/cables/launch-connection-manager.py")))
-                (chmod file #o555)
-                (wrap-script file
-                  #:guile (search-input-file inputs "bin/guile")
-                  `("GUIX_PYTHONPATH" ":" prefix
-                    (,lib  ,(getenv "GUIX_PYTHONPATH"))))))))))
+                            (string-append #$output "/share/applications/")))))))
    (inputs
     (list python
           python-dbus
@@ -1664,7 +1666,7 @@ connections manager, pw-top wrapper, simple ALSA mixer and jack_delay GUI.")
 (define-public calf
  (package
    (name "calf")
-    (version "0.90.6")
+    (version "0.90.8")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1673,7 +1675,7 @@ connections manager, pw-top wrapper, simple ALSA mixer and jack_delay GUI.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0p4zqzr7spy3jjsmy6h7n5lsyqqyh23bswk1r3kims50b102xhxd"))))
+                "0wzkshqazw26w73h1lva5wr8v2bq0a20kjd6lfvbi1pj3ql3azk5"))))
    (build-system cmake-build-system)
    (arguments (list #:tests? #false)) ;there is no test target
    (inputs
@@ -1829,7 +1831,7 @@ reel-to-reel tape machines.")
 (define-public iir
  (package
    (name "iir")
-    (version "1.9.4")
+    (version "1.10.0")
    (source
     (origin
       (method git-fetch)
@@ -1838,7 +1840,7 @@ reel-to-reel tape machines.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1fqxn0qlvykpk9hiliivmkjjcz3g1bp83yd0zfm82r14abkjbj2g"))))
+        (base32 "0p64l0fmr7mfjhfxg6yc4f06aacbr6bb8kjmb5ffm95sq12rzdss"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -2369,7 +2371,7 @@ the non-linear circuit elements of their original analog counterparts.")
 (define-public rev-plugins
  (package
    (name "rev-plugins")
-    (version "0.7.1")
+    (version "0.8.1")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -2378,23 +2380,24 @@ the non-linear circuit elements of their original analog counterparts.")
                    version ".tar.bz2"))
              (sha256
               (base32
-                "1ikpinxm00pkfi259bnkzhsy3miagrjgdihaaf5x4v7zac29j3g7"))))
+                "1yhnvjgr14qr0ni0n2x8dhlzbx1qfgyrnffbaaq0d5xbzfgrq543"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:tests? #f ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
-         (add-before 'install 'prepare-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa"))
-             #t))
-         (add-after 'unpack 'override-target-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "Makefile"
-               (("/usr") (assoc-ref outputs "out")))
-             #t)))))
+     (list #:tests? #f ; no "check" target
+           #:phases
+           #~(modify-phases %standard-phases
+               ;; no configure script
+               (delete 'configure)
+               (add-after 'unpack 'change-directory
+                 (lambda _
+                   (chdir "source")))
+               (add-after 'change-directory 'override-target-directory
+                 (lambda _
+                   (substitute* "Makefile"
+                     (("/usr") #$output))))
+               (add-before 'install 'prepare-target-directory
+                 (lambda _
+                   (mkdir-p (string-append #$output "/lib/ladspa")))))))
    (home-page "https://kokkinizita.linuxaudio.org")
    (synopsis "LADSPA reverb plugin")
    (description
@@ -2708,7 +2711,7 @@ also play midifiles using a Soundfont.")
 (define-public faust-2
  (package
    (inherit faust)
-    (version "2.75.7")
+    (version "2.81.10")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/grame-cncm/faust/"
@@ -2716,7 +2719,7 @@ also play midifiles using a Soundfont.")
                                  "/faust-" version ".tar.gz"))
              (sha256
               (base32
-                "11ww02zmj3vnva1w52hs9wkxvhwwf53agklyzm2c7gysw0jfvkw9"))))
+                "0mj7gn7xp6mzr94nqcyrrkcmzm81chq6qb1n76wspah71lw7g6f6"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -3142,7 +3145,7 @@ and testing or configuring the JACK session.  Tools include @code{jack_lsp},
 (define-public jacktrip
  (package
    (name "jacktrip")
-    (version "1.6.8")
+    (version "2.7.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3150,7 +3153,7 @@ and testing or configuring the JACK session.  Tools include @code{jack_lsp},
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
-               (base32 "0719ng799kingv0y9yk07bvnmprk25c09ph3yaia5dhapg0jz17m"))))
+               (base32 "1d9cn4nny3kbf3f9x0bcsrqb0ir1h789nv7s72xmhf7r5rfd9xm4"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -3169,10 +3172,11 @@ and testing or configuring the JACK session.  Tools include @code{jack_lsp},
           python
           python-jinja2
           python-pyyaml
-           qtbase-5
+           qtbase
+           qtwayland
           rtaudio))
    (native-inputs
-     (list pkg-config qtbase-5)) ;for qmake
+     (list pkg-config))
    (home-page "https://jacktrip.github.io/jacktrip/")
    (synopsis "Multi-machine audio system for network music performance")
    (description
@@ -3254,25 +3258,30 @@ from being able to mix multiple JACK audio streams.")
                "1q8mzjv577vdi64s47gd4pg0ydzxvs32cwrb1d64v90f52qpgbpd"))))
    (build-system meson-build-system)
    (arguments
-     `(#:tests? #f                      ; no check target
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'build-PIC
-           ;; The default -fPIE #errors when combined with our Qt packages.
-           ;; Work around the broken meson.build script clobbering c_args.
-           (lambda _
-             (substitute* "meson.build"
-               (("'-DZIX_STATIC'" match)
-                (string-append match ", '-fPIC'"))))))))
+     (list #:tests? #f                      ; no check target
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'configure 'build-PIC
+                 ;; The default -fPIE #errors when combined with our Qt
+                 ;; packages.  Work around the broken meson.build script
+                 ;; clobbering c_args.
+                 (lambda _
+                   (substitute* "meson.build"
+                     (("'-DZIX_STATIC'" match)
+                      (string-append match ", '-fPIC'"))))))))
    (inputs
     (list lv2
           lilv
           suil
           gtk+
-           qtbase-5
-           jack-1))
+           jack-1
+           qtbase-5))
    (native-inputs
     (list pkg-config))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "LV2_PATH")
+            (files '("lib/lv2")))))
    (home-page "https://drobilla.net/software/jalv.html")
    (synopsis "Simple LV2 host for JACK")
    (description
@@ -3536,6 +3545,7 @@ compensation, (de)interleaving, and byte-swapping
    (build-system pyproject-build-system)
    (arguments
     (list
+      #:tests? #f ;no test target
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'find-library
@@ -3725,13 +3735,13 @@ CFFI and NumPy.")
 (define-public python-soxr
  (package
    (name "python-soxr")
-    (version "0.5.0.post1")
+    (version "1.0.0")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "soxr" version))
       (sha256
-        (base32 "0wzz7j0z814mm99xr19vfrwp2x904lbwhf513x7085m4x3rvk4kh"))))
+        (base32 "02a5balcm8dvlb938gl2k3kqvfdq1k300j2g0dbnkg2rsv0yczp0"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -3759,7 +3769,6 @@ CFFI and NumPy.")
                         python-scikit-build-core
                         python-setuptools
                         python-setuptools-scm
-                         python-sphinx
                         python-typing-extensions
                         python-wheel))
    (home-page "https://github.com/dofuuz/python-soxr")
@@ -5966,7 +5975,7 @@ kbps at 24 bit/96 kHz.")
 (define-public bluez-alsa
  (package
    (name "bluez-alsa")
-    (version "3.0.0")
+    (version "4.3.1")
    (source (origin
              ;; The tarballs are mere snapshots and don't contain a
              ;; bootstrapped build system.
@@ -5977,7 +5986,7 @@ kbps at 24 bit/96 kHz.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8"))))
+                "05qzmcsihhd92vpjd45qr0gdzfqiw4jfcdjdg78mzimv9g5g3rjm"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
@@ -5989,7 +5998,12 @@ kbps at 24 bit/96 kHz.")
                            (assoc-ref %outputs "out")
                            "/etc/dbus-1/system.d"))))
    (native-inputs
-     (list autoconf automake libtool pkg-config))
+     (list autoconf
+           automake
+           `(,glib "bin")
+           libtool
+           pkg-config
+           python-minimal))
    (inputs
     (list alsa-lib
           bluez
@@ -6077,26 +6091,50 @@ customized and extended using either the s7 Scheme implementation (included in
 the Snd sources), Ruby, or Forth.")
    (license (license:non-copyleft "file://COPYING"))))

+(define-public libspecbleach
+  (package
+    (name "libspecbleach")
+    (version "0.1.6")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/lucianodato/libspecbleach")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0czmzhggg5gl833karfrl2c0pr2k3jf7q7jd3y68hyj0cnn6f3jg"))))
+    (build-system meson-build-system)
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list fftwf))
+    (home-page "https://github.com/lucianodato/libspecbleach")
+    (synopsis "C library for audio noise reduction and other spectral effects")
+    (description
+     "This package provides a C library for audio noise reduction and other
+spectral effects.  It is based on the algorithms that were used in
+@code{noise-repellent}.  These were extracted into a this standalone library to
+remove the lv2 dependency.  It uses the concept of a spectral processor which
+itself uses a @acronym{STFT, short time Fourier transform} to process the audio.")
+    (license license:lgpl2.1+)))
+
 (define-public noise-repellent
  (package
    (name "noise-repellent")
-    (version "0.1.5")
+    (version "0.2.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/lucianodato/noise-repellent")
-                    (commit version)))
-              (file-name (string-append name "-" version "-checkout"))
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl"))))
+                "0dq0rv7mndw0lqacl2nf9dmj4zzq19hfminzk3fzbppk5mh2rivp"))))
    (build-system meson-build-system)
-    (arguments
-     `(#:configure-flags
-       (list (string-append "--prefix=" (assoc-ref %outputs "out")
-                            "/lib/lv2"))))
    (inputs
-     (list lv2 fftwf))
+     (list fftwf libspecbleach lv2))
    (native-inputs
     (list pkg-config))
    (home-page "https://github.com/lucianodato/noise-repellent")
@@ -6220,7 +6258,7 @@ representations.")
 (define-public cava
  (package
    (name "cava")
-    (version "0.10.4")
+    (version "0.10.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -6229,7 +6267,7 @@ representations.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "09wwzqynfmdzn77vxxmrw2z0yz95p4zg9cgfp9vnpv70visi98d0"))))
+                "12ysxbm1di2m0qac4rgd5f94fvlxv64s7kyy5s0d2bbxyzvdcqvm"))))
    (build-system gnu-build-system)
    (native-inputs (list autoconf automake libtool pkg-config))
    (inputs (list alsa-lib fftw ncurses pipewire pulseaudio iniparser
@@ -6480,7 +6518,7 @@ other Gnaural instances, allowing synchronous sessions between many users.")
 (define-public darkice
  (package
    (name "darkice")
-    (version "1.4")
+    (version "1.5")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/rafael2k/darkice/releases/"
@@ -6488,7 +6526,7 @@ other Gnaural instances, allowing synchronous sessions between many users.")
                                  version ".tar.gz"))
              (sha256
               (base32
-                "05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76"))))
+                "13h58skz5xik75sjv9kf2299haly2nc5gswl22ff1kvw79bw9d0q"))))
    (build-system gnu-build-system)
    (native-inputs (list pkg-config))
    (inputs (list lame
@@ -7302,14 +7340,14 @@ while still staying in time.")
 (define-public butt
  (package
    (name "butt")
-    (version "0.1.38")
+    (version "1.45.0")
    (source (origin
              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/butt/butt/butt-"
+              (uri (string-append "https://danielnoethen.de/butt/release/"
                                  version "/butt-" version ".tar.gz"))
              (sha256
               (base32
-                "10i3xpxzccdl4pidiyymw9cfavhy50yhn7xi5bd77y91f2903kp9"))
+                "0r43xph6xf02c9zldhyj82mvy82xv0f9wbv653gg2kkcjh88ajc8"))
              (modules '((guix build utils)))
              (snippet
               '(substitute* "src/butt.cpp"
@@ -7320,19 +7358,21 @@ while still staying in time.")
           #~(modify-phases %standard-phases
               (add-after 'install 'install-documentation
                 (lambda _
-                   (let ((doc (string-append #$output "/share/doc/" #$name)))
+                   (let ((doc (string-append #$output:doc "/share/doc/" #$name)))
                     (install-file "README" doc)
                     (copy-file #$(this-package-native-input "manual")
                                (string-append doc "/butt-manual.pdf"))))))))
+    (outputs '("out" "doc"))
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("manual"
        ,(origin
           (method url-fetch)
-           (uri (string-append "https://danielnoethen.de/butt/butt-"
+           (uri (string-append "https://danielnoethen.de/butt/release/" version
+                               "/butt-"
                               version "_manual.pdf"))
           (sha256
-            (base32 "04aixxqshfj11ja3ifh0zvywl2mqzmymppcd0xj8sv0j7whjibaq"))))))
+            (base32 "07mr25k26xrpns3s7ci27jmp71c49a23r0mi662ir5v35rz4bf4q"))))))
    (inputs
     (list curl
           dbus
@@ -7350,7 +7390,8 @@ while still staying in time.")
           libogg
           openssl
           opus
-           portaudio))
+           portaudio
+           portmidi-2))
    (home-page "https://danielnoethen.de/butt/")
    (synopsis "Audio streaming tool")
    (description "Butt is a tool to stream audio to a ShoutCast or
@@ -7484,7 +7525,7 @@ Home Page}.")
 (define-public python-librosa
  (package
    (name "python-librosa")
-    (version "0.10.2.post1")
+    (version "0.11.0")
    (source
     (origin
       (method git-fetch)
@@ -7494,7 +7535,7 @@ Home Page}.")
             ;; For test files.
             (recursive? #true)))
       (sha256
-        (base32 "1x37148y1rh4sq2nc59iw9jlza3zwawxnlb7bd9w36an05aclmnh"))))
+        (base32 "065x43hx670rjrclxi4hiqxscllb16v9s7myjvg7rd5pd3y0k7sg"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -157,7 +157,7 @@ know anything about Autoconf or M4.")
       (base32
        "0niz4852fgyavfh3gr4h4kzalk01nk70v6vfsja6r3ap349mr25s"))))))

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

 (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.17")
+    (version "1.18.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/automake/automake-"
                                  version ".tar.xz"))
              (sha256
               (base32
-                "146rkdcwri2dkwn3pjrjs9v0wm4xyav9vvq4yw5vj4qy87yc2849"))
+                "11v8ckqx7z8hv4mq9dnhg58cwnssaa7l9136yndbhlc34xis72hn"))
              (patches
               (search-patches "automake-skip-amhello-tests.patch"))))
    (arguments
@@ -483,16 +483,14 @@ Makefile, simplifying the entire process for the developer.")
 (define-public libtool
  (package
    (name "libtool")
-    (version "2.4.7")
+    (version "2.5.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/libtool/libtool-"
                                  version ".tar.xz"))
              (sha256
               (base32
-                "0pb3l4x37k6fj1lwnpzws55gi3pxl0hx56jm4bzmbrkw0mzj2zsg"))
-              (patches (search-patches "libtool-skip-tests2.patch"
-                                       "libtool-grep-compat.patch"))))
+                "0xb64rhambx6mhxwr613xgyad7ybs5hgmpmd9gccf2vbcrh5h7zq"))))
    (build-system gnu-build-system)
    (propagated-inputs (list m4))
    (native-inputs
@@ -518,6 +516,12 @@ Makefile, simplifying the entire process for the developer.")

       #: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.
@@ -21,10 +21,10 @@
 ;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
-;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2022 Feng Shu <tumashu@163.com>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
-;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023-2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2024 jgart <jgart@dismail.de>
 ;;; Copyright © 2025 Kjartan Oli Agustsson <kjartanoli@outlook.com>
 ;;; Copyright © 2025 mstenek <mstenek@disroot.org>
@@ -54,7 +54,6 @@
  #:use-module (guix build-system qt)
  #:use-module (guix download)
  #:use-module (guix gexp)
-  #:use-module (guix gexp)
  #:use-module (guix git-download)
  #:use-module (guix packages)
  #:use-module (guix utils)
@@ -109,7 +108,8 @@
  #:use-module (gnu packages time)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages valgrind)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (ice-9 format))

 (define-public duplicity
  (package
@@ -264,7 +264,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
 (define-public libarchive
  (package
    (name "libarchive")
-    (version "3.7.7")
+    (version "3.8.3")
    (source
     (origin
       (method url-fetch)
@@ -275,7 +275,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
                                 version ".tar.xz")))
       (sha256
        (base32
-         "1vps57mrpqmrk4zayh5g5amqfq7031s5zzkkxsm7r71rqf1wv6l7"))))
+         "124pp4w6n8xqdwjswc5d4d6kkrgxv67f9xlhgg7934zii4mizqlh"))))
    (build-system gnu-build-system)
    (inputs
     (list bzip2
@@ -287,63 +287,52 @@ backups (called chunks) to allow easy burning to CD/DVD.")
           `(,zstd "lib")))
    (arguments
     (list
+      ;; Embed absolute references to inputs to avoid propagation.
      #:configure-flags
-      #~'("--disable-static"
-          ;; Because of the circular dependency, we cannot use openssl here.
-          ;; Explicitly disable openssl to avoid unnecessary dependencies in the
-          ;; pc file.
-          "--without-openssl")
+      #~(list "--disable-static"
+              (format #f "LIBS=~{-L~a/lib~^ ~}"
+                      '#$(map (lambda (x)
+                                (this-package-input (car x)))
+                              (package-inputs this-package)))
+              ;; Because of the circular dependency, we cannot use openssl here.
+              ;; Explicitly disable openssl to avoid unnecessary dependencies in the
+              ;; pc file.
+              "--without-openssl")
      #:phases
      #~(modify-phases %standard-phases
-          (add-before 'build 'patch-pwd
+          (add-before 'build 'patch-commands
            (lambda _
              (substitute* "Makefile"
-                (("/bin/pwd") (which "pwd")))))
+                (("/bin/pwd") (which "pwd")))
+              (substitute* "test_utils/test_main.c"
+                (("/bin/sh") (which "sh")))))
          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
+            (lambda* (#:key parallel-build? tests? #:allow-other-keys)
              (if tests?
-		  ;; XXX: The test_owner_parse, test_read_disk, and
-		  ;; test_write_disk_lookup tests expect user 'root' to
-		  ;; exist, but the chroot's /etc/passwd doesn't have
-		  ;; it.  Turn off those tests.
                  (begin
-		    ;; The tests allow one to disable tests matching a globbing pattern.
-		    (invoke "make"
+                    ;; These environment variables are taken from
+                    ;; <https://raw.githubusercontent.com/libarchive/libarchive/refs/heads/master/.github/workflows/ci.yml>
+                    (setenv "SKIP_OPEN_FD_ERR_TEST" "1")
+                    (setenv "IGNORE_TRAVERSALS_TEST4" "1")
+
+		    ;; XXX: The test_owner_parse, test_read_disk, and
+		    ;; test_write_disk_lookup tests expect user 'root' to
+		    ;; exist, but the chroot's /etc/passwd doesn't have it
+		    ;; (see:
+		    ;; <https://github.com/libarchive/libarchive/issues/2794>).
+		    (invoke "make" "-j" (number->string
+                                         (if parallel-build?
+                                             (parallel-job-count)
+                                             1))
 			    "libarchive_test"
 			    "bsdcpio_test"
 			    "bsdtar_test")
-
 		    ;; XXX: This glob disables too much.
 		    (invoke "./libarchive_test" "^test_*_disk*")
 		    (invoke "./bsdcpio_test" "^test_owner_parse")
 		    (invoke "./bsdtar_test"))
                  ;; Tests may be disabled if cross-compiling.
-                  (format #t "Test suite not run.~%"))))
-          (add-after 'install 'add--L-in-libarchive-pc
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (let* ((out     #$output)
-                     (lib     (string-append out "/lib"))
-                     (nettle  (assoc-ref inputs "nettle"))
-                     (libxml2 (assoc-ref inputs "libxml2"))
-                     (xz      (assoc-ref inputs "xz"))
-                     (zlib    (assoc-ref inputs "zlib"))
-                     (zstd    (assoc-ref inputs "zstd"))
-                     (bzip2   (assoc-ref inputs "bzip2")))
-                ;; Embed absolute references to these inputs to avoid propagation.
-                (substitute* (list (string-append lib "/pkgconfig/libarchive.pc")
-                                   (string-append lib "/libarchive.la"))
-                  (("-lnettle")
-                   (string-append "-L" nettle "/lib -lnettle"))
-                  (("-lxml2")
-                   (string-append "-L" libxml2 "/lib -lxml2"))
-                  (("-llzma")
-                   (string-append "-L" xz "/lib -llzma"))
-                  (("-lz")
-                   (string-append "-L" zlib "/lib -lz"))
-                  (("-lzstd")
-                   (string-append "-L" zstd "/lib -lzstd"))
-                  (("-lbz2")
-                   (string-append "-L" bzip2 "/lib -lbz2")))))))))
+                  (format #t "Test suite not run.~%")))))))
    (home-page "https://libarchive.org/")
    (synopsis "Multi-format archive and compression library")
    (description
@@ -107,6 +107,7 @@
              (sha256
               (base32
                "1aqq1379syjckf0wdn9vs6wfbapnj9zfikhiykf29k4jq9nrk6js"))))
+    (outputs (list "out" "debug"))
    (build-system gnu-build-system)
    (synopsis "Example GNU package")
    (description
@@ -694,62 +695,75 @@ change.  GNU make offers many powerful extensions over the standard utility.")

 (define-public binutils
  (package
-   (name "binutils")
-   (version "2.44")
-   (source
-    (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/binutils/binutils-"
-                          version ".tar.bz2"))
-      (sha256
-       (base32 "0fnwaasfglbphqzvz5n25js9gl695p7pjbmb1z81g8gsc6k90qzn"))
-      (patches (search-patches
-                "binutils-2.41-fix-cross.patch"
-                "binutils-loongson-workaround.patch"))))
-   (build-system gnu-build-system)
-   (arguments
-    (list #:out-of-source? #t ;recommended in the README
-          #:configure-flags #~'(;; Add `-static-libgcc' to not retain a dependency
-                                ;; on GCC when bootstrapping.
-                                "LDFLAGS=-static-libgcc"
+    (name "binutils")
+    (version "2.44")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnu/binutils/binutils-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32 "0fnwaasfglbphqzvz5n25js9gl695p7pjbmb1z81g8gsc6k90qzn"))
+       (patches (search-patches
+                 "binutils-2.41-fix-cross.patch"
+                 "binutils-loongson-workaround.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:out-of-source? #t          ;recommended in the README
+           #:configure-flags
+           #~'( ;; Add `-static-libgcc' to not retain a dependency
+               ;; on GCC when bootstrapping.
+               "LDFLAGS=-static-libgcc"

-                                ;; Turn on --enable-new-dtags by default to make the
-                                ;; linker set RUNPATH instead of RPATH on binaries.
-                                ;; This is important because RUNPATH can be overriden
-                                ;; using LD_LIBRARY_PATH at runtime.
-                                "--enable-new-dtags"
+               ;; Turn on --enable-new-dtags by default to make the
+               ;; linker set RUNPATH instead of RPATH on binaries.
+               ;; This is important because RUNPATH can be overriden
+               ;; using LD_LIBRARY_PATH at runtime.
+               "--enable-new-dtags"

-                                ;; Don't search under /usr/lib & co.
-                                "--with-lib-path=/no-ld-lib-path"
+               ;; Don't search under /usr/lib & co.
+               "--with-lib-path=/no-ld-lib-path"

-                                ;; Install BFD.  It ends up in a hidden directory,
-                                ;; but it's here.
-                                "--enable-install-libbfd"
+               ;; Install BFD.  It ends up in a hidden directory,
+               ;; but it's here.
+               "--enable-install-libbfd"

-                                ;; Make sure 'ar' and 'ranlib' produce archives in a
-                                ;; deterministic fashion.
-                                "--enable-deterministic-archives"
+               ;; Make sure 'ar' and 'ranlib' produce archives in a
+               ;; deterministic fashion.
+               "--enable-deterministic-archives"

-                                "--enable-64-bit-bfd"
-                                "--enable-compressed-debug-sections=all"
-                                "--enable-lto"
-                                "--enable-separate-code"
-                                "--enable-threads")
+               "--enable-64-bit-bfd"
+               ;; Note: Do not enable compression here, as dwz cannot process
+               ;; compressed debug sections.
+               "--enable-lto"
+               "--enable-separate-code"
+               "--enable-threads")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'use-zstd-compression-level-19
+                 (lambda _
+                   ;; The default level (3) is hard-coded.  Use a higher level to
+                   ;; compact debug sections as much as possible.
+                   (substitute* "bfd/compress.c"
+                     (("ZSTD_CLEVEL_DEFAULT") "19")))))

-          ;; 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'
-   (synopsis "Binary utilities: bfd gas gprof ld")
-   (description
-    "GNU Binutils is a collection of tools for working with binary files.
+           ;; 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'
+           pkg-config))
+    (inputs (list `(,zstd "lib")))
+    (synopsis "Binary utilities: bfd gas gprof ld")
+    (description
+     "GNU Binutils is a collection of tools for working with binary files.
 Perhaps the most notable are \"ld\", a linker, and \"as\", an assembler.
 Other tools include programs to display binary profiling information, list
 the strings in a binary file, and utilities for working with archives.  The
 \"bfd\" library for working with executable and object formats is also
 included.")
-   (license gpl3+)
-   (home-page "https://www.gnu.org/software/binutils/")))
+    (license gpl3+)
+    (home-page "https://www.gnu.org/software/binutils/")))

 ;; FIXME: ath9k-firmware-htc-binutils.patch do not apply on 2.34 because of a
 ;; big refactoring of xtensa-modules.c (commit 567607c11fbf7105 upstream).
@@ -791,10 +805,22 @@ included.")
                 (delete "LDFLAGS=-static-libgcc" #$flags)))
       ((#:phases phases '%standard-phases)
        #~(modify-phases #$phases
+            (add-after 'unpack 'use-zstd-compression-level-19-for-gold
+              (lambda _
+                ;; The default level (3) is hard-coded.  Use a higher level to
+                ;; compact debug sections as much as possible.
+                (substitute* "gold/compressed_output.cc"
+                  (("ZSTD_CLEVEL_DEFAULT") "19"))))
           (add-after 'patch-source-shebangs 'patch-more-shebangs
             (lambda _
               (substitute* "gold/Makefile.in"
                 (("/bin/sh") (which "sh")))))
+           (add-before 'check 'set-LD_LIBRARY_PATH
+             (lambda* (#:key inputs #:allow-other-keys)
+               ;; Some test binaries are linked with gold, which lack RUNPATH
+               ;; info due to not being linked with our ld-wrapper script.
+               (setenv "LD_LIBRARY_PATH"
+                       (dirname (search-input-file inputs "lib/libzstd.so")))))
           ;; Multiple failing tests on some architectures in the gold testsuite.
           #$@(if (or (target-arm?)
                      (target-ppc32?))
@@ -1640,15 +1666,15 @@ command.")
    (name "tzdata")
    ;; This package should be kept in sync with python-pytz and python-tzdata
    ;; in (gnu packages time).
-    (version "2025a")
+    (version "2025b")
    (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://data.iana.org/time-zones/releases/tzdata"
-                   version ".tar.gz"))
-             (sha256
-              (base32
-               "1l7hnlgc4wgy2gmaj5zmswpzbyq23h7vsndnw2zhwibw5k3wnpsd"))))
+              (method url-fetch)
+              (uri (string-append
+                    "https://data.iana.org/time-zones/releases/tzdata"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0x0lswl5v3q3ml8ig4djc76p9zc593xajzp22x881isz6h9h908i"))))
    (build-system gnu-build-system)
    (arguments
     (list #:tests? #f
@@ -1707,7 +1733,9 @@ command.")
                     (copy-recursively (string-append out "/share/zoneinfo-leaps")
                                       (string-append out "/share/zoneinfo/right"))
                     (delete-file-recursively
-                      (string-append out "/share/zoneinfo-leaps")))))
+                      (string-append out "/share/zoneinfo-leaps"))
+                     (install-file "leap-seconds.list"
+                                   (string-append out "/share/zoneinfo")))))
               (delete 'configure))))
    (inputs (list (origin
                    (method url-fetch)
@@ -1716,7 +1744,7 @@ command.")
                          version ".tar.gz"))
                    (sha256
                     (base32
-                      "0qahpwp1zlyvi7qrlm4r74pmj3c7sx3jlg9xw2siwj3nkzapk5hi")))))
+                      "1v1mw6599afdcmf5dal7zvjbl3caibkzmlw7kka71vi56pdzxy05")))))
    (home-page "https://www.iana.org/time-zones")
    (synopsis "Database of current and historical time zones")
    (description "The Time Zone Database (often called tz or zoneinfo)
@@ -1736,20 +1764,6 @@ and daylight-saving rules.")
 ;;; package.
 (define-public tzdata-for-tests tzdata)

-;;; TODO: Move the 'install-leap-seconds' phase into the main package's
-;;; 'post-install' phase on the next rebuild cycle.
-(define-public tzdata/leap-seconds
-  (hidden-package
-    (package/inherit tzdata
-      (arguments
-        (substitute-keyword-arguments (package-arguments tzdata)
-          ((#:phases phases)
-           #~(modify-phases #$phases
-               (add-after 'post-install 'install-leap-seconds
-                 (lambda _
-                   (install-file "leap-seconds.list"
-                     (string-append #$output "/share/zoneinfo")))))))))))
-
 (define-public libiconv
  (package
    (name "libiconv")
@@ -66,7 +66,7 @@

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

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

-(define %patch-series-5.2
-  ;; This is the current patches series for 5.2, generated using
+(define %patch-series-5.3
+  ;; This is the current patches series for 5.3, generated using
  ;; 'download-patches' below.
  (patch-series
-   (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")))
+   (1 "0zr8wgg1gb67vxn7ws971n1znrdinczymc688ndnpy2a6qs88q0z")
+   (2 "009051z55plsy4jmmjdb3ys7li2jraynz99qg7n6a1qk025591g3")
+   (3 "1vb0gnrkmz49rcfpxjcxy0v0k5278wrlkljk9gc20nizvk3xjigj")))

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

      (outputs '("out"
@@ -11657,6 +11657,13 @@ containers.")
      '(modify-phases %standard-phases
         (add-after 'unpack 'set-HOME
           (lambda _ (setenv "HOME" "/tmp")))
+         ;; For unknown reasons, the libxml2 features are misreported without
+         ;; this call prior to running BiocGenerics:::testPackage("mzR").
+         (add-after 'unpack 'ensure-libxml2-works
+           (lambda _
+             (substitute* "tests/testthat.R"
+               (("library\\(\"MSnbase\"\\)" m)
+                (string-append "XML::libxmlFeatures()\n" m)))))
         (add-after 'unpack 'delete-bad-tests
           (lambda _
             ;; Needs r-prolocdata
@@ -11838,12 +11845,13 @@ specific parser.")
    (arguments
     `(#:phases
       (modify-phases %standard-phases
-         (add-after 'unpack 'skip-bad-tests
+         ;; For unknown reasons, the libxml2 features are misreported without
+         ;; this call prior to running BiocGenerics:::testPackage("mzR").
+         (add-after 'unpack 'ensure-libxml2-works
           (lambda _
-             ;; These tests need Internet access to load XML schemas.
-             (with-directory-excursion "inst/unitTests/"
-               (delete-file "test_isolationWindow.R")
-               (delete-file "test_mzid.R"))))
+             (substitute* "tests/runTests.R"
+               (("library\\(\"mzR\"\\)" m)
+                (string-append "XML::libxmlFeatures()\n" m)))))
         (add-after 'unpack 'use-system-boost
           (lambda _
             (substitute* "src/Makevars"
@@ -698,49 +698,6 @@ UMIs, produce gene count or transcript compatibility count matrices, and is usef
 for many other tasks.")
    (license license:bsd-2)))

-(define-public cellsnp-lite
-  ;; Last release is from November 2021 and does not contain fixes.
-  (let ((commit "0885d746b0b1ea65c8ef92f8943ca7669ca9734a")
-        (revision "0"))
-    (package
-      (name "cellsnp-lite")
-      (version (git-version "1.2.2" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/single-cell-genetics/cellsnp-lite")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1qrvqgbvw6mbhpyqvqbmvv8dmyc67bsk1041cn7ib6zmd47qm444"))))
-      (build-system gnu-build-system)
-      (arguments
-       (list
-        #:configure-flags
-        #~(list (string-append "--with-htslib="
-                               #$(this-package-input "htslib")))))
-      (inputs
-       (list curl
-             htslib
-             openssl
-             zlib))
-      (native-inputs
-       (list autoconf))
-      (home-page "https://cellsnp-lite.readthedocs.io")
-      (synopsis "Pileup expresses alleles in single-cell or bulk RNA-seq data")
-      (description
-       "This package is designed to pileup the expressed alleles in
-single-cell or bulk RNA-seq data, which can be directly used for donor
-deconvolution in multiplexed single-cell RNA-seq data, particularly with other
-packages, which assigns cells to donors and detects doublets as vireo, even
-without genotyping reference.
-
-This package is the C version of the deprecated cellSNP implemented in Python.
-Compared to cellSNP, this package is more efficient with higher speed and less
-memory usage.")
-      (license license:asl2.0))))
-
 (define-public cpat
  (package
    (name "cpat")
@@ -1662,8 +1619,8 @@ accessibility and gene expression across individual single cells.")
      (license license:expat))))

 (define-public r-saige
-  (let ((commit "c6717ba9c5a967bcf612e97566d845397b1b7167")
-        (revision "1"))
+  (let ((commit "44c8dd4d7641fcb4b591a49e10e7ecf501943202")
+        (revision "2"))
    (package
      (name "r-saige")
      (version (git-version "1.3.4" revision commit))
@@ -1675,7 +1632,7 @@ accessibility and gene expression across individual single cells.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0c3211whqazycs9ivwdz23imj45j4na2xzcfq5l989ykkgmqnjzs"))))
+          (base32 "0n5gaah0fdhd6affmaml3kfmk7knxkr26knyg6hjmwx836fbbyif"))))
      (properties `((upstream-name . "SAIGE")))
      (build-system r-build-system)
      (arguments
@@ -1687,16 +1644,27 @@ accessibility and gene expression across individual single cells.")
               ;; Pretend to be a Conda build to avoid having to install
               ;; things with pip and cget.
               (setenv "CONDA_BUILD" "1")))
+           (add-after 'unpack 'add-missing-include
+             (lambda _
+               (substitute* "src/SAIGE_fitGLMM_fast.cpp"
+                 (("#include <omp.h>")
+                  "#include <omp.h>\n#include <tbb/concurrent_vector.h>"))))
           (add-after 'unpack 'link-with-openblas
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "src/Makevars"
                 (("-llapack")
                  (search-input-file inputs
-                                     "/lib/libopenblas.so"))))))))
-      (inputs (list openblas savvy superlu zlib zstd))
+                                     "/lib/libopenblas.so")))))
+           (add-after 'unpack 'link-with-plink2
+             (lambda* (#:key inputs #:allow-other-keys)
+               (substitute* "src/Makevars"
+                 (("-l:plink2_includes.a")
+                  (search-input-file inputs "/lib/libplink2.so"))))))))
+      (inputs (list openblas plink-ng savvy superlu zlib zstd))
      (propagated-inputs (list r-bh
                               r-data-table
                               r-dplyr
+                               r-lintools
                               r-matrix
                               r-metaskat
                               r-optparse
@@ -1708,7 +1676,8 @@ accessibility and gene expression across individual single cells.")
                               r-rhpcblasctl
                               r-rsqlite
                               r-skat
-                               r-spatest))
+                               r-spatest
+                               r-survival))
      (home-page "https://github.com/saigegit/SAIGE")
      (synopsis "Genome-wide association tests in large-scale data sets")
      (description "SAIGE is a package for efficiently controlling for
@@ -1732,6 +1701,17 @@ tests in large cohorts and biobanks (SAIGE-GENE+).")
        (base32 "16r6m8p90rnb4hxl86fz3kbals3626232i8fj0zhhd23p89z3w4v"))))
    (properties `((upstream-name . "sigfit")))
    (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'gcc-14-compatibility
+            (lambda _
+              (substitute* "configure"
+                ;; Modifying src/Makevars directly is overruled.
+                (("config\\(\\)\"")
+                 "config()\"
+echo \"PKG_CXXFLAGS+=-g -O2 -Wno-error=changes-meaning\" >> src/Makevars")))))))
    (native-inputs (list r-codetools))
    (propagated-inputs (list r-rcpp
                             r-rstan
@@ -11828,7 +11808,7 @@ subsequent visualization, annotation and storage of results.")
 (define-public plink-ng
  (package (inherit plink)
    (name "plink-ng")
-    (version "2.00a3.3")
+    (version "2.0.0-a.6.16")
    (source
     (origin
       (method git-fetch)
@@ -11837,7 +11817,7 @@ subsequent visualization, annotation and storage of results.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0m8wkyvbgvcr5kzc284w8fbhpxwglh2c1xq0yc3yv00a53gs7rv0"))))
+        (base32 "1v020l8b5njc458silaqfwl8jg7vn46wg8hh4iiq3ip6p31g2dm7"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -11851,28 +11831,43 @@ subsequent visualization, annotation and storage of results.")
              (string-append "PREFIX=" #$output)
              "DESTDIR=")
      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'chdir
-           (lambda _ (chdir "2.0/build_dynamic")))
-         (delete 'configure)            ; no "configure" script
-         (replace 'check
-           (lambda* (#:key tests? inputs #:allow-other-keys)
-             (when tests?
-               (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH")))
-               (with-directory-excursion "../Tests"
-                 (substitute* "run_tests.sh"
-                   (("^./run_tests" m)
-                    (string-append (which "bash") " " m)))
-                 (invoke "bash" "run_tests.sh")))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (install-file "plink2"
-                           (string-append
-                            (assoc-ref outputs "out") "/bin")))))))
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _ (chdir "2.0/build_dynamic")))
+          (add-after 'chdir 'patch-headers
+            (lambda _
+              (substitute* '("../include/pvar_ffi_support.h"
+                             "../include/pgenlib_ffi_support.h")
+                (("#include \"include/pgenlib_misc.h\"")
+                 "#include <pgenlib_misc.h>"))))
+          (delete 'configure)           ; no "configure" script
+          (replace 'check
+            (lambda* (#:key tests? inputs #:allow-other-keys)
+              (when tests?
+                (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH")))
+                (with-directory-excursion "../Tests"
+                  (substitute* "run_tests.sh"
+                    (("^./run_tests" m)
+                     (string-append (which "bash") " " m)))
+                  (invoke "bash" "run_tests.sh")))))
+          (add-after 'build 'build-library
+            (lambda _
+              ;; Inspired by what r-saige does to the plink2 sources.
+              (apply invoke "gcc" "-std=c++14" "-fPIC" "-O3" "-o" "libplink2.so"
+                     (append (find-files "../include" "\\.cc$")
+                             (list "-shared" "-lz" "-lzstd" "-lpthread" "-lm" "-ldeflate")))))
+          (replace 'install
+            (lambda _
+              (install-file "plink2" (string-append #$output "/bin"))
+              (install-file "libplink2.so" (string-append #$output "/lib"))
+              (copy-recursively "../include" (string-append #$output "/include"))
+              (for-each (lambda (header)
+                          (install-file header (string-append #$output "/include")))
+                        (find-files "." "\\.h$")))))))
    (inputs
-     (list openblas zlib `(,zstd "lib")))
+     (list libdeflate openblas zlib `(,zstd "lib")))
    (native-inputs
-     (list diffutils plink python simde)) ; for tests
+     (list diffutils python simde)) ; for tests
    (home-page "https://www.cog-genomics.org/plink/")
    (license license:gpl3+)))

@@ -13136,8 +13131,8 @@ GenomicRanges operations.")
      (license license:gpl2))))

 (define-public r-skitools
-  (let ((commit "22d107d32f063eb891eb5e7fb36996d1c0b0d2bc")
-        (revision "1"))
+  (let ((commit "ba322dcc2c0ca24a7f3dabecfb37f95e0e2186d1")
+        (revision "2"))
    (package
      (name "r-skitools")
      (version (git-version "0.0.0.9000" revision commit))
@@ -13149,9 +13144,19 @@ GenomicRanges operations.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "1977d9bkdk9l2n6niahfj9vksh9l1ga4g7c3b3x27lj1gc0qgr4z"))))
+                  "1za371x1cmkmlmicbhzxwycg7g1z9q3d5j7ia2rzayf30s9rcc47"))))
      (properties `((upstream-name . "skitools")))
      (build-system r-build-system)
+      (arguments
+       (list
+        #:phases
+        '(modify-phases %standard-phases
+           (add-after 'unpack 'disable-bad-test
+             (lambda _
+               ;; See https://github.com/mskilab-org/skitools/issues/11
+               (substitute* "tests/testthat/test_skitools.R"
+                 ((".*test ra.merge.*" m)
+                  (string-append m "skip('guix')\n"))))))))
      (propagated-inputs
       (list r-biostrings
             r-complexheatmap
@@ -22202,89 +22207,6 @@ datasets to ascertain that it achieves high sensitivity and specificity in
 multiple experimental contexts.")
    (license license:expat)))

-(define-public vbz-compression
-  (package
-    (name "vbz-compression")
-    (version "1.0.13")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/nanoporetech/vbz_compression/")
-             (commit version)
-             ;; We include the streamvbyte sources
-             (recursive? #true)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1jf5i5v0h58s7w6rhgi4w1vvxnk9jzbgmiic14d48ngr204m0w5c"))))
-    (build-system cmake-build-system)
-    (arguments
-     `(#:configure-flags
-       '("-DENABLE_CONAN=OFF"
-         ;; Python things aren't even installed, so we might as well
-         ;; disable building them.
-         "-DENABLE_PYTHON=OFF")))
-    (inputs
-     (list ;("hdf5" ,hdf5-1.10)
-           `(,zstd "lib")))
-    (native-inputs
-     (list googlebenchmark))
-    (home-page "https://github.com/nanoporetech/vbz_compression/")
-    (synopsis "VBZ compression plugin for nanopore signal data")
-    (description
-     "VBZ Compression uses variable byte integer encoding to compress
-nanopore signal data.  The performance of VBZ is achieved by taking
-advantage of the properties of the raw signal and therefore is most
-effective when applied to the signal dataset.")
-    (license license:mpl2.0)))
-
-(define-public python-ont-fast5-api
-  (package
-    (name "python-ont-fast5-api")
-    (version "4.1.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/nanoporetech/ont_fast5_api")
-              (commit (string-append "release_" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "05zwjgdnzdrqfifhgw9rp4s22g8ysvjfhlaq9nb6p68q6mijy098"))
-       (modules '((guix build utils)))
-       (snippet
-        '(delete-file-recursively "ont_fast5_api/vbz_plugin"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-backend #~'unittest
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'copy-plugin
-            (lambda* (#:key inputs #:allow-other-keys)
-              (mkdir-p "ont_fast5_api/vbz_plugin/")
-              (install-file (string-append
-                             #$(this-package-input "vbz-compression")
-                             "/hdf5/lib/plugin/libvbz_hdf_plugin.so")
-                            "ont_fast5_api/vbz_plugin/"))))))
-    (inputs
-     (list vbz-compression))
-    (propagated-inputs
-     (list python-numpy python-h5py python-packaging python-progressbar33))
-    (native-inputs
-     (list python-setuptools
-           python-wheel))
-    (home-page "https://github.com/nanoporetech/ont_fast5_api")
-    (synopsis "Interface to HDF5 files of the Oxford Nanopore fast5 file format")
-    (description
-     "This package provides a concrete implementation of the fast5 file schema
-using the generic @code{h5py} library, plain-named methods to interact with
-and reflect the fast5 file schema, and tools to convert between
-@code{multi_read} and @code{single_read} formats.")
-    (license license:mpl2.0)))
-
 (define-public tbsp
  (let ((commit "dc30c03868233c5504299c9cb0d7b2064ba9cb41")
        (revision "2"))
@@ -25237,6 +25159,15 @@ module capable of computing base-level alignments for very large sequences.")
              "-DGDCM_USE_SYSTEM_ZLIB=ON")
      #:phases
      #~(modify-phases %standard-phases
+          (add-after 'unpack 'refer-to-charls
+            (lambda _
+              ;; Resolve the absolute path to libcharls.so instead of exporting
+              ;; a bare '-lcharls' reference in GDCM targets.
+              (substitute* "CMakeLists.txt"
+                (("set\\(GDCM_CHARLS_LIBRARIES charls\\)")
+                 (string-append
+                  "find_library(CHARLS_LIBRARY NAMES charls REQUIRED)\n"
+                  "  set(GDCM_CHARLS_LIBRARIES ${CHARLS_LIBRARY})")))))
          (add-before 'build 'set-HOME
            ;; The build with documentation spams ‘Fontconfig error: No writable
            ;; cache directories’ in a seemingly endless loop otherwise.
@@ -23,6 +23,7 @@
 ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2025 Junker <dk@junkeria.club>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -221,6 +222,46 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
    (home-page "https://github.com/transmission-remote-gtk/transmission-remote-gtk")
    (license l:gpl2+)))

+(define-public stig
+  (package
+    (name "stig")
+    (version "0.14.0a0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/rndusr/stig")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jfcgncva94pyzjifar1l6wlmb7aylg0l4fxljc83rkbj1a2aan0"))))
+    (propagated-inputs
+     (list python-urwid
+           python-urwidtrees
+           python-aiohttp
+           python-aiohttp-socks
+           python-pyxdg
+           python-blinker
+           python-natsort
+           python-async-timeout
+           python-setproctitle))
+    (arguments
+     (list
+      #:tests? #f ;tests require network access
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'loosen-version-restrictions
+                     (lambda _
+                       (substitute* "setup.py"
+                         (("urwidtrees==1.0.3") "urwidtrees>=1.0.3")))))))
+    (inputs (list python))
+    (build-system python-build-system)
+    (synopsis "TUI and CLI for the BitTorrent client Transmission")
+    (description
+     "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)))
+
 (define-public libtorrent
  (package
    (name "libtorrent")
@@ -907,7 +907,7 @@ also initializes the boards (RAM etc).")
                     (lambda* (#:key make-flags #:allow-other-keys)
                       (let* ((info-dir (string-append #$output "/share/info"))
                              (info (string-append info-dir
-                                                   "/DasUBoot.info.gz")))
+                                                   "/DasUBoot.info.zst")))
                         (with-directory-excursion "doc/output"
                           (apply invoke "make" "-C" "texinfo" "install-info"
                                  (string-append "infodir=" info-dir)
@@ -1117,7 +1117,7 @@ maintenance-related files, for convenience.")
 (define-public maak
  (package
    (name "maak")
-    (version "0.2.3")
+    (version "0.2.9")
    (source
     (origin
       (method git-fetch)
@@ -1126,7 +1126,7 @@ maintenance-related files, for convenience.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "15s6khifk7k002hr9mqgl45r3ipmvsc56z9z8skwclxsj6w1cddl"))))
+        (base32 "0108sj9rdqwprcx2ihlsfhbqiig08kah3k2yxc5w0yxzxdh8hzwv"))))
    (build-system guile-build-system)
    (arguments
     (list
@@ -1437,7 +1437,7 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
 (define-public mimalloc
  (package
    (name "mimalloc")
-    (version "2.1.2")
+    (version "3.0.9")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1446,7 +1446,7 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1pyf05snc1ib7zjjm9kspvbmynd8lmxqw72qcpz8lcyzyywmz24i"))))
+                "0y249bmzx6rmc1m8a29d0x2cd52nik2dwqpzg9hd1xkvl9b8z7jc"))))
    (build-system cmake-build-system)
    (arguments
     `(#:build-type "Release"
@@ -1572,9 +1572,9 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
                       ,(string-append "--prefix=" #$output)
                       ,(string-append "--mandir=" #$output "/share/man")
                       ,(string-append "--cores="
-                                       (if parallel-build?
-                                           (number->string (parallel-job-count))
-                                           "1")))))))))
+                                       ;; Tests require parallelism, and set upper limit as test
+                                       ;; runtime scales superliniearly in the number of cores.
+                                       (number->string (max 2 (min 8 (parallel-job-count))))))))))))
    (home-page "https://github.com/concurrencykit/ck")
    (synopsis "C library for concurrent systems")
    (description "Concurrency Kit (@code{ck}) provides concurrency primitives,
@@ -1,124 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
-;;;
-;;; 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 cedille)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages agda)
-  #:use-module (gnu packages emacs-xyz)
-  #:use-module (gnu packages haskell)
-  #:use-module (gnu packages haskell-xyz)
-  #:use-module (guix build-system emacs)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages))
-
-(define-public cedille
-  (package
-    (name "cedille")
-    (version "1.1.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/cedille/cedille")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1h5s6ayh3s76z184jai3jidcs4cjk8s4nvkkv2am8dg4gfsybq22"))))
-    (inputs
-     (list agda agda-ial ghc ghc-alex ghc-happy))
-    (build-system emacs-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-cedille-paths
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (substitute* "cedille-mode.el"
-                 (("/usr/share/emacs/site-lisp/cedille-mode")
-                  (string-append
-                   out "/share/emacs/site-lisp/cedille")))
-               (substitute* "cedille-mode/cedille-mode-info.el"
-                 (("\\(concat cedille-path-el \"cedille-info-main.info\"\\)")
-                  (string-append
-                   "\"" out "/share/info/cedille-info-main.info.gz\"")))
-               #t)))
-         (add-after 'patch-cedille-paths 'copy-cedille-mode
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lisp
-                     (string-append
-                      out "/share/emacs/site-lisp/cedille/")))
-               (mkdir-p (string-append lisp "cedille-mode"))
-               (copy-recursively
-                "cedille-mode"
-                (string-append lisp "cedille-mode"))
-               (mkdir-p (string-append lisp "se-mode"))
-               (copy-recursively
-                "se-mode"
-                (string-append lisp "se-mode"))
-               #t)))
-         ;; FIXME: Byte compilation fails
-         (delete 'build)
-         (replace 'check
-           (lambda _
-             (with-directory-excursion "cedille-tests"
-               (invoke "sh" "run-tests.sh"))))
-         (add-after 'unpack 'patch-libraries
-           (lambda _ (patch-shebang "create-libraries.sh") #t))
-         (add-after 'unpack 'copy-ial
-           (lambda* (#:key inputs #:allow-other-keys)
-             (copy-recursively
-              (search-input-directory inputs "/include/agda/ial")
-              "ial")
-             ;; Ambiguous module if main is included from ial
-             (delete-file "ial/main.agda")
-             #t))
-         (add-after 'check 'build-cedille
-           ;; Agda has a hard time with parallel compilation
-           (lambda _
-             (invoke "touch" "src/Templates.hs")
-             (make-file-writable  "src/Templates.hs")
-             (invoke "touch" "src/templates.agda")
-             (make-file-writable  "src/templates.agda")
-             (invoke "make" "--jobs=1")))
-         (add-after 'install 'install-cedille
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (copy-recursively
-                "lib" (string-append out "/lib/cedille"))
-               (install-file "cedille" (string-append out "/bin"))
-               (install-file "core/cedille-core"
-                             (string-append out "/bin"))
-               (install-file "docs/info/cedille-info-main.info"
-                             (string-append out "/share/info"))
-               #t))))))
-    (home-page "https://cedille.github.io/")
-    (synopsis
-     "Language based on Calculus of Dependent Lambda Eliminations")
-    (description
-     "Cedille is an interactive theorem-prover and dependently typed
-programming language, based on extrinsic (aka Curry-style) type theory.  This
-makes it rather different from type theories like Coq and Agda, which are
-intrinsic (aka Church-style).  In Cedille, terms are nothing more than
-annotated versions of terms of pure untyped lambda calculus.  In contrast, in
-Coq or Agda, the typing annotations are intrinsic parts of terms.  The typing
-annotations can only be erased as an optimization under certain conditions,
-not by virtue of the definition of the type theory.")
-    (license license:expat)))
@@ -819,7 +819,7 @@ format.")
 (define-public cppcheck
  (package
    (name "cppcheck")
-    (version "2.17.1")
+    (version "2.18.0")
    (source (origin
      (method git-fetch)
      (uri (git-reference
@@ -827,11 +827,12 @@ format.")
             (commit version)))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "19ap9ai9s4vsygyqfa215mrmpz4vki63d5b4qdb89zvbldaf3hlf"))
+       (base32 "1551pbbvx43j5jl5jz725km7gd65fizf9y7j66anjmdmqzccpdmn"))
       (patches (search-patches "cppcheck-fix-basedir-test.patch"))))
    (build-system cmake-build-system)
    (arguments
-     '(#:configure-flags '("-DBUILD_TESTS=ON")))
+     '(#:parallel-tests? #f
+       #:configure-flags '("-DBUILD_TESTS=ON")))
    (home-page "https://cppcheck.sourceforge.io")
    (synopsis "Static C/C++ code analyzer")
    (description "Cppcheck is a static code analyzer for C and C++.  Unlike
@@ -2393,14 +2394,14 @@ since the last commit or what tests are currently failing.")
 (define-public python-coverage
  (package
    (name "python-coverage")
-    (version "7.9.2")
+    (version "7.11.0")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "coverage" version))
       (sha256
        (base32
-         "12qcm2j4bnc2gp6sci9brly2k406gp4jwjfpzxj04ag3a7x28w4r"))))
+         "0l403f6d59q8rik9vvzb6982qad0zrfj87dqydzsz8hwmh2dayqn"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -2416,6 +2417,7 @@ since the last commit or what tests are currently failing.")
         "--ignore=tests/test_venv.py"
         "--ignore=tests/test_plugins.py"
         "--ignore=tests/test_debug.py"
+         "--ignore=tests/test_core.py"
         ;; XXX: Unclear why these fail.
         "--ignore=tests/test_python.py"
         "--deselect=tests/test_concurrency.py\
@@ -2444,7 +2446,12 @@ since the last commit or what tests are currently failing.")
         #$@(if (equal? (%current-system) "riscv64-linux")
                '("--deselect=tests/test_numbits.py::NumbitsOpTest::test_union"
                  "--deselect=tests/test_numbits.py::NumbitsOpTest::test_any_intersection")
-                '()))
+                '())
+         ;; Fails some "'p1c' not in 'Name" assertions (see:
+         ;; <https://github.com/nedbat/coveragepy/issues/2050#issuecomment-3489704251>).
+         "--ignore=tests/test_api.py"
+         ;; This tests fails due to missing file tests/actual/testing/getty.
+         "-k" "not test_good_needs_scrubs")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-pyproject
@@ -72,7 +72,7 @@
 (define-public cuirass
  (package
    (name "cuirass")
-    (version "1.3.2")
+    (version "1.3.3")
    (source
     (origin
       (method git-fetch)
@@ -82,7 +82,7 @@
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0d6ngj51q3pixi2qakc6asvaigqg0cw1qvbwvpkx285zm9csx1vd"))))
+         "0zq56wdjyxnmhr93358db95cc9i7qkffk98vscjr26pb4ab3ym21"))))
    (build-system gnu-build-system)
    (arguments
     (list #:modules `((guix build utils)
@@ -424,7 +424,7 @@ COCOMO model or user-provided parameters.")
 (define-public cloc
  (package
    (name "cloc")
-    (version "2.02")
+    (version "2.06")
    (source
     (origin
       (method git-fetch)
@@ -433,7 +433,7 @@ COCOMO model or user-provided parameters.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1syh1gppjr3p2m9mq0zm3n47bhaksxcn5bx1nwqc29xn404c2fm9"))))
+        (base32 "02l56ks3p3344nf6lz9s3aym9f0xslkns8q8d8zm1i3whf98iymv"))))
    (build-system gnu-build-system)
    (inputs
     (list bash-minimal
@@ -1057,17 +1057,17 @@ in a project.")
 (define-public universal-ctags
  (package
    (name "universal-ctags")
-    (version "6.1.20250525.0")
+    (version "6.2.1")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/universal-ctags/ctags")
-             (commit (string-append "p" version))))
+             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0nxhmpzkxixb303bsihd5j7n0d29ak2lgnqff920q3dm33y965sy"))
+         "04i9fhhifs82d39z2dskscp7v2885g7isjn9r9zm4wsl6dcnb5n7"))
       (modules '((guix build utils)))
       (snippet
        '(begin
@@ -9,7 +9,7 @@
 ;;; Copyright © 2019-2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020, 2022 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
-;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2021, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
@@ -38,6 +38,8 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages c)
+  #:use-module (gnu packages digest)
+  #:use-module (gnu packages elf)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages m4)
  #:use-module (gnu packages gawk)
@@ -1239,7 +1241,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
              "--build=i686-unknown-linux-gnu"
              "--host=i686-unknown-linux-gnu"
              "--with-sysroot=/"
-              ,(string-append "--prefix=" out))))))))
+              ,(string-append "--prefix=" out))))))
+    (properties '((max-silent-time . 7200)))))

 (define gnu-make-mesboot
  (package
@@ -1837,7 +1840,8 @@ exec " gcc "/bin/" program
                      (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH"))
                      (format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n" (getenv "CPLUS_INCLUDE_PATH"))
                      (format (current-error-port) "LIBRARY_PATH=~a\n"
-                              (getenv "LIBRARY_PATH"))))))))))))
+                              (getenv "LIBRARY_PATH"))))))))))
+    (properties '((timeout . 72000)))))    ;20 hours

 (define gcc-mesboot-wrapper
  ;; We need this so gcc-mesboot can be used to create shared binaries that
@@ -2248,40 +2252,40 @@ exec " gcc "/bin/" program
    (source (bootstrap-origin (package-source binutils)))
    (name "binutils-cross-boot0")
    (arguments
-     (append (list #:guile %bootstrap-guile
-                   #:implicit-inputs? #f
+     (ensure-keyword-arguments
+      (substitute-keyword-arguments (package-arguments binutils)
+        ((#:modules modules '((guix build gnu-build-system)
+                              (guix build utils)))
+         (cons '(ice-9 ftw) modules))
+        ((#:configure-flags cf ''())
+         #~(append (list #$(string-append "--target="
+                                          (boot-triplet))
+                         "--disable-gprofng") ;requires Bison
+                   #$cf))
+        ((#:phases phases '%standard-phases)
+         #~(modify-phases #$phases
+             (add-after 'install 'add-symlinks
+               (lambda* (#:key outputs #:allow-other-keys)
+                 ;; The cross-gcc invokes 'as', 'ld', etc, without the
+                 ;; triplet prefix, so add symlinks.
+                 (let ((out (assoc-ref outputs "out"))
+                       (triplet-prefix (string-append #$(boot-triplet)
+                                                      "-")))
+                   (define (has-triplet-prefix? name)
+                     (string-prefix? triplet-prefix name))
+                   (define (remove-triplet-prefix name)
+                     (substring name
+                                (string-length triplet-prefix)))

-                   #:modules '((guix build gnu-build-system)
-                               (guix build utils)
-                               (ice-9 ftw)) ; for 'scandir'
-                   #:phases
-                   #~(modify-phases %standard-phases
-                       (add-after 'install 'add-symlinks
-                         (lambda* (#:key outputs #:allow-other-keys)
-                           ;; The cross-gcc invokes 'as', 'ld', etc, without the
-                           ;; triplet prefix, so add symlinks.
-                           (let ((out (assoc-ref outputs "out"))
-                                 (triplet-prefix (string-append #$(boot-triplet)
-                                                                "-")))
-                             (define (has-triplet-prefix? name)
-                               (string-prefix? triplet-prefix name))
-                             (define (remove-triplet-prefix name)
-                               (substring name
-                                          (string-length triplet-prefix)))
-
-                             (with-directory-excursion (string-append out "/bin")
-                               (for-each (lambda (name)
-                                           (symlink name
-                                                    (remove-triplet-prefix name)))
-                                         (scandir "."
-                                                  has-triplet-prefix?))))))))
-             (substitute-keyword-arguments (package-arguments binutils)
-               ((#:configure-flags cf)
-                #~(append (list #$(string-append "--target="
-                                                 (boot-triplet))
-                                "--disable-gprofng") ;requires Bison
-                          #$cf)))))
-    (native-inputs '())                           ;no Bison
+                   (with-directory-excursion (string-append out "/bin")
+                     (for-each (lambda (name)
+                                 (symlink name
+                                          (remove-triplet-prefix name)))
+                               (scandir "."
+                                        has-triplet-prefix?)))))))))
+      (list #:guile %bootstrap-guile
+            #:implicit-inputs? #f)))
+    (native-inputs '())                 ;no Bison
    (inputs (%boot0-inputs))))

 (define libstdc++-boot0
@@ -3241,7 +3245,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                                            "libstdc++")
                                          ,@(if (target-powerpc? (%current-system))
                                                (list static-bash-for-glibc)
-                                                '())))
+                                                '())
+                                          ,(gexp-input zstd-final "lib")))
             (substitute-keyword-arguments (package-arguments binutils)
               ((#:configure-flags flags #~'())
                ;; For gprofng, tell the build system where to look for libstdc++.
@@ -3251,13 +3256,58 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                                                  "libstdc++")
                                               "/lib")))))))
    (native-inputs (list bison-boot0
+                         pkg-config-final ;to detect zstd
                         libstdc++))              ;for gprofng
    (inputs
-     (match (%current-system)
-       ((? target-powerpc?)
-        `(("bash" ,static-bash-for-glibc)
-          ,@(%boot2-inputs)))
-       (_ (%boot2-inputs))))))
+     (modify-inputs (match (%current-system)
+                      ((? target-powerpc?)
+                       `(("bash" ,static-bash-for-glibc)
+                         ,@(%boot2-inputs)))
+                      (_ (%boot2-inputs)))
+       (append `(,zstd-final "lib"))))))
+
+(define dwz-final
+  (package
+    (inherit dwz)
+    (source (bootstrap-origin (package-source dwz)))
+    (arguments
+     (ensure-keyword-arguments
+      (package-arguments dwz)
+      (list #:guile %bootstrap-guile
+            #:implicit-inputs? #f
+            #:tests? #f
+            #:allowed-references (list "out" glibc-final
+                                       elfutils-final
+                                       (gexp-input gcc-final "lib")
+                                       xxhash-final
+                                       xz-final
+                                       zlib-final))))
+    (native-inputs (list pkg-config-final)) ;without test inputs
+    (inputs (modify-inputs (%boot6-inputs)
+              (append elfutils-final
+                      xxhash-final)))))
+
+(define elfutils-final
+  (package
+    (inherit elfutils)
+    (source (bootstrap-origin (package-source elfutils)))
+    (arguments
+     (ensure-keyword-arguments
+      (package-arguments elfutils)
+      (list #:guile %bootstrap-guile
+            #:implicit-inputs? #f
+            ;; There is no bunzip2 in the Hurd bootstrap binaries.
+            #:tests? (not (target-hurd?))
+            #:allowed-references (list "out" "bin"
+                                       bash-final
+                                       (gexp-input gcc-final "lib")
+                                       glibc-final
+                                       xz-final
+                                       zlib-final))))
+    (native-inputs (list m4-boot0))
+    (inputs (modify-inputs (%boot6-inputs)
+              (append xz-final
+                      zlib-final)))))

 (define zlib-final
  ;; Zlib used by GCC-FINAL.
@@ -3271,6 +3321,32 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
       ,@(package-arguments zlib)))
    (inputs (%boot2-inputs))))

+(define zstd-final
+  ;; Zstd used by BINUTILS-FINAL.
+  (package
+    (inherit zstd)
+    (source (bootstrap-origin (package-source zstd)))
+    (arguments
+     (substitute-keyword-arguments
+         (ensure-keyword-arguments
+          (package-arguments zstd)
+          (list #:guile %bootstrap-guile
+                #:implicit-inputs? #f
+                #:allowed-references (list "out" "lib" glibc-final)))
+       ((#:phases phases '%standard-phases)
+        #~(modify-phases #$phases
+            ;; Avoid retaining references to bash & grep in the zstdless
+            ;; script.
+            (delete 'patch-command-file-names)
+            (add-after 'install 'unpatch-bash-shebangs
+              (lambda _
+                (with-directory-excursion (string-append #$output "/bin")
+                  (substitute* '("zstdgrep" "zstdless")
+                    (("#!/gnu/store/.*/bin/sh")
+                     "#!/bin/sh")))))
+            (delete 'patch-shebangs)))))
+    (inputs (%boot2-inputs))))
+
 (define/system-dependent ld-wrapper-boot3
  ;; A linker wrapper that uses the bootstrap Guile.
  (make-ld-wrapper "ld-wrapper-boot3"
@@ -3485,24 +3561,26 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
 (define %boot5-inputs %boot4-inputs)
 (define with-boot5 with-boot4)

+(define pkg-config-final
+  (package
+    (inherit %pkg-config)               ;the native pkg-config
+    (arguments
+     (ensure-keyword-arguments
+      (package-arguments %pkg-config)
+      (list #:implicit-inputs? #f
+            #:guile %bootstrap-guile)))
+    (inputs (%boot2-inputs))))
+
 (define (make-gnu-make-final)
  "Compute the final GNU Make, which uses the final Guile."
-  (let ((pkg-config (package
-                      (inherit %pkg-config)       ;the native pkg-config
-                      (inputs `(("guile" ,guile-final)
-                                ,@(%boot5-inputs)))
-                      (arguments
-                       `(#:implicit-inputs? #f
-                         ,@(package-arguments %pkg-config))))))
-    (package
-      (inherit (package-with-bootstrap-guile gnu-make))
-      (inputs `(("guile" ,guile-final)
-                ,@(%boot5-inputs)))
-      (native-inputs `(("pkg-config" ,pkg-config)))
-      (arguments
-       `(#:implicit-inputs? #f
-         ,@(package-arguments gnu-make))))))
-
+  (package
+    (inherit (package-with-bootstrap-guile gnu-make))
+    (inputs `(("guile" ,guile-final)
+              ,@(%boot5-inputs)))
+    (native-inputs `(("pkg-config" ,pkg-config-final)))
+    (arguments
+     `(#:implicit-inputs? #f
+       ,@(package-arguments gnu-make)))))

 (define coreutils-final
  ;; The final Coreutils.  Treat them specially because some packages, such as
@@ -3549,6 +3627,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
  (let ((sed (with-boot6 (package-with-bootstrap-guile sed))))
    (package/inherit sed (native-inputs `(("perl" ,perl-boot0))))))

+(define xxhash-final
+  ((compose with-boot6 package-with-bootstrap-guile) xxhash))
+
 (define-public %final-inputs
  ;; The 'glibc-final' package is not the same depending on what system is
  ;; targeted, so this whole list must be parameterized.
@@ -3574,19 +3655,20 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                              (native-inputs
                               (list (if (target-hurd?)
                                         glibc-utf8-locales-final/hurd
-                                         glibc-utf8-locales-final)))))
-                   ("zstd" ,zstd)))
+                                         glibc-utf8-locales-final)))))))
          ("sed" ,sed-final)
          ("grep" ,grep-final)
          ("xz" ,xz-final)
          ("coreutils" ,coreutils-final)
+          ("dwz" ,dwz-final)
          ("make" ,(make-gnu-make-final))
          ("bash" ,bash-final)
          ("ld-wrapper" ,ld-wrapper)
          ("binutils" ,binutils-final)
          ("gcc" ,gcc-final)
          ("libc" ,glibc-final)
-          ("libc:static" ,glibc-final "static"))))))
+          ("libc:static" ,glibc-final "static")
+          ("zstd" ,zstd-final))))))

 (define-public canonical-package
  (let ((name->package (mlambda (system)
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2024 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2024, 2025 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
 ;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il>
@@ -531,7 +531,14 @@ compressed with pbzip2 can be decompressed with bzip2).")
     (list
      #:configure-flags
      '(list "-DSHRINKWRAP_PREFER_STATIC=OFF"
-             "-DBUILD_TESTS=ON")))
+             "-DBUILD_TESTS=ON")
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'add-missing-header
+           (lambda _
+             (substitute* "include/shrinkwrap/xz.hpp"
+               (("#include <cstring>")
+                "#include <cstring>\n#include <cstdint>")))))))
    (propagated-inputs (list bzip2 xz zlib `(,zstd "lib")))
    (native-inputs (list pkg-config))
    (home-page "https://github.com/jonathonl/shrinkwrap")
@@ -544,7 +551,7 @@ formats, including zstd, xz, gzip, and bgzf.")
 (define-public xz
  (package
   (name "xz")
-   (version "5.4.5")
+   (version "5.8.1")
   (source (origin
            (method url-fetch)
            (uri (list (string-append "http://tukaani.org/xz/xz-" version
@@ -553,7 +560,7 @@ formats, including zstd, xz, gzip, and bgzf.")
                                      version ".tar.gz")))
            (sha256
             (base32
-              "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k"))))
+              "0hsmg58a27jd1vq0lc6yp405978c1nfhqwndl7f10v1mk6sjay2h"))))
   (build-system gnu-build-system)
   (arguments
    `(#:phases
@@ -1769,14 +1776,14 @@ or junctions, and always follows hard links.")
 (define-public zstd
  (package
    (name "zstd")
-    (version "1.5.6")
+    (version "1.5.7")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/facebook/zstd/releases/download/"
                           "v" version "/zstd-" version ".tar.gz"))
       (sha256
-        (base32 "1h83si7s70jy7mcy0mv1c9mbkz66qqpawxs0zkmc3b1ayinf0acc"))))
+	(base32 "18vgkvh7w6zw4jn2aj1mp0yv98m4fk52ay6da0wh4pm194gyaczb"))))
    (build-system gnu-build-system)
    (outputs '("out"                    ;1.5MiB executables and documentation
               "lib"                    ;1.2MiB shared library and headers
@@ -1843,6 +1850,10 @@ or junctions, and always follows hard links.")
                            ;; This isn't picked up correctly in the Makefiles.
                            "EXT=.exe")
                          '())
+                   #$@(if (target-hurd?)
+                          ;; Uses symbols from pthread.
+                          `("PCMTLIB=-pthread")
+                          '())
                   ;; Auto-detection is over-engineered and buggy.
                   "PCLIBDIR=lib"
                   "PCINCDIR=include"
@@ -1870,22 +1881,8 @@ speed.")
                   license:public-domain ; zlibWrapper/examples/fitblk*
                   license:zlib))))      ; zlibWrapper/{gz*.c,gzguts.h}

-(define-public zstd-1.5.7
-  (package
-    (inherit zstd)
-    ;; Don't hide this package from the UI.
-    (properties '())
-    (version "1.5.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/facebook/zstd/releases/download/"
-                           "v" version "/zstd-" version ".tar.gz"))
-       (sha256
-        (base32 "18vgkvh7w6zw4jn2aj1mp0yv98m4fk52ay6da0wh4pm194gyaczb"))))))
-
 (define-public pzstd
-  (package/inherit zstd-1.5.7
+  (package/inherit zstd
    (name "pzstd")
    (outputs '("out"))
    (inputs
@@ -169,7 +169,7 @@ runtime (like runc or crun) for a single container.")
 (define-public distrobox
  (package
    (name "distrobox")
-    (version "1.8.1.2")
+    (version "1.8.2.1")
    (source
     (origin
       (method git-fetch)
@@ -177,7 +177,7 @@ runtime (like runc or crun) for a single container.")
             (url "https://github.com/89luca89/distrobox")
             (commit version)))
       (sha256
-        (base32 "168hjzifdvmlr4rplgp2jh4sg1dwjfmbrwj8589zys8r4kqvwfy1"))
+        (base32 "1la9qkhmj9277r6b2vfadb3fnvrwa435x6la5bwvm8ch0js2dfx0"))
       (file-name (git-file-name name version))))
    (build-system copy-build-system)
    (arguments
@@ -395,54 +395,46 @@ Layer-4 sockets.")
  (package
    (name "cni-plugins")
    (version "1.8.0")
-    ;; TODO: Unvendor.
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://github.com/containernetworking/plugins")
-             (commit (string-append "v" version))))
+              (url "https://github.com/containernetworking/plugins")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
       (sha256
        (base32 "0bwczkf4kbrx47sa6mnp5kyn65dbg52qnlfyjyydrwshal8rz3gw"))
-       (file-name (git-file-name name version))))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (delete-file-recursively "vendor")))))
    (build-system go-build-system)
    (arguments
-     `(#:unpack-path "github.com/containernetworking/plugins"
-       #:tests? #f ; XXX: see stat /var/run below
-       #:phases (modify-phases %standard-phases
-                  (replace 'build
-                    (lambda _
-                      (with-directory-excursion
-                          "src/github.com/containernetworking/plugins"
-                        (invoke "./build_linux.sh"))))
-                  (replace 'check
-                    (lambda* (#:key tests? #:allow-other-keys)
-                      ;; Only pkg/ns tests run without root.
-                      (when tests?
-                        (with-directory-excursion
-                            "src/github.com/containernetworking/plugins/pkg/ns"
-                          (invoke "stat" "/var/run") ; XXX: test tries to stat this directory
-                          (invoke "unshare" "-rmn" "go" "test")))))
-                  (add-before 'check 'set-test-environment
-                    (lambda _
-                      (setenv "XDG_RUNTIME_DIR" "/tmp/cni-rootless")))
-                  (replace 'install
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (copy-recursively
-                       "src/github.com/containernetworking/plugins/bin"
-                       (string-append (assoc-ref outputs "out") "/bin")))))))
-    ;; XXX: Prepare for unvendor.
+     (list
+      #:install-source? #f
+      #:tests? #f ; TODO: Figure out how to run tests.
+      #:import-path "github.com/containernetworking/plugins"
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                ;; XXX: Migrate to go-build-system logic.
+                (invoke "./build_linux.sh"))))
+          (replace 'install
+            (lambda* (#:key import-path #:allow-other-keys)
+              (copy-recursively (string-append "src/"import-path "/bin")
+                                (string-append #$output "/bin")))))))
    (native-inputs
-     (list ;; go-github-com-alexflint-go-filemutex
-           ;; go-github-com-buger-jsonparser
-           ;; go-github-com-containernetworking-cni
-           ;; go-github-com-coreos-go-iptables
+     (list go-github-com-alexflint-go-filemutex
+           go-github-com-buger-jsonparser
+           go-github-com-containernetworking-cni
+           go-github-com-coreos-go-iptables
           go-github-com-coreos-go-systemd-v22
           go-github-com-godbus-dbus-v5
           go-github-com-insomniacslk-dhcp
-           ;; o-github-com-mattn-go-shellwords
+           go-github-com-mattn-go-shellwords
           ;; go-github-com-microsoft-hcsshim
-           ;; go-github-com-networkplumbing-go-nft
+           go-github-com-networkplumbing-go-nft
           go-github-com-onsi-ginkgo-v2
           go-github-com-onsi-gomega
           go-github-com-opencontainers-selinux
@@ -451,7 +443,7 @@ Layer-4 sockets.")
           go-github-com-vishvananda-netlink
           go-github-com-vishvananda-netns
           go-golang-org-x-sys
-           ;; go-sigs-k8s-io-knftables
+           go-sigs-k8s-io-knftables
           util-linux))
    (home-page "https://github.com/containernetworking/plugins")
    (synopsis "Container Network Interface (CNI) network plugins")
@@ -49,6 +49,7 @@
 ;;; Copyright © 2025 Romain Garbage <romain.garbage@inria.fr>
 ;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -587,7 +588,7 @@ operating system functions.")
 (define-public lunasvg
  (package
    (name "lunasvg")
-    (version "3.2.1")
+    (version "3.5.0")
    (source
     (origin
       (method git-fetch)
@@ -596,11 +597,11 @@ operating system functions.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "14ppk3k6sdbf3lwhv2gjqy32vwa7ck9jcj9xfk0fxwfqbvbp6608"))))
+        (base32 "1scmm1q35j3r87117p401fg3c1bx2nkiyvc2f3svvr2m2y9ihabr"))))
    (build-system cmake-build-system)
    (inputs (list plutovg))
    (arguments
-     '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
+     '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON -DUSE_SYSTEM_PLUTOVG=ON")
       #:tests? #f)) ;No tests.
    (home-page "https://github.com/sammycage/lunasvg")
    (synopsis "SVG rendering and manipulation library in C++")
@@ -1491,7 +1492,7 @@ tools (containers, algorithms) used by other QuantStack packages.")
 (define-public ccls
  (package
    (name "ccls")
-    (version "0.20241108")
+    (version "0.20250815")
    (source
     (origin
       (method git-fetch)
@@ -1499,7 +1500,7 @@ tools (containers, algorithms) used by other QuantStack packages.")
             (url "https://github.com/MaskRay/ccls")
             (commit version)))
       (sha256
-        (base32 "0474ldkkw1m46lkasdk8mn6z3q51vs4g1fbwml0sd70wgdb7h5nj"))
+        (base32 "1qpshqj08rc2ws5capyv8kl9rndh3sp2bbzambnx2l9b98pnkvj7"))
       (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -4765,6 +4766,58 @@ written in C99.")
    (home-page "https://github.com/aklomp/base64")
    (license license:bsd-2)))

+(define-public unordered-dense
+  (package
+    (name "unordered-dense")
+    (version "4.8.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/martinus/unordered_dense")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02a86p2abrjkjw6kxd2gcxhknn50mcb1shrch8fhg72n534yblr5"))))
+    ;; This library uses CMake as build system to distribute the package, but
+    ;; uses Meson to build and launch tests. Hence, the phase 'check is replaced
+    ;; to mimic what is defined for meson-build-system.
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (substitute* "../source/test/app/doctest.h"
+                  (("#include <doctest\\.h>")
+                   "#include <doctest/doctest.h>"))
+                (setenv "FUZZ_CORPUS_BASE_DIR"
+                        (string-append (getcwd) "/../source/data/fuzz/"))
+                (invoke "meson" "setup" "../source/")
+                (invoke "ninja" "--verbose" "-j"
+                        (number->string (parallel-job-count)))
+                (setenv "MESON_TESTTHREADS"
+                        (number->string (parallel-job-count)))
+                (invoke "meson" "test")))))))
+    (native-inputs (list meson pkg-config))
+    (inputs (list doctest fmt boost))
+    (home-page "https://github.com/martinus/unordered_dense")
+    (synopsis "C++17 fast and densely stored hashmap and hashset library")
+    (description
+     "A fast & densely stored hashmap and hashset based on robin-hood backward
+shift deletion for C++17 and later.
+
+The classes @code{ankerl::unordered_dense::map} and
+@code{ankerl::unordered_dense::set} are (almost) drop-in replacements of
+@code{std::unordered_map} and @code{std::unordered_set.} While they don't have
+as strong iterator / reference stability guarantees, they are typically much
+faster.  Additionally, there are @code{ankerl::unordered_dense::segmented_map}
+and @code{ankerl::unordered_dense::segmented_set} with lower peak memory usage,
+and stable references (iterators are NOT stable) on insert.")
+    (license license:expat)))
+
 (define-public zpp-serializer
  (package
    (name "zpp-serializer")
@@ -41,6 +41,7 @@
 ;;; Copyright © 2024 Marco Baggio <guix@mawumag.com>
 ;;; Copyright © 2024, 2025 Spencer King <spencer.king@wustl.edu>
 ;;; Copyright © 2024-2025 Tor-björn Claesson <tclaesson@gmail.com>
+;;; Copyright © 2025 Jonas Freimuth <jonas.freimuth@posteo.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -78,6 +79,7 @@
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages databases)
+  #:use-module (gnu packages duckdb)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages fribidi)
  #:use-module (gnu packages gawk)
@@ -1822,7 +1824,7 @@ code for possible problems.")
 (define-public r-colorout
  (package
    (name "r-colorout")
-    (version "1.2-2")
+    (version "1.3-3")
    (source
     (origin
       (method git-fetch)
@@ -1831,7 +1833,7 @@ code for possible problems.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1rsx69wjpa73c6x2hacvvvbzdzxn7wg06gizf97kasjdlb7azmp3"))))
+        (base32 "101mkdfk8w520vxqb5cl3spi8brgs5nrc6ciqidpxydmynp879fm"))))
    (build-system r-build-system)
    (arguments
     (list
@@ -12800,6 +12802,18 @@ weights.")
     (list
      #:phases
      '(modify-phases %standard-phases
+         ;; write_file_attachments copies files from the store but does not
+         ;; check their permissions. The files end up with read-only
+         ;; permissions.  As a result, they cannot be overwritten in
+         ;; subsequent passes.  This is especially problematic in downstream
+         ;; packages like r-bslib.
+         (add-after 'unpack 'fix-file-permissions
+           (lambda _
+             (substitute* "R/layers.R"
+               (("recursive = TRUE")
+                "recursive = TRUE, copy.mode = FALSE")
+               (("fs::file_copy\\(src, dest, overwrite = TRUE\\)")
+                "file.copy(src, dest, overwrite = TRUE, copy.mode = FALSE)"))))
         ;; One test fails when the current locale is the C locale.
         (add-before 'check 'set-test-locale
           (lambda _ (setenv "LC_ALL" "en_US.UTF-8"))))))
@@ -12895,12 +12909,11 @@ Markdown documents.  More generally, icons can be inserted in any
                     "inst/lib/bs5/dist/js/bootstrap.bundle.min.js")))))
    (properties
     `((upstream-name . "bslib")
-       (updater-ignored-native-inputs . ("r-rmarkdown" "r-shiny"))))
+       (updater-ignored-native-inputs . ("r-rmarkdown" "r-shiny"))
+       (updater-extra-native-inputs . ("r-testthat" "r-yaml"))))
    (build-system r-build-system)
    (arguments
     (list
-      ;; Some tests require shiny, leading to a dependency cycle.
-      #:tests? #false
      #:modules '((guix build r-build-system)
                  (guix build minify-build-system)
                  (guix build utils)
@@ -12909,6 +12922,19 @@ Markdown documents.  More generally, icons can be inserted in any
                           (guix build minify-build-system))
      #:phases
      #~(modify-phases (@ (guix build r-build-system) %standard-phases)
+          ;; When using themes, bslib copies theme dependencies, such as
+          ;; bootstrap.bundle.min.js or selectize.min.js, into a temporary
+          ;; directory.  Since these files are copied from the read-only
+          ;; store, they end up with read-only permissions.  As a result,
+          ;; bslib cannot overwrite these files as needed, because it has no
+          ;; permission to write to the files.
+          (add-after 'unpack 'fix-file-permissions
+            (lambda _
+              (substitute* "R/bs-dependencies.R"
+                (("overwrite = TRUE")
+                 (string-append "overwrite = TRUE, copy.mode = FALSE"))
+                (("file.copy\\(precompiled_css, out_file\\)")
+                 "file.copy(precompiled_css, out_file, copy.mode = FALSE)"))))
          (add-after 'unpack 'process-javascript
            (lambda* (#:key inputs #:allow-other-keys)
              (with-directory-excursion "inst/"
@@ -12926,7 +12952,37 @@ Markdown documents.  More generally, icons can be inserted in any
                            (,(assoc-ref inputs "js-bootstrap4-bundle")
                             . "lib/bs4/dist/js/bootstrap.bundle.min.js")
                            (,(assoc-ref inputs "js-bootstrap5-bundle")
-                             . "lib/bs5/dist/js/bootstrap.bundle.min.js")))))))))
+                             . "lib/bs5/dist/js/bootstrap.bundle.min.js"))))))
+          ;; Some tests require shiny, leading to a dependency cycle.
+          (add-after 'unpack 'disable-bad-tests
+            (lambda _
+              (with-directory-excursion "tests/testthat/"
+                (substitute* "test-layout.R"
+                  ((".*layout_columns\\(\\) with col_widths.*" m)
+                   (string-append m "skip('skip');\n")))
+                (substitute* "test-navs-legacy.R"
+                  ((".*navset_bar\\(\\) warns if using deprecated args.*" m)
+                   (string-append m "skip('skip');\n"))
+                  ((".*navset_bar\\(\\) warns if `navbar_options\\(\\)` collide with direct deprecated options.*" m)
+                   (string-append m "skip('skip');\n"))
+                  ((".*shiny:navbarPage\\(\\) is unaffected.*" m)
+                   (string-append m "skip('skip');\n"))
+                  ((".*navbar markup snapshots.*" m)
+                   (string-append m "skip('skip');\n")))
+                (substitute* "test-page.R"
+                  ((".*page_sidebar\\(\\).*" m)
+                   (string-append m "skip('skip');\n"))
+                  ((".*save_html\\(\\) works on components and pages with a custom theme.*" m)
+                   (string-append m "skip('skip');\n"))
+                  ((".*functions can handle trailing commas.*" m)
+                   (string-append m "skip('skip');\n")))
+                (substitute* "test-sidebar.R"
+                  ((".*sidebar\\(\\) - assigns a random `id` if collapsible and `id` not provided.*" m)
+                   (string-append m "skip('skip');\n"))
+                  ((".*sidebar\\(\\) - sets `aria-expanded` correctly on collapse toggle.*" m)
+                   (string-append m "skip('skip');\n"))
+                  ((".*sidebar\\(\\) - warns if `max_height_mobile` used with `open != 'always'.*" m)
+                   (string-append m "skip('skip');\n")))))))))
    (propagated-inputs
     (list r-base64enc
           r-cachem
@@ -12954,7 +13010,9 @@ Markdown documents.  More generally, icons can be inserted in any
           (uri "https://raw.githubusercontent.com/twbs/bootstrap/v5.3.1/dist/js/bootstrap.bundle.js")
           (sha256
            (base32
-             "1bp0a2fin80hwxvd260r1jk57snsgz74vahid64yb2sgj0rlmj8a"))))))
+             "1bp0a2fin80hwxvd260r1jk57snsgz74vahid64yb2sgj0rlmj8a"))))
+       ("r-testthat" ,r-testthat)
+       ("r-yaml" ,r-yaml)))
    (home-page "https://rstudio.github.io/bslib/")
    (synopsis "Custom Bootstrap Sass themes for shiny and rmarkdown")
    (description
@@ -19673,6 +19731,22 @@ normalizations, minimum variance matching, and so on.")
         "1xvcd97ikqsfdpk2fddy3k0z1ajqga7nv9bgac9c1wnjk1gqrpgh"))))
    (properties `((upstream-name . "SDMTools")))
    (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'patch-constants
+           (lambda _
+             ;; Older versions of R used to define PI.  As of R 4.5.0 the
+             ;; definition from the default math headers is supposed to be
+             ;; used instead.
+             (substitute* "src/pointinpolygon.c"
+               (("double TWOPI = " m)
+                (string-append "#define PI M_PI\n" m)))
+             (with-fluids ((%default-port-encoding "ISO-8859-1"))
+               (substitute* "src/vincenty.geodesics.c"
+                 (("#include <math.h>" m)
+                  (string-append m "\n#define PI M_PI")))))))))
    (propagated-inputs (list r-r-utils))
    (home-page "https://www.rforge.net/SDMTools/")
    (synopsis "Species distribution modelling tools")
@@ -22090,18 +22164,18 @@ posterior predictive checking, and quantifying uncertainty.")
 (define-public r-import
  (package
    (name "r-import")
-    (version "1.3.2")
+    (version "1.3.4")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "import" version))
       (sha256
        (base32
-         "0ngakg8jqn76c05hrglp4hmmwvm5a9ldc9s1i83a9rc8lni6nb1j"))))
+         "0i87mlhjig7hzk8fgk3yij1shfwbwa4r05jagibqlv7rabls260g"))))
    (build-system r-build-system)
    (native-inputs
     (list r-knitr r-rmarkdown r-testthat))
-    (home-page "https://github.com/smbache/import")
+    (home-page "https://rticulate.github.io/import/")
    (synopsis "Import mechanism for R")
    (description
     "This is an alternative mechanism for importing objects from packages.
@@ -29747,14 +29821,14 @@ package provides a minimal R interface by relying on the Rcpp package.")
 (define-public r-rcppparallel
  (package
    (name "r-rcppparallel")
-    (version "5.1.10")
+    (version "5.1.11-1")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "RcppParallel" version))
       (sha256
        (base32
-         "0kgkjbiprfw90rdwq352z4jbnwb98s3dsv2xyzkzi413rq2709gb"))
+         "0qk3gaia5g1da5yqd9a3jcwp1f4jldj1a4r9cqpxbjqjh9a87371"))
       (modules '((guix build utils)))
       (snippet
        '(delete-file-recursively "src/tbb/"))))
@@ -38103,7 +38177,7 @@ provided.")
     `((upstream-name . "XML")))
    (build-system r-build-system)
    (inputs
-     (list libxml2 zlib))
+     (list libxml2-with-zlib zlib))
    (native-inputs
     (list pkg-config))
    (home-page "https://www.omegahat.net/RSXML")
@@ -41891,53 +41965,6 @@ floating point chromosomes.")
 forest) is fit on the kernel matrix of a subset of the training data.")
    (license license:gpl2+)))

-(define-public r-duckdb
-  (package
-    (name "r-duckdb")
-    (version "1.2.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (cran-uri "duckdb" version))
-       (sha256
-        (base32 "161zxianyssvsrd2345v4bi1m2z7wj614z8343jb73vhlk6s9yyi"))
-       ;; 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.
-       #;
-       (snippet
-        '(delete-file "src/duckdb.tar.xz"))))
-    (properties
-     '((upstream-name . "duckdb")
-       (updater-extra-native-inputs . ("tzdata-for-tests"))
-       ;; We don't seem to need this and I don't want to package it now.
-       (updater-ignored-native-inputs . ("r-dblog"))))
-    (build-system r-build-system)
-    (arguments (list #:tests? #false)) ;tests can time out on the build farm
-    (propagated-inputs (list r-dbi))
-    (native-inputs (list r-adbcdrivermanager
-                         r-arrow
-                         r-bit64
-                         r-callr
-                         r-clock
-                         r-dbitest
-                         r-dbplyr
-                         r-dplyr
-                         r-remotes
-                         r-rlang
-                         r-testthat
-                         r-tibble
-                         r-vctrs
-                         r-withr
-                         tzdata-for-tests))
-    (home-page "https://r.duckdb.org/")
-    (synopsis "DBI package for the DuckDB database management system")
-    (description
-     "The DuckDB project is an embedded analytical data management system with
-support for the Structured Query Language (SQL).  This package includes all of
-DuckDB and an R Database Interface (DBI) connector.")
-    (license license:expat)))
-
 (define-public r-dummies
  (package
    (name "r-dummies")
@@ -47795,40 +47822,6 @@ user-level code from spatstat which performs geometrical operations, except
 for the geometry of linear networks.")
    (license license:gpl2+)))

-(define-public r-spatstat-core
-  (package
-    (name "r-spatstat-core")
-    (version "2.4-4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (cran-uri "spatstat.core" version))
-       (sha256
-        (base32
-         "0fyi8y1z919nzn47kaviln7gflhcp5qdi3gfvf7nwkdix3pkk373"))))
-    (properties `((upstream-name . "spatstat.core")))
-    (build-system r-build-system)
-    (propagated-inputs
-     (list r-abind
-           r-goftest
-           r-matrix
-           r-mgcv
-           r-nlme
-           r-rpart
-           r-spatstat-data
-           r-spatstat-geom
-           r-spatstat-random
-           r-spatstat-sparse
-           r-spatstat-utils
-           r-tensor))
-    (native-inputs (list r-spatstat-model))
-    (home-page "https://spatstat.org/")
-    (synopsis "Core functionality of the spatstat package")
-    (description
-     "This is a subset of the original spatstat package, containing all of the
-user-level code from spatstat, except for the code for linear networks.")
-    (license license:gpl2+)))
-
 (define-public r-spatstat-linnet
  (package
    (name "r-spatstat-linnet")
@@ -433,7 +433,7 @@ sugar and output formatting inspired from @code{httpie}.")
 (define-public trurl
  (package
    (name "trurl")
-    (version "0.9")
+    (version "0.16.1")
    (source
     (origin
       (method git-fetch)
@@ -442,7 +442,7 @@ sugar and output formatting inspired from @code{httpie}.")
             (commit (string-append name "-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "10gsl0fdpybfcffmgf3qww7cpw3ifczl601042a2mqmwwrlx5zj7"))))
+        (base32 "1zdq81smm9ddqcmvwpcm01nf812fr8p4g6i2raxv3s0rd3hi68sl"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -452,7 +452,7 @@ sugar and output formatting inspired from @code{httpie}.")
      #:phases
      #~(modify-phases %standard-phases
          (delete 'configure))))
-    (native-inputs (list python))
+    (native-inputs (list python-minimal perl))
    (inputs (list curl))
    (home-page "https://curl.se/trurl/")
    (synopsis "Command line tool for URL parsing and manipulation")
@@ -206,39 +206,6 @@
  #:use-module (srfi srfi-26)
  #:use-module (ice-9 match))

-(define-public duckdb
-  (package
-    (name "duckdb")
-    (version "1.3.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/duckdb/duckdb")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1dg3g66az17z4snxxw7cslqdkrvbx2nnyry73yi77yp0vpri1lz8"))))
-    (arguments
-     (list
-      #:tests? #f
-      #:configure-flags
-      #~(list "-DBUILD_EXTENSIONS=autocomplete;icu;json;parquet;tpch;"
-              ;; There is no git checkout from which to read the version tag.
-              (string-append "-DOVERRIDE_GIT_DESCRIBE="
-                             "v" #$version "-0-g0123456789"))))
-    (build-system cmake-build-system)
-    (home-page "https://duckdb.org")
-    (synopsis "In-process SQL OLAP database management system")
-    (description "CLI and C/C++ source libraries for DuckDB, a relational
-(table-oriented) @acronym{DBMS, Database Management System} that supports
-@acronym{SQL, Structured Query Language}, contains a columnar-vectorized query
-execution engine, and provides transactional @acronym{ACID, Atomicity
-Consistency Isolation and Durability} guarantees via bulk-optimized
-@acronym{MVCC, Multi-Version Concurrency Control}.  Data can be stored in
-persistent, single-file databases with support for secondary indexes.")
-    (license license:expat)))
-
 (define-public ephemeralpg
  (package
    (name "ephemeralpg")
@@ -3743,25 +3710,6 @@ streamlined for its use in the context of tortoise-orm.  It removes support
 for many database kinds that tortoise-orm doesn't need, for example.")
    (license license:asl2.0)))

-(define-public python-sphinxcontrib-asyncio
-  (package
-    (name "python-sphinxcontrib-asyncio")
-    (version "0.3.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "sphinxcontrib-asyncio" version))
-        (sha256
-          (base32 "0bkj010ygsr7m769llf2aq4bbjfhdwqrrabi98j8gpvyzvh2dzcr"))))
-    (build-system python-build-system)
-    (arguments '(#:tests? #f))          ;no test suite
-    (propagated-inputs (list python-sphinx))
-    (home-page "https://github.com/aio-libs/sphinxcontrib-asyncio")
-    (synopsis "Sphinx extension to support coroutines in markup")
-    (description "This package is a Sphinx extension providing additional
-coroutine-specific markup.")
-    (license license:asl2.0)))
-
 (define-public python-asyncpg
  (package
    (name "python-asyncpg")
@@ -5987,7 +5935,7 @@ a Gtk.Grid Widget.")
                   "-DFORCE_INTERNAL_QHEXEDIT=OFF"
                   "-DENABLE_TESTING=ON")))
    (inputs
-     (list qcustomplot
+     (list qcustomplot-qt5
           qhexedit
           qscintilla
           qtbase-5
@@ -148,7 +148,7 @@
                     (("rm (.*) configure") "")
                     (("chmod (.*) config.guess(.*)$") ""))
                   (invoke "sh" "s_config"))))))
-    (native-inputs (list autoconf automake-1.16.5 libtool))
+    (native-inputs (list autoconf-2.69 automake-1.16.5 libtool))
    (synopsis "Berkeley database")
    (description
     "Berkeley DB is an embeddable database allowing developers the choice of
@@ -533,7 +533,7 @@ server and embedded PowerPC, and S390 guests.")
  (package
    (inherit american-fuzzy-lop)
    (name "aflplusplus")
-    (version "4.33c")
+    (version "4.34c")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -542,7 +542,7 @@ server and embedded PowerPC, and S390 guests.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1h4ya82s1wd11c04r0g0wsq56asl1np3nmsf6yk4vyic9nm0hsq0"))))
+                "14pllv986zwzbqarbsif02k618yns4fvqd3br6irzfcwivpysqfa"))))
    (arguments
     (substitute-keyword-arguments (package-arguments american-fuzzy-lop)
       ((#:make-flags _ ''())
@@ -35,14 +35,14 @@
 (define-public dezyne
  (package
    (name "dezyne")
-    (version "2.19.1")
+    (version "2.19.2")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://dezyne.org/download/dezyne/"
                           name "-" version ".tar.gz"))
       (sha256
-        (base32 "17gpzmkafql2d3kj2yx293hgrh3l6zhjk63wcirqr7xsxjhava5n"))))
+        (base32 "142ng6aq7lcp0jk16yajf2bpm03db9q1wbxs5igwnvszy6aqq243"))))
    (inputs (list bash-minimal
                  boost
                  guile-3.0
@@ -14,6 +14,7 @@
 ;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,12 +37,13 @@
  #:use-module (guix gexp)
  #:use-module (guix download)
  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system cmake)
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
@@ -49,8 +51,10 @@
  #:use-module (gnu packages bison)
  #:use-module (gnu packages check)
  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpp)
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
+  #:use-module (gnu packages education)
  #:use-module (gnu packages emacs)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages fribidi)
@@ -59,6 +63,7 @@
  #:use-module (gnu packages groff)
  #:use-module (gnu packages gsasl)
  #:use-module (gnu packages guile)
+  #:use-module (gnu packages hunspell)
  #:use-module (gnu packages icu4c)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages m4)
@@ -66,16 +71,22 @@
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pretty-print)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages qt)
  #:use-module (gnu packages readline)
+  #:use-module (gnu packages search)
  #:use-module (gnu packages speech)
  #:use-module (gnu packages tcl)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages video)
  #:use-module (gnu packages web)
  #:use-module (gnu packages wordnet)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xiph)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg))

 (define-public cmudict
  (package
@@ -825,3 +836,68 @@ Guix package is installed.")
     "This package provides a versioned python wrapper package for The CMU
 Pronouncing Dictionary data files.")
    (license license:gpl3+)))
+
+(define-public goldendict-ng
+  (let ((commit "2cfc27361d061103a164705e7f85dbdf6cd6056f")
+        (revision "0"))
+    (package
+      (name "goldendict-ng")
+      (version (git-version "25.10.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/xiaoyifang/goldendict-ng")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0r3aykiwg1jxam72mn1yrgmndnbf0r6nz5l1brqyqbr4wq3ir0p2"))
+         (modules '((guix build utils)))
+         (snippet #~(for-each delete-file-recursively
+                              (list "thirdparty/eb"
+                                    "thirdparty/fmt"
+                                    "thirdparty/tomlplusplus")))))
+      (build-system qt-build-system)
+      (arguments
+       (list #:qtbase qtbase
+             #:configure-flags
+             #~(list
+                ;; use system fmt and toml++ instead of the bundled ones
+                "-DUSE_SYSTEM_FMT=ON"
+                "-DUSE_SYSTEM_TOML=ON")
+             ;; no tests
+             #:tests? #f))
+      (native-inputs (list pkg-config qttools))
+      (inputs (list `(,zstd "lib")
+                    bzip2
+                    ffmpeg
+                    fmt
+                    hunspell
+                    icu4c
+                    libeb
+                    libvorbis
+                    libx11
+                    libxtst
+                    libzim
+                    lzo
+                    opencc
+                    qt5compat
+                    qtmultimedia
+                    qtsvg
+                    qtwebchannel
+                    qtwebengine
+                    tomlplusplus
+                    xapian
+                    xz
+                    zlib))
+      (synopsis "Advanced dictionary lookup program")
+      (description "GoldenDict-ng is an advanced dictionary lookup program
+that supports many dictionary formats, such as MDX, DSL, StarDict, Zim, etc.,
+as well as special types of \"dictionaries\", such as external program,
+website, audio files.  Among ather features are full text search,
+Anki integration, transliteration for some languages, word stemming and
+spelling correction via Hunspell's morphology analysis, unicode case,
+diacritics, punctuation and whitespace folding.  It is forked from the
+original GoldenDict which was developed at http://goldendict.org/.")
+      (home-page "https://xiaoyifang.github.io/goldendict-ng/")
+      (license license:gpl3+))))
@@ -79,7 +79,7 @@
 (define-public diffoscope
  (package
    (name "diffoscope")
-    (version "307")
+    (version "308")
    (source
     (origin
       (method git-fetch)
@@ -88,7 +88,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0iclf59z01w4g569ksgn607ca61m2lm8znal00akysz76nkbnzxf"))))
+        (base32 "0g4kac0r2plhcl3drpihp2z99yfqlz36xvvfr4v6sn49zj103kny"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -268,7 +268,7 @@ install.")
 (define-public reprotest
  (package
    (name "reprotest")
-    (version "0.7.30")
+    (version "0.7.32")
    (source
     (origin
       (method git-fetch)
@@ -277,7 +277,7 @@ install.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "013mqbbh6dcia2i4qdi4270lcgzr0k879phsaydf9b5ng9fkdajl"))))
+        (base32 "0z67291rv9ii3llv2hwz9ak99818fwkxcqibb5zk8qkamh4y2bww"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -23,6 +23,7 @@
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 ;;; 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>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -720,7 +721,7 @@ struct protoent *getprotobyname(const char *name) {
    p->p_name = \"udp\";
    p->p_proto = 17;
    p->p_aliases[0] = \"UDP\";
-  } else 
+  } else
    p = NULL;
  return p;
 }
@@ -756,7 +757,7 @@ struct servent *getservbyname(const char *name, const char *proto) {
    s->s_name = \"domain\";
    s->s_port = htons(53);
    s->s_proto = buf;
-  } else 
+  } else
    s = NULL;
  return s;
 }
@@ -1079,7 +1080,7 @@ LuaJIT, both a resolver library and a daemon.")
 (define-public hnsd
   (package
     (name "hnsd")
-     (version "1.0.0")
+     (version "2.0.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1087,28 +1088,22 @@ LuaJIT, both a resolver library and a daemon.")
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                 "1kdgff8rf8gmvwz2p758ilbjxpvz4xm6z41pa5353asg6xb853bb"))
+                 "1pqpf9vz1d01873wvkdnmsj9y2qrk8fka4c636qipsjv6ar2ply0"))
               (file-name (git-file-name name version))
               (modules '((guix build utils)))
               (snippet
                '(begin
                   ;; Delete the bundled copy of libuv.
                   (delete-file-recursively "uv")
-                   (substitute* "configure.ac"
-                     (("AC_CONFIG_SUBDIRS\\(\\[uv\\]\\)") ""))
                   (substitute* "Makefile.am"
                     (("SUBDIRS = uv") "\n")
                     (("\\$\\(top_builddir\\)/uv/libuv.la") "-luv")
-
-                     ;; Make sure the 'hnsd' binary is installed and
-                     ;; dynamically-linked.
-                     (("noinst_PROGRAMS") "bin_PROGRAMS")
-                     (("hnsd_LDFLAGS = -static") ""))
+                     ;; Make sure the 'hnsd' binary is dynamically-linked.
+                     (("^hnsd_LDFLAGS = -static") "\n"))

                   ;; This script tries to chdir to "uv" and doesn't do more
                   ;; than "autoreconf" so remove it.
-                   (delete-file "autogen.sh")
-                   #t))))
+                   (delete-file "autogen.sh")))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--disable-static"))) ;no need for libhsk.a
@@ -1116,7 +1111,7 @@ LuaJIT, both a resolver library and a daemon.")
      (list autoconf automake libtool))
     (inputs
      (list unbound libuv))
-     (home-page "https://www.handshake.org/")
+     (home-page "https://handshake.org/")
     (synopsis "Resolver daemon for the Handshake naming protocol")
     (description
      "@command{hnsd} is a @dfn{host name resolver} for the Handshake Naming
@@ -0,0 +1,198 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023, 2024 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2023, 2025 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2024 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2024, 2025 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2024, 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;;
+;;; 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 duckdb)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system pyproject)
+  #:use-module ((guix build-system python) #:select (pypi-uri))
+  #:use-module (guix build-system r)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages cran)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-science)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages statistics))
+
+;;; Commentary:
+;;;
+;;; This module contains DuckDB - an analytical in-process SQL database
+;;; management system (https://www.duckdb.org/) and it's binding in different
+;;; programming languages with other related to DuckDB packages.
+;;;
+;;; Code:
+
+(define-public duckdb
+  (package
+    (name "duckdb")
+    (version "1.4.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/duckdb/duckdb")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vywdhn930z4aw2ljxp5mx3cfivpvv1d88kq4rhizq3c4hpq9yf3"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      ;; TODO: Find out how to run tests, see: <.github/workflows>.
+      #:tests? #f
+      #:configure-flags
+      #~(list "-DBUILD_EXTENSIONS=autocomplete;icu;json;parquet;tpch;"
+              ;; There is no git checkout from which to read the version tag.
+              (string-append "-DOVERRIDE_GIT_DESCRIBE="
+                             "v" #$version "-0-g0123456789"))))
+    (home-page "https://duckdb.org")
+    (synopsis "In-process SQL OLAP database management system")
+    (description
+     "CLI and C/C++ source libraries for DuckDB, a relational (table-oriented)
+ @acronym{DBMS, Database Management System} that supports @acronym{SQL,
+Structured Query Language}, contains a columnar-vectorized query execution
+engine, and provides transactional @acronym{ACID, Atomicity Consistency
+Isolation and Durability} guarantees via bulk-optimized @acronym{MVCC,
+Multi-Version Concurrency Control}.  Data can be stored in persistent,
+single-file databases with support for secondary indexes.")
+    (license license:expat)))
+
+;; XXX: Try to inherit from duckdb and build from source with all extensions.
+(define-public python-duckdb
+  (package
+    (name "python-duckdb")
+    (version "1.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "duckdb" version))
+       (sha256
+        (base32 "1x8zb47y8lzc4w0g013sim8x9vd1h96ra3dd0bvh91y73f5dyn66"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f ;FIXME: See <https://codeberg.org/guix/guix/issues/1436>.
+      #:test-flags
+      #~(list "--ignore=tests/slow/test_h2oai_arrow.py"
+              ;; Do not relay on mypy.
+              "--ignore=tests/stubs/test_stubs.py"
+              "-k" (string-append
+                    ;; Don't install anything, thank you.
+                    "not test_install_non_existent_extension"
+                    ;; _pybind11_conduit_v1_ not found.
+                    " and not test_wrap_coverage"
+                    ;; See <https://github.com/duckdb/duckdb/issues/11961>.
+                    " and not test_fetchmany"
+                    ;; See <https://github.com/duckdb/duckdb/issues/10702>.
+                    " and not test_connection_interrupt"
+                    " and not test_query_interruption"))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; Tests need this
+          (add-before 'check 'set-HOME
+            (lambda _ (setenv "HOME" "/tmp")))
+          ;; Later versions of pybind replace "_" with "const_name".
+          (add-after 'unpack 'pybind-compatibility
+            (lambda _
+              (with-directory-excursion "src/include/duckdb_python"
+                (substitute* '("python_objects.hpp"
+                               "pyfilesystem.hpp"
+                               "pybind11/conversions/pyconnection_default.hpp")
+                  (("const_name") "_"))))))))
+    (propagated-inputs
+     (list python-adbc-driver-manager))
+    (native-inputs
+     (list pybind11
+           python-fsspec
+           ;; python-google-cloud-storage ;python-grpcio fails (see: guix/guix#1436)
+           python-numpy
+           python-pandas
+           python-psutil
+           ;; python-pytest
+           python-setuptools-scm
+           python-setuptools
+           python-wheel))
+    (home-page "https://www.duckdb.org")
+    (synopsis "DuckDB embedded database")
+    (description "DuckDB is an in-process SQL OLAP database management
+system.")
+    (license license:expat)))
+
+(define-public r-duckdb
+  (package
+    (name "r-duckdb")
+    (version "1.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "duckdb" version))
+       (sha256
+        (base32 "161zxianyssvsrd2345v4bi1m2z7wj614z8343jb73vhlk6s9yyi"))
+       ;; 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.
+       #;
+       (snippet
+        '(delete-file "src/duckdb.tar.xz"))))
+    (properties
+     '((upstream-name . "duckdb")
+       (updater-extra-native-inputs . ("tzdata-for-tests"))
+       ;; We don't seem to need this and I don't want to package it now.
+       (updater-ignored-native-inputs . ("r-dblog"))))
+    (build-system r-build-system)
+    (arguments (list #:tests? #false)) ;tests can time out on the build farm
+    (propagated-inputs (list r-dbi))
+    (native-inputs (list r-adbcdrivermanager
+                         r-arrow
+                         r-bit64
+                         r-callr
+                         r-clock
+                         r-dbitest
+                         r-dbplyr
+                         r-dplyr
+                         r-remotes
+                         r-rlang
+                         r-testthat
+                         r-tibble
+                         r-vctrs
+                         r-withr
+                         tzdata-for-tests))
+    (home-page "https://r.duckdb.org/")
+    (synopsis "DBI package for the DuckDB database management system")
+    (description
+     "The DuckDB project is an embedded analytical data management system with
+support for the Structured Query Language (SQL).  This package includes all of
+DuckDB and an R Database Interface (DBI) connector.")
+    (license license:expat)))
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above in alphabetic order.
+;;;
@@ -241,7 +241,7 @@ formal verification.")
  (package
    (inherit abc)
    (name "abc-yosyshq")
-    (version "0.58")
+    (version "0.59")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -250,7 +250,7 @@ formal verification.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "191hsznsmsjn8100n50qsh3ng8wgrnyfhr7qcnb8yskiwqp37pjh"))))
+                "110hvmwspp7bprwwilcwb8kw6wcqrj9z214269fa75j9027k5l0c"))))
    (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.")
@@ -2335,7 +2335,7 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
 (define-public symbiyosys
  (package
    (name "symbiyosys")
-    (version "0.58")
+    (version "0.59")
    (source
     (origin
       (method git-fetch)
@@ -2344,7 +2344,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 "0fja71y1wkqdwc3cwwk9ifaf33hhnxr8khlj9fhadbcc66rg1s56"))))
+        (base32 "1viah5rm22d0c2v1fsm04brhavl4522h36gv80d7647alkvdfqb9"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2713,7 +2713,7 @@ parallel computing platforms.  It also supports serial execution.")
 (define-public yosys
  (package
    (name "yosys")
-    (version "0.58")
+    (version "0.59")
    (source
     (origin
       (method git-fetch)
@@ -2721,7 +2721,7 @@ parallel computing platforms.  It also supports serial execution.")
              (url "https://github.com/YosysHQ/yosys")
              (commit (string-append "v" version))))
       (sha256
-        (base32 "13095d587dvnj6n1fhw5whda7qhafmmng0qz6qa52cdxriz63kka"))
+        (base32 "0bgijlivkhq338rbd056pjhdbjgwbd8l10afzp2dzlhn03j4l140"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -2759,9 +2759,11 @@ parallel computing platforms.  It also supports serial execution.")
          (replace 'configure
            (lambda* (#:key make-flags #:allow-other-keys)
              (apply invoke "make" "config-gcc" make-flags)))
-          (add-after 'configure 'use-external-abc
+          (add-after 'configure 'configure-makefile
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* '("Makefile")
+                (("ENABLE_EDITLINE \\:= 0")
+                 "ENABLE_EDITLINE := 1")
                (("ABCEXTERNAL \\?=")
                 (string-append "ABCEXTERNAL = "
                                (search-input-file inputs "/bin/abc"))))))
@@ -2790,6 +2792,7 @@ parallel computing platforms.  It also supports serial execution.")
                         gawk ;for the tests and "make" progress pretty-printing
                         iverilog ;for the tests
                         pkg-config
+                         perl
                         python
                         tcl)) ;tclsh for the tests
    (inputs (list abc-yosyshq
@@ -15,6 +15,7 @@
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2025 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -43,13 +44,17 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
+  #:use-module (gnu packages dejagnu)
+  #:use-module (gnu packages digest)
  #:use-module (gnu packages docbook)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages gawk)
  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages gdb)
  #:use-module (gnu packages m4)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
@@ -81,6 +86,41 @@ dynamic library load path (RPATH and RUNPATH) of compiled programs and
 libraries.")
    (license license:gpl2+)))

+(define-public dwz
+  (package
+    (name "dwz")
+    (version "0.16")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://sourceware.org/ftp"
+                                  "/" name "/releases/" name "-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "03nm4yz2sd23zmw65ingphg5gk619xx9r40a5p6dhvlynkhm6n27"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+                           (string-append "CXX=" #$(cxx-for-target))
+                           (string-append "prefix=" #$output))))
+    (native-inputs
+     (list
+      ;; XXX: binutils-gold is a complete package that not only
+      ;; provides 'gold' but also 'ld', which shadows the
+      ;; regular 'ld' (ld-wrapper), causing breakage.
+      (make-ld-wrapper "ld-wrapper" #:binutils binutils)
+      binutils-gold
+      dejagnu
+      `(,elfutils "bin")                ;for eu-strip
+      gdb/pinned
+      pkg-config))
+    (inputs (list elfutils xxhash))
+    (synopsis "DWARF optimizer")
+    (description "DWZ is a DWARF optimization and duplicate removal tool.")
+    (home-page "https://sourceware.org/dwz")
+    (license license:gpl2+)))
+
 (define-public elfutils
  (package
    (name "elfutils")
@@ -6931,12 +6931,10 @@ returns multiple locations, a list is displayed to choose from.")
          (add-after 'install 'install-info
            (lambda _
              (let ((info (string-append #$output "/share/info")))
-                (install-file "texinfo/graphviz-dot-mode.info.gz" info)))))))
-    (native-inputs
-     (list gzip texinfo))
+                (install-file "texinfo/graphviz-dot-mode.info.zst" info)))))))
+    (native-inputs (list gzip texinfo))
    (inputs (list graphviz))
-    (propagated-inputs
-     (list emacs-company))
+    (propagated-inputs (list emacs-company))
    (home-page "http://ppareit.github.com/graphviz-dot-mode")
    (synopsis "Major mode for editing Graphviz DOT files")
    (description
@@ -7350,7 +7348,8 @@ with more precise location control.")
                  "1dch7cwwslffgnzp1djlhz6a792ci42p4bvazxd9lqzhzal0rsbb"))))
      (build-system emacs-build-system)
      (arguments
-       (list #:phases
+       (list #:include #~(cons "\\.py$" %default-include)
+             #:phases
             #~(modify-phases %standard-phases
                 ;; Fix duplicate tests in test file.
                 (add-before 'check 'remove-duplicate-test
@@ -10181,39 +10180,44 @@ configuration.")
      (license license:gpl3+))))

 (define-public emacs-nyan-mode
-  (package
-    (name "emacs-nyan-mode")
-    (version "1.1.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/TeMPOraL/nyan-mode/")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0d0hdjliad8afz4br38gwidph9zhmm5s09y45n95kqlazq62jfsx"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:include #~(cons* "img/" "mus/" %default-include)
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-sources
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "nyan-mode.el"
-                (("mplayer ")
-                 (string-append (search-input-file inputs "bin/mplayer")
-                                " "))))))))
-    (inputs (list mplayer))
-    (home-page "https://github.com/TeMPOraL/nyan-mode/")
-    (synopsis "Nyan Cat as buffer position indicator")
-    (description
-     "Nyan mode is an analog indicator of your position in the buffer.  The cat
+  ;; Tagged release is not up-to-date, according to the "Version:" keyword in
+  ;; main file.
+  (let ((commit "09904af23adb839c6a9c1175349a1fb67f5b4370")
+        (revision "0"))
+    (package
+      (name "emacs-nyan-mode")
+      (version (git-version "1.1.4" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/TeMPOraL/nyan-mode/")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "03xp4dvq3y3q9xyb6pm9m5gb756rvbxcqk52ind08n7prqv4w1lp"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f                     ;no tests
+        #:include #~(cons* "img/" "mus/" %default-include)
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'patch-sources
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute* "nyan-mode.el"
+                  (("mplayer ")
+                   (string-append (search-input-file inputs "bin/mplayer")
+                                  " "))))))))
+      (inputs (list mplayer))
+      (home-page "https://github.com/TeMPOraL/nyan-mode/")
+      (synopsis "Nyan Cat as buffer position indicator")
+      (description
+       "Nyan mode is an analog indicator of your position in the buffer.  The cat
 should go from left to right in your mode-line, as you move your point from 0%
 to 100%.  You can click on the rainbow or the empty space to scroll backwards
 and forwards and also animate it.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))

 (define-public emacs-smart-mode-line
  (package
@@ -27428,8 +27432,8 @@ into sections while preserving the structure imposed by any timestamps.")
    (license license:gpl3+)))

 (define-public emacs-elegant-agenda-mode
-  (let ((commit "c72f42e0f551c3dd81e68262f07a96c0ec90a589")
-        (revision "1"))
+  (let ((commit "5cbc688584ba103ea3be7d7b30e5d94e52f59eb6")
+        (revision "2"))
    (package
      (name "emacs-elegant-agenda-mode")
      (version (git-version "0.1.0" revision commit))
@@ -27442,8 +27446,9 @@ into sections while preserving the structure imposed by any timestamps.")
         (file-name (git-file-name name version))
         (sha256
          (base32
-           "0f8qk3vd41ffbkfqw5nks3bld0qpjrlnk9sb46wcbsyfnrs2v082"))))
+           "13jv4dars81b42593zijpjm0qci0z7hizbjsjab3xfxi3m3r4pk4"))))
      (build-system emacs-build-system)
+      (arguments (list #:tests? #f))    ;no tests
      (home-page "https://github.com/justinbarclay/elegant-agenda-mode")
      (synopsis "Elegant theme for your org-agenda")
      (description
@@ -9,7 +9,7 @@
 ;;; Copyright © 2016 David Thompson <dthompson2@worcester.edu>
 ;;; Copyright © 2016 Nikita <nikita@n0.is>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2017, 2019, 2020, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2017, 2019, 2020, 2023-2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017, 2023, 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
@@ -384,7 +384,8 @@
                       ,(map dirname
                             (list (search-input-file inputs "/bin/gzip")
                                   ;; for coreutils
-                                   (search-input-file inputs "/bin/yes"))))
+                                   (search-input-file inputs "/bin/yes")
+                                   (search-input-file inputs "/bin/zstd"))))
                     `("EMACSLOADPATH" suffix ,lisp-dirs)))
                 (find-files (string-append out "/bin")
                             ;; Matches versioned and unversioned emacs binaries.
@@ -402,7 +403,7 @@
                (copy-file
                 (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
                 "bin/emacs")))))))
-    (inputs (list bash-minimal coreutils findutils gawk gzip ncurses sed))
+    (inputs (list bash-minimal coreutils findutils gawk gzip ncurses sed zstd))
    (native-inputs (list autoconf libfaketime pkg-config texinfo))
    (home-page "https://www.gnu.org/software/emacs/")
    (synopsis "The extensible text editor (minimal build for byte-compilation)")
@@ -42,6 +42,7 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system trivial)
  #:use-module ((guix build utils) #:select (alist-replace delete-file-recursively))
@@ -1753,29 +1754,45 @@ raw USB commands.")
 (define-public west
  (package
    (name "west")
-    (version "0.13.1")
+    (version "1.5.0")
    (source
     (origin
-       (method url-fetch)
-       (uri (pypi-uri "west" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/zephyrproject-rtos/west")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
       (sha256
-        (base32
-         "1hw9qas8ry8prn24iqka8kw2nv7ndxr95mvwr5lww53w2sr7p807"))))
+        (base32 "0fa3bbw69khw8la4mi4q18d8brixywwj5yby7dh36hd40wxspzk3"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      ;; XXX: This test tries to access the network.
+      #~(list "-k" "not test_init_with_clone_option_depth_one")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'configure-tests
+            (lambda _
+              (setenv "TOXTEMPDIR"
+                      (mkdtemp
+                       (string-append (dirname (getcwd)) "/tmpXXXXXX"))))))))
    (propagated-inputs
     (list python-colorama
           python-packaging
           python-pykwalify
           python-pyyaml))
-    (build-system python-build-system)
+    (native-inputs (list git-minimal python-pytest python-setuptools))
    (home-page "https://github.com/zephyrproject-rtos/west")
    (synopsis "Zephyr RTOS Project meta-tool")
-    (description "West is the swiss-army knife command line tool of the Zephyr
-project.  Its built-in commands provide a multiple repository management
-system with features inspired by Google’s Repo tool and Git submodules.  West
-simplifies configuration and is also pluggable: you can write your own west
-\"extension commands\" which add additional features to west.  Zephyr uses
-this feature to provide conveniences for building applications, flashing and
-debugging them, and more.")
+    (description
+     "West is the swiss-army knife command line tool of the Zephyr project.
+Its built-in commands provide a multiple repository management system with
+features inspired by Google’s Repo tool and Git submodules.  West simplifies
+configuration and is also pluggable: you can write your own west \"extension
+commands\" which add additional features to west.  Zephyr uses this feature to
+provide conveniences for building applications, flashing and debugging them,
+and more.")
    (license license:expat)))

 (define-public ebusd
@@ -798,7 +798,7 @@ older games.")
  ;; This is not a patch staging area for DOSBox, but an unaffiliated fork.
  (package
    (name "dosbox-staging")
-    (version "0.82.0")
+    (version "0.82.2")
    (source
     (origin
       (method git-fetch)
@@ -807,7 +807,7 @@ older games.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1s4c6fiyjm91dnmkval9fvsqszc6yjq5b6pq895xi606dn29b85d"))))
+        (base32 "074wrkmy2g280kipnnkh2ga6wlh94kgwfp2cl1g17y65y56vmmdv"))))
    (build-system meson-build-system)
    (arguments
     ;; XXX: When build with debugoptimized, some assertions and tests will
@@ -861,7 +861,7 @@ emulate a serial nullmodem over TCP/IP.")
 (define-public qtmips
  (package
    (name "qtmips")
-    (version "0.7.5")
+    (version "0.8.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -870,47 +870,8 @@ emulate a serial nullmodem over TCP/IP.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp"))))
+                "1gmlr43wjq0fki9d77n7s6jly4n6kd6hq2af0zni348b4a4qn8bn"))))
    (build-system qt-build-system)
-    (arguments
-     (list
-      #:modules '((guix build qt-build-system)
-                  ((guix build gnu-build-system) #:prefix gnu:)
-                  (guix build utils))
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (invoke "qmake"
-                      (string-append "PREFIX=" (assoc-ref outputs "out"))
-                      "qtmips.pro")))
-          (replace 'build (assoc-ref gnu:%standard-phases 'build))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (substitute* "tests/test.sh"
-                (("qtchooser.*") ""))
-              (substitute* '("tests/cpu_trap/test.sh"
-                             "tests/registers/test.sh")
-                (("sub-qtmips_cli") "qtmips_cli"))
-              (if tests?
-                (invoke "tests/run-all.sh")
-                #t)))
-          (replace 'install
-            ;; There is no install target.
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let* ((out (assoc-ref outputs "out"))
-                     (bin (string-append out "/bin"))
-                     (apps (string-append out "/share/applications"))
-                     (icons (string-append out "/share/icons/hicolor")))
-                (install-file "qtmips_gui/qtmips_gui" bin)
-                (install-file "qtmips_cli/qtmips_cli" bin)
-                (install-file "data/qtmips.desktop" apps)
-                (install-file "data/icons/qtmips_gui.svg"
-                              (string-append icons "/scalable/apps"))
-                (install-file "data/icons/qtmips_gui.png"
-                              (string-append icons "/48x48/apps"))
-                #t))))
-        #:tests? #f))    ; test suite wants mips toolchain
    (inputs
     (list elfutils qtbase-5 qtwayland-5))
    (home-page "https://github.com/cvut/QtMips")
@@ -3722,7 +3683,7 @@ de-interlacing patches for use with PCSX2.")
                            (string-append #$output "/share/resources")))))))
    (inputs (list (module-ref
                   (resolve-interface '(gnu packages debug)) 'libbacktrace)
-                  `(,zstd-1.5.7 "lib")
+                  `(,zstd "lib")
                  curl
                  dbus
                  eudev
@@ -36,14 +36,14 @@
 (define-public entr
  (package
    (name "entr")
-    (version "5.6")
+    (version "5.7")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://eradman.com/entrproject/code/entr-"
                           version ".tar.gz"))
       (sha256
-        (base32 "0kniklgnqv4j9carm78d3423wlwqw1ykxmlla4xmlfwdjbgvh8h2"))))
+        (base32 "0ryhylhd682m5cxz3zjyv5zxvxd4dqm3h6mlgvrwww0ch91xkich"))))
    (build-system gnu-build-system)
    (arguments
     `(#:test-target "test"
@@ -68,7 +68,7 @@
                         (search-input-file inputs command))
                        (("/usr(/bin/clear)" _ command)
                         (search-input-file inputs command))))))))
-    (inputs (list bash-minimal coreutils ncurses))
+    (inputs (list bash-minimal coreutils))
    (home-page "https://eradman.com/entrproject/")
    (synopsis "Run arbitrary commands when files change")
    (description
@@ -26,6 +26,7 @@
  #: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)
@@ -35,26 +36,18 @@
  (package
    (name "flex")
    (version "2.6.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/westes/flex"
-                    "/releases/download/v" version "/"
-                    "flex-" version ".tar.gz"))
-              (sha256
-               (base32
-                "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))))
+    (source (bootstrap-origin           ;avoid a circular dependency
+             (origin
+               (method url-fetch)
+               (uri (string-append
+                     "https://github.com/westes/flex"
+                     "/releases/download/v" version "/"
+                     "flex-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))
+               (patches (search-patches "flex-fix-make-dependencies.patch")))))
    (build-system gnu-build-system)
-    (inputs
-     (let ((bison-for-tests
-            (package
-              (inherit bison)
-              (arguments
-               ;; Disable tests, since they require flex.
-               (substitute-keyword-arguments (package-arguments bison)
-                 ((#:tests? _ #f) #f)))
-              (inputs (alist-delete "flex" (package-inputs bison))))))
-       `(("bison" ,bison-for-tests))))
    (arguments
     (if (or (target-hurd64?) (%current-target-system))
         (list #:configure-flags
@@ -67,7 +60,15 @@
         '()))
    ;; m4 is not present in PATH when cross-building
    (native-inputs
-     (list help2man m4))
+     (let ((bison-for-tests
+            (package
+              (inherit bison)
+              (arguments
+               ;; Disable tests, since they require flex.
+               (substitute-keyword-arguments (package-arguments bison)
+                 ((#:tests? _ #f) #f)))
+              (inputs (alist-delete "flex" (package-inputs bison))))))
+       (list bison-for-tests help2man m4)))
    (propagated-inputs (list m4))
    (home-page "https://github.com/westes/flex")
    (synopsis "Fast lexical analyser generator")
@@ -68,6 +68,7 @@
 ;;; Copyright © 2025 Gabriel Santos <gabrielsantosdesouza@disroot.org>
 ;;; Copyright © 2025 Liam Hupfer <liam@hpfr.net>
 ;;; Copyright © 2025 Evgeny Pisemsky <mail@pisemsky.site>
+;;; Copyright © 2025 Lee Thompson <lee.p.thomp@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4992,3 +4993,25 @@ typeface.  It is inspired by many 5×7 pixel grid typefaces, especially Gilles
 Boccon-Gibod’s MonteCarlo.  Unlike traditional bitmap fonts, it is distributed
 in typical scalable font formats.")
    (license license:silofl1.1)))
+
+(define-public font-kawkab-mono
+  (package
+    (name "font-kawkab-mono")
+    (version "0.501")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/aiaf/kawkab-mono/releases/download/"
+             "v" version "/kawkab-mono-" version ".zip"))
+       (sha256
+        (base32 "0rjn2kdfs81cbpnffxj0sgw6zav5503smjkldlbg1ynyvmbnzh0i"))))
+    (build-system font-build-system)
+    (outputs '("out" "ttf" "woff"))
+    (home-page "https://makkuk.com/kawkab-mono/")
+    (synopsis "Monospaced Arabic typeface")
+    (description
+     "Kawkab Mono (كوكب مونو) is a monospaced Arabic typeface.  It is designed
+for code and text-editing in particular, and whenever having a fixed-pitch font
+is necessary, such as when composing tabular data using text.")
+    (license license:silofl1.1)))
@@ -123,7 +123,11 @@
                                #$@(if (target-arm32?)
                                       (list "CFLAGS=-g -O2 -fno-tree-slp-vectorize")
                                       '()))
-      #:disallowed-references (list pkg-config)
+      #:disallowed-references (list (this-package-native-input
+                                     (if (%current-target-system)
+                                         (string-append "pkg-config-"
+                                                        (%current-target-system))
+                                         "pkg-config")))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'install 'remove-reference-to-pkg-config
@@ -41,6 +41,7 @@
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024, 2025 dan <i@dan.games>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2025 wvlab <me@wvlab.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,6 +66,7 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix utils)
+  #:use-module (guix build-system cargo)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
@@ -112,6 +114,7 @@
  #:use-module (gnu packages ibus)
  #:use-module (gnu packages image)
  #:use-module (gnu packages language)
+  #:use-module (gnu packages llvm)
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages libunwind)
  #:use-module (gnu packages libusb)
@@ -133,6 +136,9 @@
  #:use-module (gnu packages qt)
  #:use-module (gnu packages rdesktop)
  #:use-module (gnu packages rsync)
+  #:use-module (gnu packages rust)
+  #:use-module (gnu packages rust-apps)
+  #:use-module (gnu packages rust-crates)
  #:use-module (gnu packages samba)
  #:use-module (gnu packages serialization)
  #:use-module (gnu packages sqlite)
@@ -140,6 +146,7 @@
  #:use-module (gnu packages valgrind)
  #:use-module (gnu packages video)
  #:use-module (gnu packages virtualization)
+  #:use-module (gnu packages vulkan)
  #:use-module (gnu packages w3m)
  #:use-module (gnu packages web)
  #:use-module (gnu packages wm)
@@ -587,7 +594,7 @@ freedesktop.org project.")
  ;; Updating this will rebuild over 700 packages through libinput-minimal.
  (package
    (name "libinput")
-    (version "1.29.1")
+    (version "1.29.901")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -596,24 +603,15 @@ freedesktop.org project.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "11n2vqkdz40vbqdjwm19i7rv2lzqf4i7anlla0havf7h0glqin60"))))
+                "0lzkns9k6zfa04d8y76fgca4i7ag92w33yrdnnnmgfdv5lng5psn"))))
    (build-system meson-build-system)
    (arguments
-     `(#:configure-flags '("-Ddocumentation=false")
-
-       ;; XXX: Using 'debug' or 'debugoptimized' pulls in an additional test that
-       ;; hangs, and the comments around it suggests that we should be using this
-       ;; Meson target anyway.
-       #:build-type "release"
-       #:phases
-       ,@(if (target-64bit?)
-             `(%standard-phases)
-             `((modify-phases %standard-phases
-                 ;; Backported from a commit after the 1.29.0 release.
-                 (add-after 'unpack 'correct-value-type-in-atou64_test
-                   (lambda _
-                     (substitute* "test/test-utils.c"
-                       (("unsigned long val") "uint64_t val")))))))))
+     (list
+      #:configure-flags '(list "-Ddocumentation=false")
+      ;; XXX: Using 'debug' or 'debugoptimized' pulls in an additional test that
+      ;; hangs, and the comments around it suggests that we should be using this
+      ;; Meson target anyway.
+      #:build-type "release"))
    (native-inputs
     (append (list check pkg-config python-minimal-wrapper python-pytest)
             (if (%current-target-system)
@@ -647,10 +645,10 @@ other applications that need to directly deal with input devices.")
           '("cairo" "glib" "gtk+" "libwacom")))
    (arguments
     (substitute-keyword-arguments (package-arguments libinput)
-      ((#:configure-flags flags ''())
-       `(cons* "-Dlibwacom=false"
-               "-Ddebug-gui=false"    ;requires gtk+@3
-               ,flags))))))
+       ((#:configure-flags flags ''())
+        #~(cons* "-Dlibwacom=false"
+                 "-Ddebug-gui=false"    ;requires gtk+@3
+                 #$flags))))))

 (define-public libei
  (package
@@ -3420,7 +3418,7 @@ notifies the user using any notification daemon implementing
 (define-public waypipe
  (package
    (name "waypipe")
-    (version "0.9.1")
+    (version "0.10.5")
    (source
     (origin
       (method git-fetch)
@@ -3429,17 +3427,60 @@ notifies the user using any notification daemon implementing
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0pj7l3ix0pp0sfqxfa2hxql0f30vz6hh01fq5kzhs831b632i3z0"))))
+        (base32 "1rg9qzsi07b65cdf421895dfy4gkb1kwmkwn3sfx6n7sfr8b1z6a"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 ;; Fix the cargo flags:
+                 (substitute* '("compile_wrapper.sh"
+                                "meson.build")
+                   (("--frozen") "--offline"))))))
    (build-system meson-build-system)
    (native-inputs
-     (list pkg-config scdoc
+     (list pkg-config
+           scdoc
+           rust
+           (list rust "cargo")
+           rust-bindgen-cli
+           shaderc
+           clang ; bindgen does not work without it
+           vulkan-headers
           ;; For tests
           python))
-    (inputs (list lz4 libva mesa libdrm ffmpeg))
+    (inputs
+     (cons* ffmpeg
+            lz4
+            libdrm
+            libva
+            mesa
+            vulkan-loader
+            (list zstd "lib")
+            (cargo-inputs 'waypipe)))
    (arguments
-     (list #:configure-flags
-           #~(list "-Dwith_lz4=enabled" "-Dwith_vaapi=enabled"
-                   "-Dwith_dmabuf=enabled" "-Dwith_video=enabled")))
+     (list
+       #:imported-modules
+       (append %cargo-build-system-modules
+               %meson-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-cargo-build-system
+             (lambda args
+               (for-each
+                 (lambda (phase)
+                   (apply (assoc-ref cargo:%standard-phases phase)
+                          #:cargo-target #$(cargo-triplet) args))
+                   '(unpack-rust-crates
+                     configure
+                     check-for-pregenerated-files
+                     patch-cargo-checksums)))))
+       #:configure-flags
+       #~(list "-Dwith_lz4=enabled"
+               "-Dwith_vaapi=enabled"
+               "-Dwith_dmabuf=enabled"
+               "-Dwith_video=enabled")))
    (home-page "https://gitlab.freedesktop.org/mstoeckl/waypipe")
    (synopsis "Proxy for Wayland protocol applications")
    (description
@@ -121,6 +121,7 @@
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages networking)
  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages pretty-print)
  #:use-module (gnu packages pulseaudio)
@@ -4009,3 +4010,61 @@ simplicity of BASIC with the sophistication of a modern structured language,
 allowing you to write utilities and games, use sound and graphics, perform
 calculations and create complete applications.")
    (license license:zlib)))
+
+(define-public shlomif-cmake-modules
+  (let ((commit "2fa3e9be1a1df74ad0e10f0264bfa60e1e3a755c")
+        (revision "0"))
+    (package
+      (name "shlomif-cmake-modules")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/shlomif/shlomif-cmake-modules")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1755lvg1xxygsxnp6kyjw9m0nddcb19ivm8dy31hfiyr0rxakl9h"))))
+      (build-system copy-build-system)
+      (arguments
+       (list
+        #:install-plan
+        #~'(("shlomif-cmake-modules/" "share/shlomi-fish/cmake"))))
+      (home-page "https://github.com/shlomif/shlomif-cmake-modules")
+      (synopsis "CMake modules for Shlomi Fish's projects")
+      (description
+       "This repository contains CMake modules which are used across
+@uref{https://www.shlomifish.org/, Shlomi Fish's} projects.")
+      (license license:expat))))
+
+(define-public rinutils
+  (package
+    (name "rinutils")
+    (version "0.10.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/shlomif/rinutils")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0iziwblw3jnvj31pis86x5lvykywfsx6w7a4019zn34p1i4id8js"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list (string-append "-DCMAKE_MODULE_PATH="
+                             #+shlomif-cmake-modules "/share/shlomi-fish/cmake")
+              (string-append "-DSHLOMIF_SYSTEM_INSTALL_DIR="
+                             #+shlomif-cmake-modules "/share/shlomi-fish/cmake"))
+      #:tests? #f)) ;No tests
+    (native-inputs (list shlomif-cmake-modules pkg-config perl))
+    (home-page "https://github.com/shlomif/rinutils")
+    (synopsis "Collection of C headers")
+    (description
+     "Rinutils is a set of C headers containing macros and static
+functions that have been extracted from @uref{https://www.shlomifish.org/,
+Shlomi Fish's} projects.")
+    (license license:expat)))
@@ -187,6 +187,7 @@
  #:use-module (gnu packages lesstif)
  #:use-module (gnu packages libcanberra)
  #:use-module (gnu packages libedit)
+  #:use-module (gnu packages libffi)
  #:use-module (gnu packages libidn)
  #:use-module (gnu packages libunwind)
  #:use-module (gnu packages libusb)
@@ -218,6 +219,7 @@
  #:use-module (gnu packages pulseaudio)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-check)
  #:use-module (gnu packages python-compression)
  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
@@ -2193,6 +2195,117 @@ kthieves, ktowers, xmille and xreversi.")
    ;; Code is under BSD-3 and Expat, card images are under CC0.
    (license (list license:bsd-3 license:expat license:cc0))))

+(define-public black-hole-solver
+  (package
+    (name "black-hole-solver")
+    (version "1.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://fc-solve.shlomifish.org/downloads/fc-solve/black-hole-solver-"
+             version ".tar.xz"))
+       (sha256
+        (base32 "1h2panbi4jkcijyknyxi74fkgd0jgjmp1mhg155hy5mv7l4vsisw"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'delete-failing-tests
+            (lambda _
+              (delete-file "t/style-trailing-space.t"))))))
+    ;; TODO: These inputs wind up propagating both perl-moo and perl-moo-2,
+    ;; which are mutually incompatible
+    (native-inputs
+     (list `(,glib "bin")
+           perl
+           perl-class-xsaccessor
+           perl-dir-manifest
+           perl-env-path
+           perl-file-find-object
+           perl-file-find-object-rule
+           perl-file-which
+           perl-inline
+           perl-inline-c
+           perl-number-compare
+           perl-path-tiny-0.150
+           perl-test-differences
+           perl-test-runvalgrind
+           perl-test-some
+           perl-test-trailingspace
+           perl-text-glob
+           pkg-config
+           python))
+    (inputs (list rinutils))
+    (home-page "https://fc-solve.shlomifish.org/")
+    (synopsis "Solver of various solitaire games")
+    (description
+     "Black-hole Solver is a program that automatically solves layouts of Black Hole and
+similar variants of Card Solitaire such as Golf, and All in a Row.")
+    (license license:expat)))
+
+(define-public freecell-solver
+  (package
+    (name "freecell-solver")
+    (version "6.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-"
+             version ".tar.xz"))
+       (sha256
+        (base32 "1p775imxqycpky3j3pa5whzqcxjbr3kv2z1d20hxbg12akc2a48x"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "-DFCS_DISABLE_PATSOLVE=1")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'delete-failing-tests
+            (lambda _
+              (delete-file "t/t/tidyall.t")
+              (delete-file "t/t/sh-shabang.t")
+              (delete-file "t/t/py-flake8.t")
+              (delete-file "t/t/style-trailing-space.t"))))))
+    ;; TODO: These inputs wind up propagating both perl-moo and perl-moo-2,
+    ;; which are mutually incompatible
+    (native-inputs
+     (list cmocka
+           `(,glib "bin")
+           gperf
+           perl
+           perl-chi
+           perl-file-find-object
+           perl-file-find-object-rule
+           perl-moo-2
+           perl-number-compare
+           perl-path-tiny-0.150
+           perl-task-freecellsolver-testing
+           perl-task-test-run-allplugins
+           perl-test-runvalgrind
+           perl-template-toolkit
+           perl-code-tidyall-plugin-testcount
+           pkg-config
+           python
+           python-cffi
+           python-freecell-solver
+           python-pycotap
+           python-six
+           the-silver-searcher
+           tidyall))
+    (inputs (list rinutils))
+    (propagated-inputs (list python-pysol-cards))
+    (home-page "https://fc-solve.shlomifish.org/")
+    (synopsis "Solver of various solitaire games")
+    (description
+     "Freecell Solver is a program that automatically solves layouts of Freecell and
+similar variants of Card Solitaire such as Eight Off, Forecell, and Seahaven Towers, as
+well as Simple Simon boards.")
+    (license license:expat)))
+
 (define-public knightsgame
  (package
    (name "knightsgame")
@@ -4836,7 +4949,7 @@ also available.")
  (hidden-package
   (package
     (name "ring-racers-data")
-     (version "2.3")
+     (version "2.4")
     (source
      (origin
        (method url-fetch/zipbomb)
@@ -4845,7 +4958,7 @@ also available.")
              version "/Dr.Robotnik.s-Ring-Racers-v" version "-Assets.zip"))
        (file-name (string-append name "-" version ".zip"))
        (sha256
-         (base32 "0i6sq8c1vq7z5r5i1hana0v73xvj53696f2xwn37xicxds4d15wp"))))
+         (base32 "087i1bz46g57s0850j5wf9j2bdmr451lzg156hrg681chwdxgfpf"))))
     (build-system copy-build-system)
     (home-page "https://github.com/KartKrewDev/RingRacers/releases")
     (synopsis "Data files for Ring Racers")
@@ -4855,16 +4968,16 @@ also available.")
 (define-public ring-racers
  (package
    (name "ring-racers")
-    (version "2.3")
+    (version "2.4")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://git.do.srb2.org/KartKrew/RingRacers")
-             (commit (string-append "v" version))))
+              (url "https://gitlab.com/kart-krew-dev/ring-racers")
+              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05lf799imbk0x3i2adaj0r84ck5yyrvzjvhs4k9dj7l4jg0x4sjz"))
+        (base32 "05aj09rm50xb6910zx6imarj8k728x9bpvpa7ydwgb4sj1nypil8"))
       (modules '((guix build utils)))
       (snippet '(begin
                   (with-directory-excursion "thirdparty"
@@ -4894,12 +5007,14 @@ also available.")
                (wrap-program "bin/ringracers"
                  `("RINGRACERSWADDIR" =
                    (,(assoc-ref inputs "ring-racers-data"))))))))))
+    (native-inputs (list pkg-config))
    (inputs (list glm
                  libogg
                  libpng
                  libvorbis
                  libvpx
                  libyuv
+                  opus
                  ring-racers-data
                  sdl2
                  zlib
@@ -5489,6 +5604,57 @@ Transport Tycoon Deluxe.")
     (modify-inputs (package-native-inputs openttd-engine)
       (prepend openttd-opengfx openttd-openmsx openttd-opensfx)))))

+(define-public openttd-jgrpp
+  (package
+    (inherit openttd)
+    (name "openttd-jgrpp")
+    (version "0.68.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/JGRennison/OpenTTD-patches")
+             (commit (string-append "jgrpp-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "03jk3hgjribr4w2v8xpfmr0yb5bl19qmmmag21qp4ypvglp2vybz"))))
+    (inputs (modify-inputs (package-inputs openttd)
+              (append sdl2 zstd harfbuzz)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments openttd)
+       ((#:phases phases '%standard-phases)
+          #~(modify-phases #$phases
+              (add-before 'check 'build-tests
+                (lambda* (#:key (tests? #t) (make-flags '()) (parallel-build? #t) #:allow-other-keys)
+                  (use-modules (ice-9 threads))
+                  (when tests?
+                    (apply invoke "cmake"
+                           `("--build"
+                             "."
+                             ,@(if parallel-build?
+                                   `("-j" ,(number->string (parallel-job-count)))
+                                   ;; When unset CMake defers to the build system.
+                                   '("-j" "1"))
+                             ;; Pass the following options to the native tool.
+                             "--"
+                             ,@(if parallel-build?
+                                   ;; Set load average limit for Make and Ninja.
+                                   `("-l" ,(number->string (total-processor-count)))
+                                   '())
+                             "openttd_test"
+                             ,@make-flags)))))))))
+    (home-page "https://github.com/JGRennison/OpenTTD-patches")
+    (synopsis "OpenTTD with additional patches")
+    (description
+     "JGRPP is a collection of features and other modifications applied to OpenTTD.
+It's a separate version of the game which can be installed and played alongside
+the standard game, not a loadable mod (NewGRF, script, or so on).
+
+This is mainly intended to be used by players who are already familiar with the
+standard game and how to play it.  It is not aimed at beginner/novice players.
+Some features and settings are there for very experienced players and so may
+have a steep learning curve.")))
+
 (define openrct2-title-sequences
  (package
   (name "openrct2-title-sequences")
@@ -167,7 +167,7 @@
 (define-public gmt
  (package
    (name "gmt")
-    (version "6.5.0")
+    (version "6.6.0")
    (source
     (origin
       (method url-fetch)
@@ -175,7 +175,7 @@
                           "releases/download/"
                           version "/gmt-" version "-src.tar.xz"))
       (sha256
-        (base32 "07hlqg3adxrz7wqih8pydr44v7j40savcxfjlkaw3y9k82sas8j0"))))
+        (base32 "10hhpp6qwbhyk4xgd7xs1xw2d51fq22q64z57i329jcg3fqrib0q"))))
    (build-system cmake-build-system)
    (arguments (list #:tests? #false)) ;tests need costline data and caches
    (inputs
@@ -2139,7 +2139,7 @@ delivered to any client.")
 (define-public imposm3
  (package
    (name "imposm3")
-    (version "0.11.1")
+    (version "0.14.2")
    (source
      (origin
        (method git-fetch)
@@ -2149,7 +2149,7 @@ delivered to any client.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-          "1ifniw57l3s0sl7nb3zwxxm86i46451yrhfqnnkxr46cnpbzmwxr"))))
+          "1za04n0d73gqff4qmgxbn6rz2sqwnqcpyxvzjhsgfdysbx48nph6"))))
    (build-system go-build-system)
    (arguments
     `(#:import-path "github.com/omniscale/imposm3/cmd/imposm"
@@ -55,14 +55,14 @@
 (define-public gettext-minimal
  (package
    (name "gettext-minimal")
-    (version "0.23.1")
+    (version "0.26")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/gettext/gettext-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "0j8fijicvg8jkrisgsqbpnbmfb2mz3gx2p6pcwip82731yb7i9aj"))))
+                "0zqxpdc6xxf7rz69xfxiv7z32djvrsm64m80c05i36qy6yqg9b1r"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                            ;9 MiB of HTML
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2016, 2019-2021, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
@@ -272,7 +272,7 @@ information, refer to the @samp{dbus-daemon(1)} man page.")))
    (arguments
     (list
      #:disallowed-references
-      (cons tzdata-for-tests
+      (cons (this-package-native-input "tzdata")
            ;; Verify glib-mkenums, gtester, ... use the cross-compiled
            ;; python.
            (if (%current-target-system)
@@ -6285,7 +6285,7 @@ throughout GNOME for API documentation).")
           pango
           wayland))
    (arguments
-     `(#:disallowed-references (,xorg-server-for-tests)
+     `(#:disallowed-references ,(list (this-package-native-input "xorg-server"))
       #:configure-flags (list ,(string-append
                                 "CFLAGS=-g -O2"
                                 " -Wno-error=implicit-function-declaration")
@@ -8221,9 +8221,14 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
                   (strip-keyword-arguments
                    '(#:glib-or-gtk?)
                    (package-arguments gnome-online-accounts))
-                 ((#:phases phases)
-                  #~(modify-phases #$phases
-                      (delete 'disable-gtk-update-icon-cache)))))
+      ;; Fix build.
+      ((#:make-flags _ '())
+       #~(list (string-append "CFLAGS="
+                              "-Wno-error=implicit-function-declaration "
+                              "-Wno-error=int-conversion")))
+      ((#:phases phases)
+       #~(modify-phases #$phases
+           (delete 'disable-gtk-update-icon-cache)))))
    (inputs (modify-inputs (package-inputs gnome-online-accounts)
              (replace "rest" rest)
              (replace "webkitgtk" webkitgtk-with-libsoup2)))))
@@ -9432,10 +9437,10 @@ properties, screen resolution, and other GNOME parameters.")
    (build-system meson-build-system)
    (arguments
     (let ((disallowed-references
-            (list (gexp-input glib "bin")
-                  (gexp-input libxslt)
-                  (gexp-input meson)
-                  (gexp-input ruby-sass))))
+            (list (gexp-input (this-package-native-input "glib") "bin")
+                  (this-package-native-input "libxslt")
+                  meson
+                  (this-package-native-input "ruby-sass"))))
       (list
        #:glib-or-gtk? #t
        #:disallowed-references disallowed-references
@@ -1226,39 +1226,43 @@ over.")
 (define-public jetring
  (package
    (name "jetring")
-    (version "0.31")
+    (version "0.32")
    (source
      (origin
        (method git-fetch)
        (uri (git-reference
               (url "https://salsa.debian.org/debian/jetring")
-               (commit "535380166eb1b222ba34864af07f3e36f4fb52c9")))
+               (commit (string-append "debian/" version))))
        (file-name (git-file-name name version))
        (sha256
-         (base32 "19m7rj446pr4nql44khwq0cfxfrm8cslj5v9jll08p7nk6glq5px"))))
+         (base32 "0drw04iw0bp6xsb40wdbji6xkxgiyzix1mikpkc61ljfy35mg9m1"))))
    (build-system gnu-build-system)
    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure)            ; no configure script
-         (add-before 'install 'hardlink-gnupg
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((gpg (search-input-file inputs "/bin/gpg")))
-               (substitute* (find-files "." "jetring-[[:alpha:]]+$")
-                 (("gpg -") (string-append gpg " -"))
-                 (("\\\"gpg\\\"") (string-append "\"" gpg "\""))))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (man (string-append out "/share/man")))
-               (for-each (lambda (file)
-                           (install-file file (string-append out "/bin/")))
-                         (find-files "." "jetring-[[:alpha:]]+$"))
-               (for-each (lambda (file)
-                           (install-file file (string-append man "/man1/")))
-                         (find-files "." ".*\\.1$"))
-               (install-file "jetring.7" (string-append man "/man7/"))))))
-       #:tests? #f))                    ; no tests
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)            ; no configure script
+          (add-before 'install 'hardlink-gnupg
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((gpg (search-input-file inputs "/bin/gpg")))
+                (substitute* (find-files "." "jetring-[[:alpha:]]+$")
+                  (("gpg -") (string-append gpg " -"))
+                  (("\\\"gpg\\\"") (string-append "\"" gpg "\""))))))
+          (replace 'install
+            (lambda _
+              (for-each
+               (lambda (file)
+                 (install-file file
+                               (string-append #$output "/bin/")))
+               (find-files "." "jetring-[[:alpha:]]+$"))
+              (for-each
+               (lambda (file)
+                 (install-file file
+                               (string-append #$output "/share/man/man1/")))
+               (find-files "." ".*\\.1$"))
+              (install-file "jetring.7"
+                            (string-append #$output "/share/man/man7/")))))
+      #:tests? #f))                    ; no tests
    (inputs
     (list gnupg perl))
    (home-page "https://joeyh.name/code/jetring/")
@@ -74,6 +74,7 @@
  #:use-module (gnu packages cups)
  #:use-module (gnu packages kerberos)
  #:use-module (gnu packages linux)
+  #:use-module (gnu packages messaging)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python-web)
@@ -603,9 +604,9 @@ in the case of Firefox, it is browser/locales/all-locales."
    "zh-CN"
    "zh-TW"))

-(define %icecat-base-version "140.4.0")
+(define %icecat-base-version "140.5.0")
 (define %icecat-version (string-append %icecat-base-version "-gnu1"))
-(define %icecat-build-id "20251014000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-build-id "20251111000000") ;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'
@@ -625,9 +626,9 @@ in the case of Firefox, it is browser/locales/all-locales."
                  "firefox-" upstream-firefox-version ".source.tar.xz"))
            (sha256
             (base32
-              "1xx4rsdkfkx9nxlfzw07j5di07kfqi0a7jplcixvqihh2xrhdwj9"))))
+              "1qhhsgk1dvdrxvvvry6gpijqzpbgmc6h1fd01c7478ppwprpwaw3"))))

-         (gnuzilla-commit "579bc2897077119e38a7e1493bca6ec97a06a36a")
+         (gnuzilla-commit "5897aee761cc6d179bd8632f085c3c14ccf7db6c")
         (gnuzilla-source
          (origin
            (method git-fetch)
@@ -638,7 +639,7 @@ in the case of Firefox, it is browser/locales/all-locales."
                                      (string-take gnuzilla-commit 8)))
            (sha256
             (base32
-              "094sci1mvvmb6xrpfjw0r482lspkmkfdln78mrkcqq7a5x3gwp83"))))
+              "1yk3bpsa01gy5s5dwavsr089qp5dznzb8za5k3ab3fs79i9vdg6z"))))

         ;; 'search-patch' returns either a valid file name or #f, so wrap it
         ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@@ -790,12 +791,13 @@ preferences/advanced-scripts.dtd"
           libcanberra
           libgnome
           libjpeg-turbo
-           libpng-apng-next
+           libpng-apng
           ;; UNBUNDLE-ME! libogg
           ;; UNBUNDLE-ME! libtheora ; wants theora-1.2, not yet released
           ;; UNBUNDLE-ME! libvorbis
           libxft
           libevent
+           libwebp
           libxinerama
           libxscrnsaver
           libxcomposite
@@ -813,8 +815,8 @@ preferences/advanced-scripts.dtd"
           hunspell
           libnotify
           nspr
-           ;; UNBUNDLE-ME! nss
-           ;; (pending resolution of <https://codeberg.org/guix/guix/issues/661>)
+           ;;nss-rapid            ;pending resolution of
+                                  ;<https://codeberg.org/guix/guix/issues/661>
           shared-mime-info
           sqlite
           eudev
@@ -856,6 +858,7 @@ preferences/advanced-scripts.dtd"

      #:configure-flags
      #~(list
+         "--disable-bootstrap"     ;do not attempt to fetch toolchain binaries
         "--disable-fhs"
         "--enable-application=browser"
         "--with-distribution-id=org.gnu"
@@ -898,24 +901,26 @@ preferences/advanced-scripts.dtd"
         "--without-wasm-sandboxed-libraries"

         ;; Avoid bundled libraries.
+         "--enable-system-pixman"
+         "--with-system-ffi"
+         "--with-system-icu"
         "--with-system-jpeg"           ;must be libjpeg-turbo
+         "--with-system-libevent"
+         "--with-system-libvpx"
+         "--with-system-nspr"
+         ;; "--with-system-nss"
+         ;;   (pending resolution of <https://codeberg.org/guix/guix/issues/661>)
         "--with-system-png"            ;must be libpng-apng
+         "--with-system-webp"
         "--with-system-zlib"
+
+         ;; TODO: To be implemented.
         ;; UNBUNDLE-ME! "--with-system-bz2"
-         ;; UNBUNDLE-ME! "--with-system-libevent"
         ;; UNBUNDLE-ME! "--with-system-ogg"
         ;; UNBUNDLE-ME! "--with-system-vorbis"
         ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released
-         ;; UNBUNDLE-ME! "--with-system-libvpx"
-         "--with-system-icu"
-         "--with-system-nspr"
-         ;; UNBUNDLE-ME! "--with-system-nss"
-         ;;   (pending resolution of <https://codeberg.org/guix/guix/issues/661>)
-
         ;; UNBUNDLE-ME! "--with-system-harfbuzz"
         ;; UNBUNDLE-ME! "--with-system-graphite2"
-         "--enable-system-pixman"
-         "--enable-system-ffi"
         ;; UNBUNDLE-ME! "--enable-system-sqlite"
         )

@@ -927,7 +932,7 @@ preferences/advanced-scripts.dtd"
                  (srfi srfi-26)
                  (rnrs bytevectors)
                  (rnrs io ports)
-                  (guix elf)
+                  (system vm elf)
                  (guix build gremlin)
                  ,@%default-gnu-modules)
      #:phases
@@ -976,18 +981,19 @@ preferences/advanced-scripts.dtd"
                          ;;   * libopus
                          ;;   * speex
                          ;;
+                          "ipc/chromium/src/third_party/libevent"
+                          "js/src/ctypes/libffi"
+                          "media/libjpeg"
+                          "media/libvpx"
                          "modules/freetype2"
-                          ;; "media/libjpeg"  ; needed for now, because media/libjpeg/moz.build is referenced from config/external/moz.build
+
                          ;; UNBUNDLE-ME! "modules/zlib"
-                          ;; UNBUNDLE-ME! "ipc/chromium/src/third_party/libevent"
-                          ;; UNBUNDLE-ME! "media/libvpx"
                          ;; UNBUNDLE-ME! "media/libogg"
                          ;; UNBUNDLE-ME! "media/libvorbis"
                          ;; UNBUNDLE-ME! "media/libtheora" ; wants theora-1.2, not yet released
                          ;; UNBUNDLE-ME! "media/libtremor"
                          ;; UNBUNDLE-ME! "gfx/harfbuzz"
                          ;; UNBUNDLE-ME! "gfx/graphite2"
-                          "js/src/ctypes/libffi"
                          ;; UNBUNDLE-ME! "db/sqlite3"
                          ))))
          (add-after 'remove-bundled-libraries 'fix-ffmpeg-runtime-linker
@@ -998,16 +1004,10 @@ preferences/advanced-scripts.dtd"
                 (search-input-file inputs "lib/libavcodec.so")))))
          (add-after 'fix-ffmpeg-runtime-linker 'build-sandbox-whitelist
            (lambda* (#:key inputs #:allow-other-keys)
-              (define (runpath-of lib)
-                (call-with-input-file lib
-                  (compose elf-dynamic-info-runpath
-                           elf-dynamic-info
-                           parse-elf
-                           get-bytevector-all)))
              (define (runpaths-of-input label)
                (let* ((dir (string-append (assoc-ref inputs label) "/lib"))
                       (libs (find-files dir "\\.so$")))
-                  (append-map runpath-of libs)))
+                  (append-map file-runpath libs)))
              ;; Populate the sandbox read-path whitelist as needed by ffmpeg.
              (let* ((whitelist
                      (map (cut string-append <> "/")
@@ -1242,168 +1242,10 @@ testing.")
       (cpe-name . "firefox_esr")
       (cpe-version . ,(first (string-split version #\-)))))))

-(define icecat-140.3-source
-  (let* ((%icecat-140.3-base-version "140.3.1")
-         (%icecat-140.3-version (string-append %icecat-140.3-base-version "-gnu1"))
-         (major-version (first  (string-split %icecat-140.3-base-version #\.)))
-         (minor-version (second (string-split %icecat-140.3-base-version #\.)))
-         (sub-version   (third  (string-split %icecat-140.3-base-version #\.)))
-
-         (upstream-firefox-version (string-append %icecat-140.3-base-version "esr"))
-         (upstream-firefox-source
-          (origin
-            (method url-fetch)
-            (uri (string-append
-                  "https://ftp.mozilla.org/pub/firefox/releases/"
-                  upstream-firefox-version "/source/"
-                  "firefox-" upstream-firefox-version ".source.tar.xz"))
-            (sha256
-             (base32
-              "0db7qgcvw4knl6qbkn0a52vh2pcghcw4s2djdvcna1zlqjhv6hqb"))))
-
-         (gnuzilla-commit "b7f0c6b7d19ececd92640f26eaa43cfec29cf728")
-         (gnuzilla-source
-          (origin
-            (method git-fetch)
-            (uri (git-reference
-                  (url "git://git.savannah.gnu.org/gnuzilla.git")
-                  (commit gnuzilla-commit)))
-            (file-name (git-file-name "gnuzilla"
-                                      (string-take gnuzilla-commit 8)))
-            (sha256
-             (base32
-              "1hzwa4dbk5pvwas867vp2iivdr9zqppr9zbw2xgyd2mdf2kj4a20"))))
-
-         ;; 'search-patch' returns either a valid file name or #f, so wrap it
-         ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
-         (makeicecat-patch
-          (local-file (assume-valid-file-name
-                       (search-patch "icecat-makeicecat.patch")))))
-
-    (origin
-      (method computed-origin-method)
-      (file-name (string-append "icecat-" %icecat-140.3-version ".tar.zst"))
-      (sha256 #f)
-      (uri
-       (delay
-        (with-imported-modules '((guix build utils))
-          #~(begin
-              (use-modules (guix build utils))
-              (let ((firefox-dir
-                     (string-append "firefox-" #$%icecat-140.3-base-version))
-                    (icecat-dir
-                     (string-append "icecat-" #$%icecat-140.3-version)))
-
-                (set-path-environment-variable
-                 "PATH" '("bin")
-                 (list #+python
-                       #+(canonical-package bash)
-                       #+(canonical-package coreutils)
-                       #+(canonical-package findutils)
-                       #+(canonical-package patch)
-                       #+(canonical-package xz)
-                       #+(canonical-package zstd)
-                       #+(canonical-package sed)
-                       #+(canonical-package grep)
-                       #+(canonical-package bzip2)
-                       #+(canonical-package gzip)
-                       #+(canonical-package tar)))
-
-                (set-path-environment-variable
-                 "PYTHONPATH"
-                 (list #+(format #f "lib/python~a/site-packages"
-                                 (version-major+minor
-                                  (package-version python))))
-                 '#+(cons python-jsonschema
-                          (map second
-                               (package-transitive-propagated-inputs
-                                python-jsonschema))))
-
-                ;; We copy the gnuzilla source directory because it is
-                ;; read-only in 'gnuzilla-source', and the makeicecat script
-                ;; uses "cp -a" to copy parts of it and assumes that the
-                ;; copies will be writable.
-                (copy-recursively #+gnuzilla-source "/tmp/gnuzilla"
-                                  #:log (%make-void-port "w"))
-
-                (with-directory-excursion "/tmp/gnuzilla"
-                  (make-file-writable "makeicecat")
-                  (invoke "patch" "--force" "--no-backup-if-mismatch"
-                          "-p1" "--input" #+makeicecat-patch)
-                  (patch-shebang "makeicecat")
-                  (substitute* "makeicecat"
-                    (("^readonly FFMAJOR=(.*)" all ffmajor)
-                     (unless (string=? #$major-version
-                                       (string-trim-both ffmajor))
-                       ;; The makeicecat script cannot be expected to work
-                       ;; properly on a different version of Firefox, even if
-                       ;; no errors occur during execution.
-                       (error "makeicecat major version mismatch"))
-                     (string-append "readonly FFMAJOR=" #$major-version "\n"))
-                    (("^readonly FFMINOR=.*")
-                     (string-append "readonly FFMINOR=" #$minor-version "\n"))
-                    (("^readonly FFSUB=.*")
-                     (string-append "readonly FFSUB=" #$sub-version "\n"))
-                    (("^readonly DATADIR=.*")
-                     "readonly DATADIR=/tmp/gnuzilla/data\n")
-                    (("^readonly SOURCEDIR=.*")
-                     (string-append "readonly SOURCEDIR=" icecat-dir "\n"))
-                    (("/bin/sed")
-                     #+(file-append (canonical-package sed) "/bin/sed"))))
-
-                (format #t "Unpacking upstream firefox tarball...~%")
-                (force-output)
-                (invoke "tar" "xf" #+upstream-firefox-source)
-                (rename-file firefox-dir icecat-dir)
-
-                (with-directory-excursion icecat-dir
-                  (format #t "Populating l10n directory...~%")
-                  (force-output)
-                  (mkdir "l10n")
-                  (with-directory-excursion "l10n"
-                    (for-each
-                     (lambda (locale)
-                       (let ((locale-dir (string-append #+mozilla-l10n "/"
-                                                        locale)))
-                         (format #t "  ~a~%" locale)
-                         (force-output)
-                         (copy-recursively locale-dir locale
-                                           #:log (%make-void-port "w"))
-                         (for-each make-file-writable (find-files locale))
-                         (with-directory-excursion locale
-                           (mkdir-p "browser/chrome/browser/preferences")
-                           (call-with-output-file "browser/chrome/browser/\
-preferences/advanced-scripts.dtd"
-                             (lambda (port) #f)))))
-                     '#+%icecat-locales)
-                    (copy-recursively #+mozilla-compare-locales
-                                      "compare-locales"
-                                      #:log (%make-void-port "w"))
-                    (delete-file "compare-locales/.gitignore")))
-
-                (format #t "Running makeicecat script...~%")
-                (force-output)
-                (invoke "bash" "/tmp/gnuzilla/makeicecat")
-
-                (format #t "Packing IceCat source tarball...~%")
-                (force-output)
-                (setenv "ZSTD_NBTHREADS" (number->string (parallel-job-count)))
-                (invoke "tar" "cfa" #$output
-                        ;; Avoid non-determinism in the archive.  We set the
-                        ;; mtime of files in the archive to early 1980 because
-                        ;; the build process fails if the mtime of source
-                        ;; files is pre-1980, due to the creation of zip
-                        ;; archives.
-                        "--mtime=@315619200" ; 1980-01-02 UTC
-                        "--owner=root:0"
-                        "--group=root:0"
-                        "--sort=name"
-                        icecat-dir)))))))))
-
-(define %icedove-build-id "20250916000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-build-id "20251112000000") ;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.3.0")
+(define %icedove-version "140.5.0")

 ;; Provides the "comm" folder which is inserted into the icecat source.
 ;; Avoids the duplication of Icecat's source tarball.  Pick the changeset that
@@ -1413,11 +1255,11 @@ preferences/advanced-scripts.dtd"
    (method hg-fetch)
    (uri (hg-reference
          (url "https://hg.mozilla.org/releases/comm-esr140")
-          (changeset "0a019f4060541a15af8be50c4d923aebe6b9ccb2")))
+          (changeset "6a3011b7161c6f3a36d5116f2608d51b19fb4d58")))
    (file-name (string-append "thunderbird-" %icedove-version "-checkout"))
    (sha256
     (base32
-      "00m2xzb1mvyllg31yrz7kw0m89c28b55cdd486mbk0k6xwv2gm8m"))
+      "0n94yznvvha12xri2m9p0jqd7hwcb8s7lgakfhvz3brp3ivqphn3"))
    (patches (search-patches "icedove-observer-fix.patch"))))

 ;;; To regenerate, see the `format-locales' helper defined above.
@@ -1492,7 +1334,8 @@ preferences/advanced-scripts.dtd"

 (define thunderbird-comm-l10n
  ;; The commit to use can be found in the mail/locales/l10n-changesets.json
-  ;; file in Thunderbird's source.
+  ;; 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")
         (revision "0")
         (version (git-version %icedove-version revision commit)))
@@ -1527,7 +1370,7 @@ preferences/advanced-scripts.dtd"
               ;; Extract the base Icecat tarball, renaming its top-level
               ;; directory.
               (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",")
-                       "-xf" #$icecat-140.3-source)
+                       "-xf" #$icecat-source)
               (chdir #$name)

               ;; Merge the Thunderdbird localization data.
@@ -1797,7 +1640,9 @@ ca495991b7852b855"))
                      "ac_add_options --with-libclang-path="
                      #$(this-package-native-input "clang") "/lib\n"
                      "ac_add_options --with-system-bz2\n"
-                      "ac_add_options --with-system-icu\n"
+                      ;; FIXME: Causes breakage (see:
+                      ;; <https://codeberg.org/guix/guix/issues/3166>)
+                      ;; "ac_add_options --with-system-icu\n"
                      "ac_add_options --with-system-jpeg\n"
                      "ac_add_options --with-system-libevent\n"
                      "ac_add_options --with-system-nspr\n"
@@ -1872,12 +1717,14 @@ ca495991b7852b855"))
                     (pciutils #$(this-package-input "pciutils"))
                     (pciutils-lib (string-append pciutils "/lib"))
                     (libva #$(this-package-input "libva"))
-                     (libva-lib (string-append libva "/lib")))
+                     (libva-lib (string-append libva "/lib"))
+                     (libotr #$(this-package-input "libotr"))
+                     (libotr-lib (string-append libotr "/lib")))
                (wrap-program (car (find-files lib "^icedove$"))
                  `("XDG_DATA_DIRS" prefix (,gtk-share))
                  `("LD_LIBRARY_PATH" prefix
-                    (,pulseaudio-lib ,eudev-lib ,libnotify-lib ,gpgme-lib
-                     ,mesa-lib ,libva-lib ,pciutils-lib)))))))))
+                    ( ,pulseaudio-lib ,eudev-lib ,libnotify-lib ,gpgme-lib
+                      ,mesa-lib ,libva-lib ,libotr-lib ,pciutils-lib)))))))))
    (inputs
     (list alsa-lib
           bash-minimal
@@ -1893,13 +1740,16 @@ ca495991b7852b855"))
           gpgme
           gtk+
           hunspell
-           icu4c-77
+           ;; FIXME: Causes breakage (see:
+           ;; <https://codeberg.org/guix/guix/issues/3166>).
+           ;;icu4c-77
           libcanberra
           libevent
           libffi
           libgnome
           libjpeg-turbo
           libnotify
+           libotr
           libpng-apng
           libva
           libvpx
@@ -99,6 +99,30 @@ the @code{c2go} tool at
 eStargz} - a lazily-pullable image format.")
    (license license:asl2.0)))

+(define-public go-github-com-cpuguy83-tar2go
+  (package
+    (name "go-github-com-cpuguy83-tar2go")
+    (version "0.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/cpuguy83/tar2go")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0vag88n77kfmb4msygkyyywcjyxlmjbsx4sqnhmi92jcb8bh93bb"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/cpuguy83/tar2go"))
+    (home-page "https://github.com/cpuguy83/tar2go")
+    (synopsis "Tar files interfaces for Golang")
+    (description
+     "This package defines basic interfaces to handle tar files.  It is similar
+to @url{https://pkg.go.dev/io/fs#FS, fs.FS}, but for tar files.")
+    (license license:expat)))
+
 (define-public go-github-com-datadog-zstd
  (package
    (name "go-github-com-datadog-zstd")
@@ -1806,6 +1806,36 @@ implementations are described in \"Fast SHA-256 Implementations on Intel
 Architecture Processors\" by J. Guilford et al.")
    (license license:asl2.0)))

+;; XXX: Deprecated in upstream: This repository has been archived by the owner
+;; on Jul 22, 2024. It is now read-only.
+;; Consider to remove when nothing is depend on it.
+(define-public go-github-com-mitchellh-hashstructure-v2
+  (package
+    (name "go-github-com-mitchellh-hashstructure-v2")
+    (version "2.0.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/mitchellh/hashstructure")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0yyr1igvyv7dzjxs9hbwk7qhshwxys0hq59sy2g2a46hjgi311iv"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/mitchellh/hashstructure/v2"))
+    (home-page "https://github.com/mitchellh/hashstructure")
+    (synopsis "Unique hash value for arbitrary values in Go")
+    (description
+     "This package is a Go library for creating a unique hash value for
+arbitrary values in Go. This can be used to key values in a hash (for use in a
+map, set, etc.) that are complex.  The most common use case is comparing two
+values without sending data across the network, caching values
+locally (de-dup), and so on.")
+    (license license:expat)))
+
 (define-public go-github-com-mr-tron-base58
  (package
    (name "go-github-com-mr-tron-base58")
@@ -2396,6 +2426,35 @@ Boneh and Victor Shoup's cryptography book} (pg 789, PAKE2 protocol).")
 seed} Go's random number generator (if possible).")
    (license license:expat)))

+(define-public go-github-com-serialx-hashring
+  (package
+    (name "go-github-com-serialx-hashring")
+    (version "0.0.0-20200727003509-22c0c7ab6b1b")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/serialx/hashring")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1dbqc69z6hjqvvbbls97cizb3rixil67jq37fnjw2pkf0zhs9i4q"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "-vet=off")    ;Go@1.24 forces vet, but tests are not ready yet.
+      #:import-path "github.com/serialx/hashring"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (home-page "https://github.com/serialx/hashring")
+    (synopsis "Consistent hashing for Golang")
+    (description
+     "This package implements consistent hashing that can be used when the
+ number of server nodes increase or decrease (like in memcached).  The hashing
+ring is built using the same algorithm as libketama.")
+    (license license:expat)))
+
 (define-public go-github-com-shadowsocks-go-shadowsocks2
  (package
    (name "go-github-com-shadowsocks-go-shadowsocks2")
@@ -202,6 +202,31 @@ and GCC’s decimal extension.")
         (package-arguments go-github-com-cockroachdb-apd)
       ((#:import-path _) "github.com/cockroachdb/apd/v3")))))

+(define-public go-github-com-google-go-intervals
+  (package
+    (name "go-github-com-google-go-intervals")
+    (version "0.0.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/google/go-intervals")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0v9i46g1vdbyinagj94jvaibw4bpgh2l9f9p5268wg6msf761jm9"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/google/go-intervals"))
+    (home-page "https://github.com/google/go-intervals")
+    (synopsis "Operations on 1-dimensional intervals for Golang")
+    (description
+     "This package provides utilities for performing set operations on
+1-dimensional intervals, such as time ranges.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-johncgriffin-overflow
  (package
    (name "go-github-com-johncgriffin-overflow")
@@ -77,6 +77,7 @@
  #:use-module (gnu packages golang-compression)
  #:use-module (gnu packages golang-crypto)
  #:use-module (gnu packages golang-xyz)
+  #:use-module (gnu packages linux)
  #:use-module (gnu packages prometheus)
  #:use-module (gnu packages specifications)
  #:use-module (gnu packages tls)
@@ -1758,6 +1759,38 @@ differentiate between installs of Mozilla software in @code{installs.ini} and
@code{profiles.ini}.")
    (license license:expat)))

+(define-public go-github-com-buger-jsonparser
+  (package
+    (name "go-github-com-buger-jsonparser")
+    (version "1.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/buger/jsonparser")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0qv2lsh2biwxn927941gqiv5pqg7n4v58j0i536pjp7pr17pq7dp"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/buger/jsonparser"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-benchmark
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (delete-file-recursively "benchmark")))))))
+    (home-page "https://github.com/buger/jsonparser")
+    (synopsis
+     "Alternative JSON parser for Golang")
+    (description
+     "This package provides an alternative JSON parser for Go.  It does not
+require to know the structure of the payload (eg.  create structs), and allows
+accessing fields by providing the path to them.")
+    (license license:expat)))
+
 (define-public go-github-com-caddyserver-certmagic
  (package
    (name "go-github-com-caddyserver-certmagic")
@@ -2682,6 +2715,37 @@ configure network interfaces in Linux containers, along with a number of
 supported plugins.")
    (license license:asl2.0)))

+(define-public go-github-com-coreos-go-iptables
+  (package
+    (name "go-github-com-coreos-go-iptables")
+    (version "0.8.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/coreos/go-iptables")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xxzqz9np93d8iig5dwjjpb78pqdj74zr91qb11r7g30nkcak5sw"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:tests? #f ;tests need access to iptables
+      #:import-path "github.com/coreos/go-iptables"))
+    (home-page "https://github.com/coreos/go-iptables")
+    (synopsis "Wrapper around iptables utility for Golang")
+    (description
+     "This package provides Go bindings for iptables utility.  In-kernel
+netfilter does not have a good userspace API. The tables are manipulated via
+setsockopt that sets/replaces the entire table.  Changes to existing table
+need to be resolved by userspace code which is difficult and error-prone.
+Netfilter developers heavily advocate using iptables utlity for programmatic
+manipulation.  go-iptables wraps invocation of iptables utility with functions
+to append and delete rules; create, clear and delete chains.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-coreos-go-oidc
  (package
    (name "go-github-com-coreos-go-oidc")
@@ -2794,6 +2858,57 @@ Features:
@end itemize")
    (license license:expat)))

+(define-public go-github-com-danielgtaylor-huma-v2
+  (package
+    (name "go-github-com-danielgtaylor-huma-v2")
+    (version "2.34.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/danielgtaylor/huma")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1rwmyxihrdznfn6iqxrb4lmlfijblapnpxavmcgavylixwigyrdk"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/danielgtaylor/huma/v2"
+      #:test-flags
+      ;; Tests require local network setup.
+      #~(list "-skip" "TestFeatures|TestAdapters/go|ExampleResolver")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-examples
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (delete-file-recursively "examples")))))))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-danielgtaylor-shorthand-v2
+           go-github-com-evanphx-json-patch-v5
+           go-github-com-fxamacker-cbor-v2
+           go-github-com-gin-gonic-gin
+           go-github-com-go-chi-chi-v5
+           go-github-com-gofiber-fiber-v2
+           go-github-com-google-uuid
+           go-github-com-gorilla-mux
+           go-github-com-julienschmidt-httprouter
+           go-github-com-labstack-echo-v4
+           go-github-com-spf13-cobra
+           go-github-com-spf13-pflag
+           go-github-com-uptrace-bunrouter))
+    (home-page "https://github.com/danielgtaylor/huma")
+    (synopsis "REST/HTTP API Framework for Golang")
+    (description
+     "This package provides a framework for building REST APIs in Go.  It is
+designed to generate @code{OpenAPI} 3.1 specifications and JSON Schema
+documents describing the API and providing a quick & easy way to generate
+docs, mocks, SDKs, CLI clients, and more.")
+    (license license:expat)))
+
 (define-public go-github-com-datadog-datadog-go
  (package
    (name "go-github-com-datadog-datadog-go")
@@ -5591,6 +5706,57 @@ standard @code{net/http} client library and exposes nearly the same public
 API.")
    (license license:mpl2.0)))

+(define-public go-github-com-hashicorp-serf
+  (package
+    (name "go-github-com-hashicorp-serf")
+    (version "0.10.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/hashicorp/serf")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0q9rismcpd5ci5zg6aq5b3y53x4j90fpdsvfc5jjh6hqfnxi0hzj"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:test-flags
+      #~(list "-skip"
+              (string-join
+               ;; panic: runtime error: invalid memory address or nil pointer
+               ;; dereference
+               (list "TestCommandRun_mDNS"
+                     ;; [ERR] agent: Error invoking script ...  fork/exec
+                     ;; /bin/sh: no such file or directory
+                     "TestScriptEventHandler"
+                     "TestScriptUserEventHandler"
+                     "TestScriptQueryEventHandler"
+                     "TestSnapshotter_forceCompact"
+                     ;; err: Unix syslog delivery error
+                     "TestSyslogFilter")
+               "|"))
+      #:import-path "github.com/hashicorp/serf"))
+    (propagated-inputs
+     (list go-github-com-armon-circbuf
+           go-github-com-hashicorp-go-metrics
+           go-github-com-hashicorp-go-msgpack-v2
+           go-github-com-hashicorp-go-syslog
+           go-github-com-hashicorp-logutils
+           go-github-com-hashicorp-mdns
+           go-github-com-hashicorp-memberlist
+           go-github-com-mitchellh-cli
+           go-github-com-mitchellh-mapstructure
+           go-github-com-ryanuber-columnize))
+    (home-page "https://github.com/hashicorp/serf")
+    (synopsis "Service discovery and orchestration for Golang")
+    (description
+     "Serf is a decentralized solution for service discovery and orchestration
+that is lightweight, highly available, and fault tolerant.")
+    (license license:mpl2.0)))
+
 (define-public go-github-com-hashicorp-go-sockaddr
  (package
    (name "go-github-com-hashicorp-go-sockaddr")
@@ -5637,6 +5803,42 @@ API.")
 types and related helper functions.")
    (license license:mpl2.0)))

+(define-public go-github-com-hashicorp-mdns
+  (package
+    (name "go-github-com-hashicorp-mdns")
+    (version "1.0.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/hashicorp/mdns")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pl9b4h46vzkxsxg1sq9g01y4cmxwfcy07a4v3r5c5b125p57fg6"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/hashicorp/mdns"
+      #:test-flags
+      #~(list "-skip"
+              (string-join
+               ;; err: no multicast listeners could be started
+               (list "TestServer_StartStop"
+                     "TestServer_Lookup")
+               "|"))))
+    (propagated-inputs
+     (list go-github-com-miekg-dns
+           go-golang-org-x-net))
+    (home-page "https://github.com/hashicorp/mdns")
+    (synopsis "Simple mDNS client/server library in Golang")
+    (description
+     "This package is a simple @acronym{mDNS,Multicast Domain Name Service}
+client/server library in Go. @code{mDNS} can be used to discover services on
+the local network without the use of an authoritative DNS server.  This
+enables peer-to-peer discovery.")
+    (license license:expat)))
+
 (define-public go-github-com-hashicorp-memberlist
  (package
    (name "go-github-com-hashicorp-memberlist")
@@ -8787,6 +8989,47 @@ multistream-select protocol.  The protocol is defined at
 Object Storage / Rackspace Cloud Files.")
    (license license:expat)))

+(define-public go-github-com-networkplumbing-go-nft
+  (package
+    (name "go-github-com-networkplumbing-go-nft")
+    (version "0.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/networkplumbing/go-nft")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1gx0xh9llgi600v6qacnaxwk3j0kmmwk7d2hm9j5jpmcm8whvp2w"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/networkplumbing/go-nft"
+      #:test-flags
+      #~(list "-skip" (string-join
+                       ;; Root access is required to pass these tests.
+                       (list "TestConfig/#00"
+                             "TestConfig/#01"
+                             "TestConfig/#02"
+                             "TestConfig/#03"
+                             "TestNATExamples/#00"
+                             "TestNftlib/#00"
+                             "TestNoMacSpoofingExample/#00")
+                       "|"))))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list nftables))
+    (home-page "https://github.com/networkplumbing/go-nft")
+    (synopsis "NFT utility bindings for Golang")
+    (description
+     "This package provides Go bindings for @command{nft} utility.
+go-nft wraps invocation of the @command{nft} utility with functions to append
+and delete rules; create, clear and delete tables and chains.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-nrdcg-goinwx
  (package
    (name "go-github-com-nrdcg-goinwx")
@@ -11834,6 +12077,59 @@ extract data from those paths.")
 encoding library for the MessagePack, CBOR, JSON and the Binc formats.")
    (license license:expat)))

+(define-public go-github-com-uptrace-bunrouter
+  (package
+    (name "go-github-com-uptrace-bunrouter")
+    (version "1.0.23")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/uptrace/bunrouter")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1q02f9bmz7qrwd6j7kdlxsskwapcrpvngkiw28dwf86zikzfnwxa"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            ;; Submodules with their own go.mod files and packaged separately:
+            ;;
+            ;; - github.com/uptrace/bunrouter/extra/basicauth
+            ;; - github.com/uptrace/bunrouter/extra/bunrouterotel
+            ;; - github.com/uptrace/bunrouter/extra/reqlog
+            (delete-file-recursively "extra")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/uptrace/bunrouter"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-examples
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (delete-file-recursively "example")))))))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (home-page "https://github.com/uptrace/bunrouter")
+    (synopsis "HTTP router for Golang")
+    (description
+     "BunRouter is a fast HTTP router for Go with unique combination of features:
+
+@itemize
+@item middlewares allow to extract common operations from HTTP handlers into
+reusable functions
+@item error handling allows to further reduce the size of HTTP handlers by
+handling errors in middlewares
+@item routes priority enables meaningful matching priority for routing rules:
+first static nodes, then named nodes, lastly wildcard nodes
+@item @code{net/http} compatible API which means using minimal API without
+constructing huge wrappers that try to do everything: from serving static
+files to XML generation (for example, @code{gin.Context} or
+@code{echo.Context})
+@end itemize")
+    (license license:expat)))
+
 (define-public go-github-com-urfave-negroni
  (package
    (name "go-github-com-urfave-negroni")
@@ -14633,6 +14929,43 @@ be used as both a binary and a library.")
 protocol.")
    (license license:isc)))

+(define-public go-sigs-k8s-io-knftables
+  (package
+    (name "go-sigs-k8s-io-knftables")
+    (version "0.0.19")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/kubernetes-sigs/knftables")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1dx0flrdhxbvk8wxgk90px91gx731qjq4j2di3nyfnn2sp3yfz1d"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "sigs.k8s.io/knftables"
+      ;; Tests are not copatible with Go 1.24+.
+      #:test-flags #~(list "-vet=off")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-tests
+            (lambda* (#:key import-path #:allow-other-keys)
+              (substitute* (string-append "src/" import-path "/exec_test.go")
+                (("/bin/true") (which "true"))
+                (("/bin/false") (which "false"))))))))
+    (native-inputs
+     (list go-github-com-google-go-cmp
+           go-github-com-lithammer-dedent))
+    (home-page "https://github.com/kubernetes-sigs/knftables")
+    (synopsis "Golang nftables library for Kubernetes")
+    (description
+     "This package provides nftables bindings in Go. It is not intended to
+support arbitrary use cases, but instead specifically focuses on supporting
+Kubernetes components which are using nftables.")
+    (license license:asl2.0)))
+
 ;;;
 ;;; Executables:
 ;;;
@@ -1431,6 +1431,34 @@ strings for a safe use as command line arguments in the most common POSIX
 shells.")
    (license license:expat)))

+(define-public go-github-com-alexflint-go-filemutex
+  (package
+    (name "go-github-com-alexflint-go-filemutex")
+    (version "1.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/alexflint/go-filemutex")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0kx31qar8265jrvdvwja1snlfy6kxpaay654lqqsalp1spgrcazp"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/alexflint/go-filemutex"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (home-page "https://github.com/alexflint/go-filemutex")
+    (synopsis "File Mutex that synchronizes across processes")
+    (description
+     "@code{FileMutex} is similar to @code{sync.RWMutex}, but also
+synchronizes across processes.")
+    (license license:expat)))
+
 (define-public go-github-com-alsm-ioprogress
  (package
    (name "go-github-com-alsm-ioprogress")
@@ -1546,6 +1574,30 @@ handlers, log levels, zero-allocation, scopes, custom formatting, and
 environment and runtime configuration.")
    (license license:mpl2.0)))

+(define-public go-github-com-anchore-go-struct-converter
+  (package
+    (name "go-github-com-anchore-go-struct-converter")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/anchore/go-struct-converter")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jvhq19wd061wmfsskqgh3hkm5p5a5wzpzlivzyd97vzrj2y0hn3"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/anchore/go-struct-converter"))
+    (home-page "https://github.com/anchore/go-struct-converter")
+    (synopsis "Struct converter for Golang")
+    (description
+     "This package provides a set of conversion utilities to migrate between
+different versioned Go structs.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-andreasbriese-bbloom
  (package
    (name "go-github-com-andreasbriese-bbloom")
@@ -5499,6 +5551,71 @@ credentials as well as Go structures for convenient access to the credential
 data.")
    (license license:expat)))

+(define-public go-github-com-danielgtaylor-mexpr
+  (package
+    (name "go-github-com-danielgtaylor-mexpr")
+    (version "1.9.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/danielgtaylor/mexpr")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1kiya25njhy5k9jpk79dz07bwzl33x19mjl4h1sjmdh98aw41z3r"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/danielgtaylor/mexpr"
+      #:test-flags
+      #~(list "-vet=off")))  ;Go@1.24 forces vet, but tests are not ready yet.
+    (home-page "https://github.com/danielgtaylor/mexpr")
+    (synopsis " Micro expression parser library for Golang")
+    (description
+     "Package mexpr provides a simple expression parser, originally built
+for use in templating languages (e.g. for-loop variable selection,
+if-statement evaluation) so is minimal in what it supports by design.")
+    (license license:expat)))
+
+(define-public go-github-com-danielgtaylor-shorthand-v2
+  (package
+    (name "go-github-com-danielgtaylor-shorthand-v2")
+    (version "2.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/danielgtaylor/shorthand")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "17s4jjzfz10lavwnir8cd6nwsf15hrm38y87f7w2pi9hv40x7vn9"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            ;; Submodules with their own go.mod files and packaged separately:
+            ;;
+            ;; - github.com/danielgtaylor/shorthand/cmd/j
+            (delete-file-recursively "cmd")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/danielgtaylor/shorthand/v2"
+      #:test-flags
+      #~(list "-vet=off")))  ;Go@1.24 forces vet, but tests are not ready yet.
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-fxamacker-cbor-v2
+           go-github-com-danielgtaylor-mexpr))
+    (home-page "https://github.com/danielgtaylor/shorthand")
+    (synopsis "Structured Data Shorthand Syntax")
+    (description
+     "Shorthand is a superset and friendlier variant of JSON designed with
+several use-cases in mind..")
+    (license license:expat)))
+
 (define-public go-github-com-dannav-hhmmss
  (package
    (name "go-github-com-dannav-hhmmss")
@@ -7598,6 +7715,33 @@ Please vendor the library as it might change in future versions.")
 font files in your system's user and system font directories.")
    (license license:expat)))

+(define-public go-github-com-fluent-fluent-logger-golang
+  (package
+    (name "go-github-com-fluent-fluent-logger-golang")
+    (version "1.10.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/fluent/fluent-logger-golang")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1cg53gh4d0z9nl7bldan5whh9wrgyiahnkl0cxhyjm0w13064ck0"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/fluent/fluent-logger-golang/fluent"))
+    (propagated-inputs
+     (list go-github-com-tinylib-msgp))
+    (home-page "https://github.com/fluent/fluent-logger-golang")
+    (synopsis "Structured event logger for Golang")
+    (description
+     "This package provides a structured event logger for Golang developed for
+@url{https://github.com/fluent/fluentd, fluentd}.")
+    (license license:asl2.0)))
+
 ;; XXX: This repository has been archived by the owner on Nov 9, 2017. It is
 ;; now read-only.
 (define-public go-github-com-flynn-archive-go-shlex
@@ -9665,6 +9809,36 @@ according @@url{https://rfc-editor.org/rfc/rfc8785.html, RFC 8785}.")
 with some code optimisations to make it run faster.")
    (license license:bsd-3)))

+(define-public go-github-com-graylog2-go-gelf
+  (package
+    (name "go-github-com-graylog2-go-gelf")
+    (version "0.0.0-20170811154226-7ebf4f536d8f")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/Graylog2/go-gelf")
+              (commit (go-version->git-ref version
+                                           #:subdir "gelf"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0a51xrh798y7712kmpflh74jqhvrvy7n6rvr83b17w86n56z9ba7"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/Graylog2/go-gelf/gelf"
+      #:unpack-path "github.com/Graylog2/go-gelf"))
+    (home-page "https://github.com/Graylog2/go-gelf")
+    (synopsis "GELF library and writer for Golang")
+    (description
+     "This package is a @acronym{Graylog Extended Log Format,GELF}
+(@url{https://go2docs.graylog.org/current/home.htm, specification}) library
+for Go. GELF is an application-level logging protocol that avoids many of the
+shortcomings of @code{syslog}.  While it can be run over any stream or
+datagram transport protocol, it has special support to allow long messages to
+be split over multiple datagrams.")
+    (license license:expat)))
+
 (define-public go-github-com-guptarohit-asciigraph
  (package
    (name "go-github-com-guptarohit-asciigraph")
@@ -10287,6 +10461,29 @@ expressing configuration which is easy for both humans and machines to read.")
    (home-page "https://github.com/hashicorp/hcl")
    (license license:mpl2.0)))

+(define-public go-github-com-hashicorp-logutils
+  (package
+    (name "go-github-com-hashicorp-logutils")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/hashicorp/logutils")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "076wf4sh5p3f953ndqk1cc0x7jhmlqrxak9953rz79rcdw77rjvv"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/hashicorp/logutils"))
+    (home-page "https://github.com/hashicorp/logutils")
+    (synopsis "Utilities for better logging for Golang")
+    (description
+     "Package logutils augments the standard log package with levels.")
+    (license license:mpl2.0)))
+
 (define-public go-github-com-hdrhistogram-hdrhistogram-go
  (package
    (name "go-github-com-hdrhistogram-hdrhistogram-go")
@@ -14693,6 +14890,48 @@ requests.  Browse requests are not supported yet.")
     "The datacounter package provides counters for Go readers and writers.")
    (license license:expat)))

+(define-public go-github-com-mistifyio-go-zfs-v3
+  (package
+    (name "go-github-com-mistifyio-go-zfs-v3")
+    (version "3.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/mistifyio/go-zfs")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "19vkrfasps8ixkkzxa2kqfqk0gn52zmc2pkx0mfiy6mjq62b4wl1"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/mistifyio/go-zfs"
+      #:test-flags
+      ;; The following tests need zpool executable
+      #~(list "-skip" (string-join
+                       (list "TestDatasets"
+                             "TestChildren"
+                             "TestClone"
+                             "TestCreateFilesystemWithProperties"
+                             "TestDatasetGetProperty"
+                             "TestDiff"
+                             "TestFilesystems"
+                             "TestListZpool"
+                             "TestRollback"
+                             "TestSendSnapshot"
+                             "TestSnapshot"
+                             "TestSnapshots"
+                             "TestVolumes")
+                       "|"))))
+    (propagated-inputs
+     (list go-github-com-google-uuid))
+    (home-page "https://github.com/mistifyio/go-zfs")
+    (synopsis "ZFS wrapper for Golang")
+    (description
+     "This package provides wrappers around the ZFS command line tools.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-mitchellh-cli
  (package
    (name "go-github-com-mitchellh-cli")
@@ -15053,6 +15292,65 @@ to help free up more global locks to handle other tasks.")
 names.")
    (license license:asl2.0)))

+(define-public go-github-com-moby-profiles-apparmor
+  (package
+    (name "go-github-com-moby-profiles-apparmor")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/moby/profiles")
+              (commit (go-version->git-ref version
+                                           #:subdir "apparmor"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1hgczgfxn41gyjljmfr1qaiql6k10xkbc5zpkd7vzj5l52lw7n13"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/moby/profiles/apparmor"
+      #:unpack-path "github.com/moby/profiles"))
+    (home-page "https://github.com/moby/profiles")
+    (synopsis "Apparmor support for Golang")
+    (description
+     "This package provides apparmor support for Go.  AppArmor is a Linux
+kernel security module that allows the system administrator to restrict
+program's capabilities such as network access, raw socket access, and the
+permission to read, write, or execute files")
+    (license license:asl2.0)))
+
+(define-public go-github-com-moby-profiles-seccomp
+  (package
+    (name "go-github-com-moby-profiles-seccomp")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/moby/profiles")
+              (commit (go-version->git-ref version
+                                           #:subdir "seccomp"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1hgczgfxn41gyjljmfr1qaiql6k10xkbc5zpkd7vzj5l52lw7n13"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/moby/profiles/seccomp"
+      #:unpack-path "github.com/moby/profiles"))
+    (propagated-inputs
+     (list go-github-com-opencontainers-runtime-spec
+           go-golang-org-x-sys))
+    (home-page "https://github.com/moby/profiles")
+    (synopsis "Seccomp support for Golang")
+    (description
+     "@code{seccomp} is a computer security facility in the Linux kernel.  It
+ allows a process to make a one-way transition into a secure state where it
+cannot make any system calls except @code{exit}, @code{sigreturn}, @code{read}
+and @code{write} to already-open file descriptors.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-moby-pubsub
  (package
    (name "go-github-com-moby-pubsub")
@@ -18245,6 +18543,48 @@ without configuration, but if desired, everything can be customized down to the
 smallest detail.")
    (license license:expat)))

+;; XXX: This repository was archived by the owner on Mar 18, 2019. It is
+;; now read-only.
+(define-public go-github-com-racksec-srslog
+  (package
+    (name "go-github-com-racksec-srslog")
+    (version "0.0.0-20180709174129-a4725f04ec91")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/RackSec/srslog")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1fg5nxj8ps62b3yrw5nqskrps1zqhr7sry86fz0zysds81al8pmi"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/RackSec/srslog"
+      #:test-flags
+      #~(list "-skip" (string-join
+                       ;; failed to dial: Unix syslog delivery error 
+                       (list "TestUnixDialer"
+                             "TestDial"
+                             "TestNew"
+                             "TestNewLogger"
+                             ;; failed to dial: tls: failed to verify
+                             ;; certificate: x509: certificate has expired or
+                             ;; is not yet valid: current time
+                             ;; 2025-10-29T23:15:00Z is after
+                             ;; 2018-12-31T00:00:00Z
+                             "TestTLSDialer"
+                             "TestTLSCertWrite"
+                             "TestTLSPathWrite")
+                       "|"))))
+    (home-page "https://github.com/RackSec/srslog")
+    (synopsis "Replacement for Golang's @code{log/syslog} with TLS support")
+    (description
+     "This package is a drop-in replacement for the Golang standard library
+@code{log/syslog}, but with support for TLS.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-rakyll-statik
  (package
    (name "go-github-com-rakyll-statik")
@@ -19879,6 +20219,86 @@ converting them to the @code{time.Duration} type.")
 implementation.")
    (license license:expat)))

+(define-public go-github-com-spdx-gordf
+  (package
+    (name "go-github-com-spdx-gordf")
+    (version "0.0.0-20250128162952-000978ccd6fb")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/spdx/gordf")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0almcq8p3sj0wbp3c276xdhva1imwnprvbd7klgfjnzlh11pllcw"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/spdx/gordf"
+      #:test-flags
+      #~(list "-vet=off"))) ;Go@1.24 forces vet, but tests are not ready yet.
+    (home-page "https://github.com/spdx/gordf")
+    (synopsis "RDF parser for Golang")
+    (description
+     "This package provides a parser for RDF files linearized using RDF/XML
+format.  It is used to represent the RDF files in memory and write back in
+possibly different formats like JSON and XML.")
+    (license license:expat)))
+
+(define-public go-github-com-spdx-tools-golang
+  (package
+    (name "go-github-com-spdx-tools-golang")
+    (version "0.5.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/spdx/tools-golang")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0pdcwb6hvv5zr5k844knpcgbhnm0zgpwaacd5cjahb196q6xpgbw"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:skip-build? #t
+      #:import-path "github.com/spdx/tools-golang"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-anchore-go-struct-converter
+           go-github-com-google-go-cmp
+           go-github-com-spdx-gordf
+           go-sigs-k8s-io-yaml))
+    (home-page "https://github.com/spdx/tools-golang")
+    (synopsis "Go source package to work with SPDX files")
+    (description
+     "This source package is a collection of utilities intended to make it
+easier for Go programs to work with @acronym{System Package Data Exchange,
+SPDX} files.  It currently works with files conformant to versions 2.1, 2.2
+and 2.3 of the @url{https://spdx.dev/specifications, SPDX specification} and
+provides the following packages:
+
+@itemize
+@item spdx - in-memory data model for the sections of an SPDX document
+@item tagvalue - tag-value document reader and writer
+@item rdf - RDF document reader
+@item json - JSON document reader and writer
+@item yaml - YAML document reader and writer
+@item builder - builds empty SPDX document (with hashes) for directory
+contents
+@item idsearcher - searches for SPDX short-form IDs and builds an SPDX
+document
+@item licensediff - compares concluded licenses between files in two packages
+@item reporter - generates basic license count report from an SPDX document
+@item spdxlib - various utility functions for manipulating SPDX documents in
+memory
+@item utils - various utility functions that support the other tools-golang
+packages
+@end itemize")
+    (license  license:cc-by4.0)))
+
 (define-public go-github-com-spf13-afero
  (package
    (name "go-github-com-spf13-afero")
@@ -20929,7 +21349,7 @@ query information regarding the number of CPUs available to the system.")
    (home-page "https://github.com/tkuchiki/go-timezone")
    (synopsis "Timezone utility for Golang")
    (description
-     "This package provides provides an utility for timezone manipulation,
+     "This package provides an utility for timezone manipulation,
 implementing the following features:

@itemize
@@ -20975,6 +21395,33 @@ structures using selector strings.  It's similar to @code{jq}/@code{yq}, but
 supports JSON, YAML, TOML, XML and CSV with zero runtime dependencies.")
    (license license:expat)))

+(define-public go-github-com-tonistiigi-go-archvariant
+  (package
+    (name "go-github-com-tonistiigi-go-archvariant")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/tonistiigi/go-archvariant")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1kmchhx374ahd9a7p0qx3gq9cffxfkkgq503q95ygya986xkgnjz"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/tonistiigi/go-archvariant"))
+    (home-page "https://github.com/tonistiigi/go-archvariant")
+    (synopsis "System's maximum compatibility version of Golang")
+    (description
+     "This Go package provides a functionality to determine the maximum
+compatibility version of the current system.  On x86-64 platforms it returns
+the maximum current microarchitecture level as defined in
+@url{https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels,
+Microarchitecture levels}.")
+    (license license:expat)))
+
 (define-public go-github-com-tonistiigi-go-csvvalue
  (package
    (name "go-github-com-tonistiigi-go-csvvalue")
@@ -21001,6 +21448,32 @@ many small values.  For multi-line CSV parsing, the standard library is
 recommended.")
    (license license:expat)))

+(define-public go-github-com-tonistiigi-dchapes-mode
+  (package
+    (name "go-github-com-tonistiigi-dchapes-mode")
+    (version "0.0.0-20250318174251-73d941a28323")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/tonistiigi/dchapes-mode")
+              (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0bs5jvq3045mspyq42pk3dliqgn3a975l30030abvggidnbxpggw"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/tonistiigi/dchapes-mode"))
+    (home-page "https://github.com/tonistiigi/dchapes-mode")
+    (synopsis "BSD's setmode and getmode for Golang")
+    (description
+     "Package @code{mode} provides a native Go implementation of BSD's
+setmode and getmode which can be used to modify the mode bits of an
+@code{os.FileMode} value based on a symbolic value as described by the Unix
+chmod command.")
+    (license license:bsd-2)))
+
 (define-public go-github-com-tonistiigi-units
  (package
    (name "go-github-com-tonistiigi-units")
@@ -24674,6 +25147,32 @@ kubernetes-independent packages supplementing the
@url{https://pkg.go.dev/std#stdlib,Go standard libs}.")
    (license license:asl2.0)))

+(define-public go-kernel-org-pub-linux-libs-security-libcap-cap
+  (package
+    (name "go-kernel-org-pub-linux-libs-security-libcap-cap")
+    (version "1.2.76")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.kernel.org/pub/scm/libs/libcap/libcap.git")
+              (commit (go-version->git-ref version
+                                           #:subdir "cap"))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0va0bkq5kxf0ccsdpw598vsmk4kdzhaafjvym0g5b2n49c5sn59b"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "kernel.org/pub/linux/libs/security/libcap/cap"
+      #:unpack-path "kernel.org/pub/linux/libs/security/libcap"))
+    (home-page "https://kernel.org/pub/linux/libs/security/libcap")
+    (synopsis "Linux userspace bindings for Golang")
+    (description
+     "This package provides all the Linux Capabilities userspace library API
+bindings in native Go.")
+    (license license:gpl2)))
+
 (define-public go-kernel-org-pub-linux-libs-security-libcap-psx
  (package
    (name "go-kernel-org-pub-linux-libs-security-libcap-psx")
@@ -25584,6 +26083,63 @@ package.")
    ;; License type does latterly says it' "UNLICENSE".
    (license license:unlicense)))

+(define-public go-oras-land-oras-go-v2
+  (package
+    (name "go-oras-land-oras-go-v2")
+    (version "2.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/oras-project/oras-go")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0y2cdpy13gfmjfdpqlcq4ss36avzvfjmmfadc82bawg8jwi0j2jk"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "oras.land/oras-go/v2"))
+    (propagated-inputs
+     (list go-github-com-opencontainers-go-digest
+           go-github-com-opencontainers-image-spec
+           go-golang-org-x-sync))
+    (home-page "https://oras.land/oras-go")
+    (synopsis "OCI artifacts management library for Golang")
+    (description
+     "@code{oras-go} is a Go library for managing OCI artifacts, compliant
+with the @url{https://github.com/opencontainers/image-spec, OCI Image Format
+Specification} and the
+@url{https://github.com/opencontainers/distribution-spec, OCI Distribution
+Specification}.  It provides unified APIs for pushing, pulling, and managing
+artifacts across OCI-compliant registries, local file systems, and in-memory
+stores.")
+    (license license:asl2.0)))
+
+(define-public go-resenje-org-singleflight
+  (package
+    (name "go-resenje-org-singleflight")
+    (version "0.4.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/janos/singleflight")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0by4pj1kvqjdv73p420mmj7787rdr2rzzzpg80gnj394i07m8gfq"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "resenje.org/singleflight"))
+    (home-page "https://github.com/janos/singleflight")
+    (synopsis "Duplicate function call suppression mechanism for Golang")
+    (description
+     "This package provides a duplicate function call suppression mechanism
+with support for context cancellation.")
+    (license license:bsd-3)))
+
 (define-public go-rsc-io-binaryregexp
  (package
    (name "go-rsc-io-binaryregexp")
@@ -1011,6 +1011,15 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                           (("package plugin_test")
                            (string-append "// +build !linux linux,!arm64\n\n"
                                           "package plugin_test")))))
+                     ((target-arm32?)
+                      ;; This test fails when run on aarch64-linux.
+                      #~((substitute* "src/cmd/link/internal/ld/elf_test.go"
+                           (("TestElfBindNow.*" all)
+                            (string-append
+                              all
+                              "        if runtime.GOARCH == \"arm\" {\n"
+                              "                t.Skipf(\"skipping; flaky on armhf\")\n"
+                              "        }\n")))))
                     (else (list #t)))))))))
    (properties
     `((compiler-cpu-architectures
@@ -1048,6 +1057,15 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                           (("package plugin_test")
                            (string-append "// +build !linux linux,!arm64\n\n"
                                           "package plugin_test")))))
+                     ((target-arm32?)
+                      ;; This test fails when run on aarch64-linux.
+                      #~((substitute* "src/cmd/link/internal/ld/elf_test.go"
+                           (("TestElfBindNow.*" all)
+                            (string-append
+                              all
+                              "        if runtime.GOARCH == \"arm\" {\n"
+                              "                t.Skipf(\"skipping; flaky on armhf\")\n"
+                              "        }\n")))))
                     (else (list #t)))))))))
    (native-inputs
     ;; Go 1.24 and later requires Go 1.22+ as the bootstrap toolchain.
@@ -1230,6 +1230,39 @@ basic geometries.")
    ;; https://gitlab.com/inkscape/inkscape/issues/784).
    (license license:gpl3+)))

+(define-public libxmi
+  (package
+    (name "libxmi")
+    (version "1.3")                     ;version bundled in plotutils
+    (source (origin
+              (method url-fetch)
+              ;; XXX: Use this Gentoo-maintained fork, which is the more
+              ;; up-to-date 1.3 version bundled with plotutils.
+              (uri (string-append "http://gentoo.osuosl.org/distfiles/65/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "04npjh8k2ipmpwflfivqchga5r2qw7qbhbyk9n6kgccsm3aaxwl6"))
+              (patches (search-patches "libxmi-gcc15.patch"
+                                       "libxmi-implicit.patch"))))
+    (build-system gnu-build-system)
+    (arguments (list #:configure-flags #~(list "--disable-static")
+                     #:phases #~(modify-phases %standard-phases
+                                  (add-before 'bootstrap 'force-bootstrap
+                                    (lambda _
+                                      (delete-file "configure"))))))
+    (native-inputs (list autoconf automake libtool))
+    (home-page "https://www.gnu.org/software/libxmi/libxmi.html")
+    (synopsis "Library for rasterizing 2-d vector graphics")
+    (description "GNU libxmi is a library for rasterizing 2D vector graphics for C and
+C++.  It supports drawing 2D primitives into a user-supplied matrix of pixels.
+It also supports the specification of sophisticated line styles such as
+multi-colored dashed patterns.  Filling and texturing polygons is also
+supported.")
+    ;; For the combined work, with some files (mi_*.c and mi_*.h) under X11
+    ;; and X11-style licenses.
+    (license license:gpl2+)))
+
 (define-public python-booleanoperations
  (package
    (name "python-booleanoperations")
@@ -1285,19 +1318,16 @@ Angus Johnson}.")
 (define-public pstoedit
  (package
    (name "pstoedit")
-    ;; Do not yet upgrade to 4.0.0, as its include file fails to compile for C
-    ;; project (see: https://github.com/reviczky/pstoedit/issues/2).
-    (version "4.00")
+    (version "4.02")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/"
                                  version "/pstoedit-" version ".tar.gz"))
              (sha256
               (base32
-                "1sk2mhrjgnlz4a1650p3qxrv6av6qc66ibmy48ckspx7mfp7snh7"))
+                "0bzpknndsf2cvsh1z90j6cx9mzqkb3m1ajdl52cavcn6s8rb922m"))
              (patches
               (search-patches "pstoedit-fix-gcc12.patch"
-                               "pstoedit-fix-plainC.patch"
                               "pstoedit-pkglibdir.patch"))))
    (build-system gnu-build-system)
    (arguments
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -143,7 +143,7 @@ is usually the formatter of \"man\" documentation pages.")
                     ("groff" ,groff)))

    (arguments
-     `(#:disallowed-references (,perl)
+     `(#:disallowed-references ,(list (this-package-native-input "perl"))

       #:configure-flags '("--with-doc=no")

@@ -446,7 +446,7 @@ the GStreamer multimedia framework.")
         "1016z0znl2j43n08rl19zdhfvfsgnmg44qh8fk6dr4qj481icrnw"))))
    (build-system meson-build-system)
    (arguments
-     (list #:disallowed-references (list python)
+     (list #:disallowed-references (list (this-package-native-input "python"))
           #:phases
           #~(modify-phases %standard-phases
               #$@%common-gstreamer-phases
@@ -1009,9 +1009,8 @@ application suites.")
 (define-public gtk+
  (package
    (inherit gtk+-2)
-    (replacement gtk+/fixed)
    (name "gtk+")
-    (version "3.24.49")
+    (version "3.24.51")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1020,7 +1019,7 @@ application suites.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0flsnh3f0l9v3y2hmnxz1h15nw1l12ixmiwcpiy1ywplrlgq4j00"))
+                "07vw0rani9d65px36fzzj7sprv5r48shyjdgzipkihzqaldd98yh"))
              (patches (search-patches
                        "gtk3-respect-GUIX_GTK3_PATH.patch"
                        "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
@@ -1083,7 +1082,7 @@ application suites.")
      #:modules '((guix build utils)
                  (guix build meson-build-system)
                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
-      #:disallowed-references (list xorg-server-for-tests)
+      #:disallowed-references (list (this-package-native-input "xorg-server"))
      #:configure-flags
      #~(list "-Dcloudproviders=true"   ;for cloud-providers support
              "-Dcolord=yes"            ;for color printing support
@@ -1099,22 +1098,22 @@ application suites.")
      #~(modify-phases %standard-phases
          (add-after 'unpack 'disable-failing-tests
            (lambda _
-                ;; These tests fail only in the containerized environment, for
-                ;; unknown reasons.
-                (substitute* "testsuite/gtk/meson.build"
-                  ((".*\\['defaultvalue'],.*") "")
-                  ((".*\\['objects-finalize',.*") ""))
-                ;; The 'flipping-icons.ui' and 'gtk-icontheme-sizing.ui' tests
-                ;; fail for unknown reasons (see:
-                ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7679>).
-                (substitute* "testsuite/reftests/meson.build"
-                  (("  'flipping-icons.ui',.*") "")
-                  (("  'gtk-icontheme-sizing.ui',.*") ""))
-                ;; This test fails just on i686-linux, for unknown reasons.
-                #$@(if (target-x86-32?)
-                       #~((substitute* "testsuite/reftests/meson.build"
-                            (("  'linear-gradient.ui',.*") "")))
-                       #~())))
+              ;; These tests fail only in the containerized environment, for
+              ;; unknown reasons.
+              (substitute* "testsuite/gtk/meson.build"
+                ((".*\\['defaultvalue'],.*") "")
+                ((".*\\['objects-finalize',.*") ""))
+              ;; The 'flipping-icons.ui' and 'gtk-icontheme-sizing.ui' tests
+              ;; fail for unknown reasons (see:
+              ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7679>).
+              (substitute* "testsuite/reftests/meson.build"
+                (("  'flipping-icons.ui',.*") "")
+                (("  'gtk-icontheme-sizing.ui',.*") ""))
+              ;; This test fails just on i686-linux, for unknown reasons.
+              #$@(if (target-x86-32?)
+                     #~((substitute* "testsuite/reftests/meson.build"
+                          (("  'linear-gradient.ui',.*") "")))
+                     #~())))
          (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
            (assoc-ref glib-or-gtk:%standard-phases
                       'generate-gdk-pixbuf-loaders-cache-file))
@@ -1138,25 +1137,8 @@ application suites.")
                                          "/share/applications")))))))
    (native-search-paths
     (list (search-path-specification
-            (variable "GUIX_GTK3_PATH")
-            (files '("lib/gtk-3.0")))))))
-
-(define-public gtk+/fixed
-  (let* ((base gtk+)
-         (source (package-source base)))
-    (package
-      (inherit base)
-      (version "3.24.51")
-      (source
-       (origin
-         (inherit source)
-         (uri (git-reference
-                (inherit (origin-uri source))
-                (commit version)))
-         (file-name (git-file-name (package-name base) version))
-         (sha256
-          (base32
-           "07vw0rani9d65px36fzzj7sprv5r48shyjdgzipkihzqaldd98yh")))))))
+             (variable "GUIX_GTK3_PATH")
+             (files '("lib/gtk-3.0")))))))

 (define-public gtk
  (package
@@ -685,6 +685,10 @@ pictures) for email addresses using the Libravatar specification.")
                               "/include/bash/include")
                ;; The '.a' file is useless.
                "--disable-static"
+
+                ;; Relax GCC 14 strictness.
+                "CFLAGS=-Wno-error=implicit-function-declaration"
+
                ;; Install 'lib/bash' as Bash 4.4 expects.
                (string-append "--libdir=" #$output "/lib/bash"))))
      (native-inputs
@@ -1180,7 +1184,7 @@ is not available for Guile 2.0.")
  (package
    (inherit guile-fibers-1.3)
    (name "guile-fibers")
-    (version "1.4.1")
+    (version "1.4.2")
    (source
     (origin (inherit (package-source guile-fibers-1.3))
             (file-name (git-file-name name version))
@@ -1189,7 +1193,7 @@ is not available for Guile 2.0.")
                    (commit (string-append "v" version))))
             (sha256
              (base32
-               "15ynxr3pfjscd6mz641zagv6i84jh9y65i5dnbb3j3q72j6bbvnb"))
+               "0qh0czz5qvk5mmrc8x2gmvl5psdfd22q2rhzj4jrpan6k3d55bl8"))
             (patches '())))
    (arguments
     (if (target-aarch64?)
@@ -1300,13 +1304,13 @@ is not available for Guile 2.0.")

 (define-public guile2.2-fibers
  (package
-    (inherit guile-fibers-1.1)
+    (inherit guile-fibers)
    (name "guile2.2-fibers")
    (inputs
-     (modify-inputs (package-inputs guile-fibers-1.1)
+     (modify-inputs (package-inputs guile-fibers)
       (replace "guile" guile-2.2)))
    (native-inputs
-     (modify-inputs (package-native-inputs guile-fibers-1.1)
+     (modify-inputs (package-native-inputs guile-fibers)
       (replace "guile" guile-2.2)))))

 (define-public guile-fibers-next
@@ -5863,6 +5867,33 @@ run SRFI 64 test suites.  It gives Automake insight into the individual
 tests being run, resulting clearer and more specific output.")
    (license license:gpl3+)))

+(define-public guile-run64
+  (package
+    (name "guile-run64")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://forge.systemreboot.net/run64/releases/run64-"
+                                  version ".tar.lz"))
+              (sha256
+               (base32
+                "0xwydln0i430i6c99waycsyhfy3i8cd1hkiv2xlchnqgwwi4il1a"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:make-flags #~(list (string-append "prefix=" #$output))
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))))
+    (native-inputs
+     (list lzip))
+    (home-page "https://forge.systemreboot.net/run64/")
+    (synopsis "SRFI-64 test runner for Scheme")
+    (description "run64 is a SRFI-64 runner.  It generates pretty, readable,
+colorful output featuring clear diffs between expected and actual values.
+run64 is meant to work with an SRFI-64 implementation, and is not an SRFI-64
+implementation in itself.")
+    (license license:gpl3+)))
+
 (define-public guile-uuid
  (package
    (name "guile-uuid")
@@ -7126,7 +7157,7 @@ The resulting QR codes can be rendered to ASCII art strings or to PNG images (us
 (define-public guile-hygguile
  (package
    (name "guile-hygguile")
-    (version "1.0.5")
+    (version "2.0.21")
    (source
     (origin
       (method git-fetch)
@@ -7135,7 +7166,7 @@ The resulting QR codes can be rendered to ASCII art strings or to PNG images (us
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0iwgbb2ym15l0iz91ycd7ikf42jnhdnzs786d9dc1p2d0fr2l962"))))
+        (base32 "04fpf46ibjb4x2qpzgwdhnjh7cjvzvn5fry0j4macdijhbwd59yf"))))
    (build-system guile-build-system)
    (native-inputs (list guile-3.0))
    (arguments
@@ -7146,7 +7177,7 @@ The resulting QR codes can be rendered to ASCII art strings or to PNG images (us
    (description
     "Hygguile is a library that allows you to create cozy web user-interfaces
 using Guile Scheme, by defining an expressive @acronym{DSL, domain-specific
-language}, and by leveraging the power of S-expressions, SXML and TailwindCSS.
+language}, and by leveraging the power of S-expressions, SXML and OliveCSS.

 The project aims to provide reusable, professional-looking and accessible
 web components, whose names resemble the HTML counterparts, thus
@@ -7468,8 +7499,8 @@ is an attempt to combine both into something useful.")
      (license license:asl2.0))))

 (define-public guile-knots
-  (let ((commit "d18b5b8d5de5beff3b9f84cfb359b73a4dcf2070")
-        (revision "23"))
+  (let ((commit "05ad83c7031de9b0d1873a0d5aec630746342a06")
+        (revision "24"))
    (package
    (name "guile-knots")
    (version (git-version "0" revision commit))
@@ -7480,7 +7511,7 @@ is an attempt to combine both into something useful.")
                    (commit commit)))
              (sha256
               (base32
-                "0ygf0m6y6mf53pgq5i7agv4a54fkml2akg3ws55jj79v5ndy3lnb"))
+                "1dnzjz0ap0rgl1ss4z09lw2yxz8srljsgi1wachhp4ri9fsgqsnh"))
              (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (native-inputs
@@ -792,7 +792,7 @@ Guile's foreign function interface.")
              (file-name (string-append name "-" version "-checkout"))))
    (build-system gnu-build-system)
    (native-inputs (list autoconf automake guile-3.0 pkg-config))
-    (inputs (list guile-3.0 sqlite))
+    (inputs (list guile-3.0 sqlite-next))
    (synopsis "Access SQLite databases from Guile")
    (description
     "This package provides Guile bindings to the SQLite database system.")
@@ -30,6 +30,7 @@
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
  #:use-module (gnu packages compression)
+  #:use-module (gnu packages gettext)
  #:use-module (gnu packages m4)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages textutils))
@@ -37,7 +38,7 @@
 (define-public hunspell
  (package
    (name "hunspell")
-    (version "1.7.0")
+    (version "1.7.2")
    (source
      (origin
        (method git-fetch)
@@ -47,10 +48,10 @@
        (file-name (git-file-name name version))
        (sha256
         (base32
-          "0qxlkd012r45ppd21kldbq9k5ac5nmxz290z6m2kch9l56v768k1"))))
+          "03rlc00l0qwpwwcnz6gpzw35fxq247vp4421zpwwgaj8fp35fqf7"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list autoconf automake libtool))
+     (list autoconf automake gettext-minimal libtool))
    (inputs
     (list perl))
    (native-search-paths (list (search-path-specification
@@ -37,6 +37,7 @@
 ;;; Copyright © 2025 pinoaffe <pinoaffe@gmail.com>
 ;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -302,7 +303,7 @@ actions.")
 (define-public geeqie
  (package
    (name "geeqie")
-    (version "2.0.1")
+    (version "2.6.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -310,11 +311,22 @@ actions.")
                    (commit (string-append "v" version))))
              (sha256
               (base32
-                "199s0f3khnycr5vhk2ww3xnnasz7dzwxdl89pxjadq6rpgprfqyh"))
+                "08yr8jqli33rn1zvj9mjvinyzjp2myakxgf8wqqq8yidmm0vvn1p"))
              (file-name (git-file-name name version))))
    (build-system meson-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; Disable test which requires binaries not present
+          ;; in the Guix repository.
+          (add-after 'unpack 'disable-failing-test
+            (lambda _
+              (substitute* "meson.build"
+                (("test\\('Ancillary files'.*") "")))))))
    (inputs
     (list djvulibre
+           evince
           exiv2
           ffmpegthumbnailer
           gtk+
@@ -327,12 +339,15 @@ actions.")
           libpng
           libraw
           libtiff
+           libjxl
           poppler
           libwebp))
    (native-inputs
     (list `(,glib "bin") ; glib-gettextize
           intltool
           pkg-config
+           python         ; for tests
+           python-lxml    ; for tests
           xxd
           yelp-tools))
    (home-page "https://www.geeqie.org/")
@@ -1324,7 +1339,7 @@ workspaces.
 (define-public vv
  (package
    (name "vv")
-    (version "3.1")
+    (version "3.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1333,7 +1348,7 @@ workspaces.
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0swx5pnv8f58p7721a02jnrvi0w84cbp6p484vvqd3yryrc1k05v"))))
+                "06vdckkczfp9yzyk6zi4jmq7q8mzs1nvyx2j13b1f1mx7sr63mii"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f ; no tests.
@@ -1360,19 +1375,33 @@ workspaces.
                                     "/lib/libpoppler-glib.so"
                                     "\"")))))
               (replace 'install
-                 (lambda* (#:key outputs #:allow-other-keys)
+                 (lambda _
                   ;; The provided installer doesn't have:
                   ;; install(TARGETS vv DESTINATION bin)
                   ;; So nothing would have been installed.
-                   (install-file "vv"
-                                 (string-append (assoc-ref outputs "out")
-                                                "/bin")))))))
+                   (install-file "vv" (string-append #$output "/bin")))))))
    (native-inputs
-     (list pkg-config gcc-14))
+     (list pkg-config))
    (inputs
-     (list cairo openexr libheif libjpeg-turbo libjxl-0.10 lcms libpng libraw
-           librsvg libsixel libtiff libwebp zlib
-           aklomp-base64 stb-image poppler))
+     (list aklomp-base64
+           cairo
+           lcms
+           libexif
+           libheif
+           libjpeg-turbo
+           libjxl
+           libpng
+           libraw
+           librsvg
+           libsixel
+           libtiff
+           libwebp
+           lz4
+           openexr
+           poppler
+           pugixml
+           stb-image
+           zlib))
    (synopsis "Image viewer for the terminal")
    (description "This package provides a color-correct image viewer for the
 terminal.  Your terminal should support the Kitty Graphics protocol.  If it
@@ -25,7 +25,7 @@
 ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
-;;; Copyright © 2020, 2023 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2020, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2020, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2020, 2021, 2022, 2023, 2024 Vinicius Monego <monego@posteo.net>
@@ -292,71 +292,7 @@ library.  It supports almost all PNG features and is extensible.")
  ;; The APNG patch is maintained separately and may lag behind upstream libpng.
  (package
    (name "libpng-apng")
-    (version "1.6.39")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append "mirror://sourceforge/libpng/libpng16/"
-                                 version "/libpng-" version ".tar.xz")
-                  (string-append
-                   "ftp://ftp.simplesystems.org/pub/libpng/png/src"
-                   "/libpng16/libpng-" version ".tar.xz")
-                  (string-append
-                   "ftp://ftp.simplesystems.org/pub/libpng/png/src/history"
-                   "/libpng16/libpng-" version ".tar.xz")))
-       (sha256
-        (base32 "0dv90dxvmqpk7mbywyjbz8lh08cv4b0ksqp1y62mzvmlf379cihz"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (srfi srfi-1))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-apng
-           (lambda* (#:key inputs #:allow-other-keys)
-             (define (apply-patch file)
-               (invoke "patch" "-p1" "--force"
-                       "--input" file))
-             (let ((apng.gz (assoc-ref inputs "apng")))
-               (format #t "Applying APNG patch '~a'...~%"
-                       apng.gz)
-               (invoke "sh" "-c"
-                       (string-append "gunzip < " apng.gz " > the-patch"))
-               (apply-patch "the-patch"))))
-         (add-before 'configure 'no-checks
-           (lambda _
-             (substitute* "Makefile.in"
-               (("^scripts/symbols.chk") "")
-               (("check: scripts/symbols.chk") "")))))))
-    (inputs
-     `(("apng" ,(origin
-                  (method url-fetch)
-                  (uri
-                   (string-append "mirror://sourceforge/libpng-apng/libpng16/"
-                                  version "/libpng-" version "-apng.patch.gz"))
-                  (sha256
-                   (base32
-                    "1z8cx011a2c7vagwgi92rbmky1wi8awmrdldqh9f5k80pbmbdi2a"))))))
-    (native-inputs
-     (list libtool))
-    ;; libpng.la says "-lz", so propagate it.
-    (propagated-inputs
-     (list zlib))
-    (synopsis "APNG patch for libpng")
-    (description
-     "APNG (Animated Portable Network Graphics) is an unofficial
-extension of the APNG (Portable Network Graphics) format.
-APNG patch provides APNG support to libpng.")
-    (home-page "https://sourceforge.net/projects/libpng-apng/")
-    (license license:zlib)))
-
-;; Temporary, until 76798 merges into core-packages-team, and that merges into
-;; master.
-(define-public libpng-apng-next
-  (package
-    (inherit libpng-apng)
-    (version "1.6.46")
+    (version "1.6.50")
    (source
     (origin
       (method url-fetch)
@@ -370,18 +306,50 @@ APNG patch provides APNG support to libpng.")
                   "/libpng16/libpng-" version ".tar.xz")))
       (sha256
        (base32
-         "1cbwf20zlm4gcv8rpjivkngrjgl5366w21lr9qmbk2lr0dq8papk"))))
+         "01r34c31gq136jwshdfira44wbl6nb8qfgj4a4vam9r0hr8rdwsd"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:modules '((guix build gnu-build-system)
+                  (guix build utils)
+                  (srfi srfi-1))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-apng
+            (lambda* (#:key inputs #:allow-other-keys)
+              (define (apply-patch file)
+                (invoke "patch" "-p1" "--force"
+                        "--input" file))
+              (let ((apng.gz (assoc-ref inputs "apng")))
+                (format #t "Applying APNG patch '~a'...~%"
+                        apng.gz)
+                (invoke "sh" "-c"
+                        (string-append "gunzip < " apng.gz " > the-patch"))
+                (apply-patch "the-patch"))))
+          (add-before 'configure 'no-checks
+            (lambda _
+              (substitute* "Makefile.in"
+                (("^scripts/symbols.chk") "")
+                (("check: scripts/symbols.chk") "")))))))
    (inputs
-     (modify-inputs (package-inputs libpng-apng)
-       (replace "apng"
-         (origin
-           (method url-fetch)
-           (uri
-            (string-append "mirror://sourceforge/libpng-apng/libpng16/"
-                           version "/libpng-" version "-apng.patch.gz"))
-           (sha256
-            (base32
-             "00ykl1bzb79xsjwrq7dl0yz9dz5g3zwj0lry5zam3vs6s3gw5gi9"))))))))
+     `(("apng" ,(origin
+                  (method url-fetch)
+                  (uri
+                   (string-append "mirror://sourceforge/libpng-apng/libpng16/"
+                                  version "/libpng-" version "-apng.patch.gz"))
+                  (sha256
+                   (base32
+                    "0r811izi40qzy69jmhz0xlkpqlsjj89bang1b3ma6a5igh6dqzb8"))))))
+    (native-inputs (list libtool))
+    ;; libpng.la says "-lz", so propagate it.
+    (propagated-inputs (list zlib))
+    (synopsis "APNG patch for libpng")
+    (description
+     "APNG (Animated Portable Network Graphics) is an unofficial
+extension of the APNG (Portable Network Graphics) format.
+APNG patch provides APNG support to libpng.")
+    (home-page "https://sourceforge.net/projects/libpng-apng/")
+    (license license:zlib)))

 (define-public pngcrush
  (package
@@ -2273,51 +2241,33 @@ parsing, viewing, modifying, and saving this metadata.")
    (license license:lgpl2.0+)))

 (define-public flameshot
-  ;; Upstream switched to nightly builds, no release tags anymore.
-  (let ((commit "56019019999defbf722f43f87aaeae6596a12c0a")
-        (revision "1"))
-    (package
-      (name "flameshot")
-      (version (git-version "12.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/flameshot-org/flameshot")
-               (commit (string-append commit))))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "11y1x2pc0sdmz4dbrdl9d2i96sxi3v7bfjgcaqy2sc29zjjvynqx"))))
-      (build-system qt-build-system)
-      (arguments
-       (list
-        #:qtbase qtbase
-        #:tests? #f                     ;no tests
-        #:configure-flags
-        #~(list "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
-                "-DDISABLE_UPDATE_CHECKER=ON")
-        #:phases
-        #~ (modify-phases %standard-phases
-             (add-before 'configure 'add-singleapplication
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let ((dep (assoc-ref inputs "single-application")))
-                   (substitute* "CMakeLists.txt"
-                     (("^if\\(USE_SINGLEAPPLICATION\\)" all)
-                      (string-append
-                       all
-                       "\nadd_library(SingleApplication::SingleApplication"
-                       " SHARED IMPORTED)"
-                       "\nset_target_properties(SingleApplication::SingleApplication"
-                       " PROPERTIES"
-                       "\n   INTERFACE_INCLUDE_DIRECTORIES \"" dep "/include\""
-                       "\n   IMPORTED_LOCATION " dep "/lib/libSingleApplication.a"
-                       "\n)\n")))))))))
-      (native-inputs (list qttools))
-      (inputs (list single-application qtcolorwidgets qtsvg))
-      (home-page "https://github.com/flameshot-org/flameshot")
-      (synopsis "Powerful yet simple to use screenshot software")
-      (description "Flameshot is a screenshot program.
+  (package
+    (name "flameshot")
+    (version "13.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/flameshot-org/flameshot")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1v9xsivq9wnj7x1gr877a40xi6j672h9j82c5nkih9b64jg0naj7"))))
+    (build-system qt-build-system)
+    (arguments
+     (list
+      #:qtbase qtbase
+      #:tests? #f                     ;no tests
+      #:configure-flags
+      #~(list "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
+              "-DUSE_BUNDLED_KDSINGLEAPPLICATION=OFF"
+              "-DDISABLE_UPDATE_CHECKER=ON")))
+    (native-inputs (list qttools))
+    (inputs (list kdsingleapplication qtcolorwidgets qtsvg))
+    (home-page "https://github.com/flameshot-org/flameshot")
+    (synopsis "Powerful yet simple to use screenshot software")
+    (description "Flameshot is a screenshot program.
 Features:

@itemize
@@ -2327,7 +2277,7 @@ Features:
@item DBus interface.
@item Upload to Imgur.
@end itemize\n")
-      (license license:gpl3+))))
+    (license license:gpl3+)))

 (define-public swappy
  (package
@@ -2861,51 +2811,6 @@ Format) file format decoder and encoder.")
     `((output-synopsis "pixbuf-loader" "gdk-pixbuf loader for the JXL format")))
    (license license:bsd-3)))

-(define-public libjxl-0.10
-  (package
-    (inherit libjxl)
-    (name "libjxl")
-    (version "0.10.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/libjxl/libjxl")
-             (commit (string-append "v" version))
-             (recursive? #t)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0la5xkb3zsz8df1x2phld275w2j847hwpy4vlb249g2cqaqnvg9f"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Delete the bundles that will not be used.
-        '(begin
-           (for-each (lambda (directory)
-                       (delete-file-recursively
-                        (string-append "third_party/" directory)))
-                     '("brotli" "googletest" "highway" "lcms" "libpng"
-                       "zlib"))))))
-    (arguments
-     `(;; Otherwise gcc segfaults after using up all memory available.
-       #:parallel-build? #f
-       #:configure-flags
-       (list "-DJPEGXL_FORCE_SYSTEM_GTEST=true"
-             "-DJPEGXL_FORCE_SYSTEM_BROTLI=true"
-             "-DJPEGXL_FORCE_SYSTEM_LCMS2=true"
-             "-DJPEGXL_FORCE_SYSTEM_HWY=true"
-             "-DJPEGXL_BUNDLE_LIBPNG=false")
-       ,@(if (target-riscv64?)
-             '(#:phases
-               (modify-phases %standard-phases
-                 (add-after 'unpack 'fix-atomic
-                   (lambda _
-                     (substitute* "lib/jxl/enc_xyb.cc"
-                       (("#include \"lib/jxl/enc_xyb.h\"" a)
-                        (string-append a "\n#include <atomic>")))))))
-             '())))
-    (native-inputs
-     (list asciidoc doxygen googletest pkg-config python))))
-
 (define-public mtpaint
  (package
    (name "mtpaint")
@@ -162,7 +162,8 @@ endif()~%~%"
     (build-system cmake-build-system)
     (arguments
      (list
-       #:disallowed-references (list imagemagick/stable)
+       #:disallowed-references (list (this-package-native-input "imagemagick"))
+
       #:imported-modules `(,@%cmake-build-system-modules
                            (guix build glib-or-gtk-build-system))
       #:modules '((guix build cmake-build-system)
@@ -738,7 +738,9 @@ IcedTea build harness.")
         ((guix build ant-build-system)
          ,@%default-gnu-imported-modules)

-         #:disallowed-references ,(list (gexp-input icedtea-7 "jdk"))
+         #:disallowed-references ,(list (gexp-input
+                                         (this-package-native-input "jdk")
+                                         "jdk"))

         ,@(substitute-keyword-arguments (package-arguments icedtea-7)
             ((#:modules modules)
@@ -929,8 +931,9 @@ new Date();"))
        (ice-9 popen))
       #:tests? #f                      ; require jtreg
       #:make-flags '("all")
-       #:disallowed-references ,(list (gexp-input icedtea-8)
-                                      (gexp-input icedtea-8 "jdk"))
+       #:disallowed-references
+       ,(list (this-package-native-input "icedtea")
+              (gexp-input (this-package-native-input "icedtea") "jdk"))

       #:phases
       (modify-phases %standard-phases
@@ -1302,8 +1305,8 @@ new Date();"))
               (substitute* "make/autoconf/generated-configure.sh"
                 (("-Werror") ""))))))
       ((#:disallowed-references _ '())
-        `(,(gexp-input openjdk9)
-          ,(gexp-input openjdk9 "jdk")))))
+        `(,(this-package-native-input "openjdk9")
+          ,(gexp-input (this-package-native-input "openjdk9") "jdk")))))
    (native-inputs
     `(("openjdk9" ,openjdk9)
       ("openjdk9:jdk" ,openjdk9 "jdk")
@@ -1348,8 +1351,11 @@ new Date();"))
                  (ice-9 popen)
                  (srfi srfi-1)
                  (srfi srfi-26))
-      #:disallowed-references (list (gexp-input openjdk10)
-                                    (gexp-input openjdk10 "jdk"))
+
+      #:disallowed-references
+      (list (this-package-native-input "openjdk")
+            (gexp-input (this-package-native-input "openjdk")
+                        "jdk"))

      #:tests? #f                       ; requires jtreg
      ;; TODO package jtreg
@@ -93,6 +93,44 @@
    (description "Runtime library for kdegames")
    (license (list license:gpl2+  license:fdl1.2+))))

+(define-public katomic
+  (package
+    (name "katomic")
+    (version "25.08.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/katomic-" version ".tar.xz"))
+       (sha256
+        (base32 "0srxgmbsd6wgzbi72bjhnvp3jj1k6z80fvrr84nrvzlc6r4jpfi5"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:qtbase qtbase
+           #:tests? #f )) ;no tests
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list kcompletion
+           kconfig
+           kcoreaddons
+           kcrash
+           kdbusaddons
+           ki18n
+           kiconthemes
+           knewstuff
+           kwidgetsaddons
+           kxmlgui
+           libkdegames))
+    (home-page "https://apps.kde.org/katomic/")
+    (synopsis "Molecular game")
+    (description "KAtomic is a fun educational game built around molecular
+geometry.  It employs simplistic two-dimensional looks at different chemical
+elements.
+
+This package is part of the KDE games module.")
+    (license license:gpl2+)))
+
 (define-public ktuberling
  (package
    (name "ktuberling")
@@ -711,6 +749,44 @@ More information at http://en.wikipedia.org/wiki/Sudoku
 This package is part of the KDE games module.")
    (license (list license:gpl2+ license:fdl1.2+))))

+(define-public klickety
+  (package
+    (name "klickety")
+    (version "25.08.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/klickety-" version ".tar.xz"))
+       (sha256
+        (base32 "0nnjwyfg3zw6mdc2kjl4yq3az03j094w52iyndn6fah7k8k4ns16"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:qtbase qtbase
+           #:tests? #f )) ;no tests
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list kconfig
+           kconfigwidgets
+           kcoreaddons
+           kcrash
+           kdbusaddons
+           ki18n
+           kiconthemes
+           kio
+           kwidgetsaddons
+           kxmlgui
+           libkdegames))
+    (home-page "https://apps.kde.org/klickety/")
+    (synopsis "Molecular game")
+    (description "KAtomic is a fun educational game built around molecular
+geometry.  It employs simplistic two-dimensional looks at different chemical
+elements.
+
+This package is part of the KDE games module.")
+    (license license:gpl2+)))
+
 (define-public klines
  (package
    (name "klines")
@@ -1835,24 +1911,83 @@ This package is part of the KDE games module.")
@item support for saving and loading Portable game notation (PGN) files
@item use of Jovie, the KDE text-to-speak program, to speak opponent’s moves
@item ability to control the program via a D-Bus interface
-@end itemize")
+@end itemize
+
+This package is part of the KDE games module.")
    (license license:gpl2+)))

+(define-public kpat
+  (package
+    (name "kpat")
+    (version "25.08.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/kpat-" version ".tar.xz"))
+       (sha256
+        (base32 "15hdyqqqmlbfhawwq2vyyl9ywln0317zxnramhnb2p4j1ms0bh3s"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:qtbase qtbase
+           #:tests? #f
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'find-cards
+                 (lambda _
+                   (wrap-program (string-append #$output "/bin/kpat")
+                     `("XDG_DATA_DIRS" ":" suffix
+                       ,(list (string-append #$libkdegames "/share")))))))))
+    (native-inputs
+     (list bash-minimal extra-cmake-modules kdoctools))
+    (inputs
+     (list black-hole-solver
+           freecell-solver
+           kcompletion
+           kconfig
+           kconfigwidgets
+           kcoreaddons
+           kcrash
+           kdbusaddons
+           kguiaddons
+           ki18n
+           kio
+           knewstuff
+           kwidgetsaddons
+           kxmlgui
+           libkdegames
+           qtdeclarative
+           qtsvg
+           qtwayland
+           shared-mime-info))
+    (home-page "https://apps.kde.org/kpat/")
+    (synopsis "Patience solitaire game")
+    (description "KPat (aka KPatience) is a relaxing card sorting game.
+To win the game a player has to arrange a single deck of cards in certain order
+amongst each other.
+
+This package is part of the KDE games module.")
+    (license
+     (list license:gpl2+
+           license:fdl1.2+
+           (license:non-copyleft
+            "https://invent.kde.org/games/kpat/-/blob/master/COPYING")))))
+
 (define-public kde-games
  (package
    (name "kde-games")
-    (version "25.08.1")
+    (version (package-version libkdegames))
    (source #f)
    (build-system trivial-build-system)
    (arguments
     (list #:builder #~(mkdir #$output)))
    (propagated-inputs
-     ;; TODO: kpat, klickety, katomic.
     (list bomber
           bovo
           granatier
           kajongg
           kapman
+           katomic
           kblackbox
           kblocks
           kbounce
@@ -1864,6 +1999,7 @@ This package is part of the KDE games module.")
           killbots
           kiriki
           kjumpingcube
+           klickety
           klines
           kmahjongg
           kmines
@@ -1873,6 +2009,7 @@ This package is part of the KDE games module.")
           kolf
           kollision
           konquest
+           kpat
           kreversi
           kshisen
           ksirk
@@ -1890,4 +2027,6 @@ This package is part of the KDE games module.")
    (description "This metapackage includes a collection of games provided
 with the official release of KDE.")
    (license
-     (list license:gpl2+ license:lgpl2.0+ license:gpl3+ license:fdl1.2+))))
+     (list license:gpl2+ license:lgpl2.0+ license:gpl3+ license:fdl1.2+
+           (license:non-copyleft
+            "https://invent.kde.org/games/kpat/-/blob/master/COPYING")))))
@@ -103,40 +103,6 @@
    (description "KDE's multimedia library.")
    (license license:lgpl2.1+)))

-(define-public phonon-backend-gstreamer
-  (package
-    (name "phonon-backend-gstreamer")
-    (version "4.10.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://kde/stable/phonon/"
-                    name "/" version "/"
-                    name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     (list extra-cmake-modules pkg-config qttools-5))
-    (inputs
-     (list phonon
-           qtbase-5
-           qtx11extras
-           gstreamer
-           gst-plugins-base
-           libxml2))
-    (arguments
-     `(#:tests? #f
-       #:configure-flags
-       '( "-DPHONON_BUILD_PHONON4QT5=ON")))
-    (home-page "https://community.kde.org/Phonon")
-    (synopsis "Phonon backend which uses GStreamer")
-    (description "Phonon makes use of backend libraries to provide sound.
-Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
-    ;; license: source files mention "either version 2.1 or 3"
-    (license (list license:lgpl2.1 license:lgpl3))))
-
 (define-public phonon-backend-vlc
  (package
    (name "phonon-backend-vlc")
@@ -282,7 +282,7 @@
                  (srfi srfi-26)
                  (rnrs bytevectors)
                  (rnrs io ports)
-                  (guix elf)
+                  (system vm elf)
                  (guix build gremlin)
                  ,@%default-gnu-imported-modules)
      #:phases
@@ -530,15 +530,11 @@
              ;; The following two functions are from Guix's icecat package in
              ;; (gnu packages gnuzilla).  See commit
              ;; b7a0935420ee630a29b7e5ac73a32ba1eb24f00b.
-              (define (runpath-of lib)
-                (call-with-input-file lib
-                  (compose elf-dynamic-info-runpath elf-dynamic-info
-                           parse-elf get-bytevector-all)))
              (define (runpaths-of-input label)
                (let* ((dir (string-append (assoc-ref inputs label)
                                           "/lib"))
                       (libs (find-files dir "\\.so$")))
-                  (append-map runpath-of libs)))
+                  (append-map file-runpath libs)))
              (let* ((out (assoc-ref outputs "out"))
                     (lib (string-append out "/lib"))
                     (libs (map
@@ -641,7 +637,7 @@
                  libjpeg-turbo
                  libnotify
                  libpciaccess
-                  libpng-apng-next
+                  libpng-apng
                  libva
                  libvpx
                  libwebp
@@ -3333,13 +3333,13 @@ GnuPG-based password manager like @code{pass}.")
                     (lambda _
                       (let* ((info-dir (string-append #$output "/share/info"))
                              (info (string-append info-dir
-                                                   "/TheLinuxKernel.info.gz")))
+                                                   "/TheLinuxKernel.info.zst")))
                         (with-directory-excursion "Documentation/output"
                           (invoke "make" "-C" "texinfo" "install-info"
                                   (string-append "infodir=" info-dir)))
                         ;; Create a symlink, for convenience.
                         (symlink info (string-append info-dir
-                                                      "/linux.info.gz"))))))))
+                                                      "/linux.info.zst"))))))))
    (native-inputs
     (list graphviz
           perl
@@ -4215,9 +4215,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
      ''("--with-libunwind"
         ;; Don't fail if the architecture doesn't support different
         ;; personalities.
-         "--enable-mpers=check")
-      ;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32459>.
-      #:parallel-tests? #f))           ; undeterministic failures
+         "--enable-mpers=check")))
    (inputs (list libunwind))
    (native-inputs
     (list autoconf
@@ -7914,7 +7912,7 @@ disks and SD cards.  This package provides the userland utilities.")
          (string-append "libblkid_CFLAGS=-I" libuuid "/include/uuid "
                         "-I" libuuid "/include/blkid")
          (string-append "libblkid_LIBS=-L" libuuid-static "/lib -lblkid")))
-       #:disallowed-references (,util-linux)
+       #:disallowed-references (,(this-package-input "libuuid"))
       #:make-flags '("LDFLAGS=-all-static")
       #:phases
       (modify-phases %standard-phases ; TODO: f2fs phases.
@@ -11209,6 +11207,7 @@ set as @code{LD_PRELOAD} to override the C library file system functions.")
                "041ir9wk44v7isidwl7fzxrjvs85j637wcr7xirasd8ysxa0r4qv"))
              (patches
               (search-patches
+                "falcosecurity-libs-bpf-probes-fix.patch"
                "falcosecurity-libs-shared-build.patch"))))
    (build-system cmake-build-system)
    (arguments
@@ -448,8 +448,8 @@ lookup, particularly suited for games.")
  (sbcl-package->ecl-package sbcl-3d-spaces))

 (define-public sbcl-3d-transforms
-  (let ((commit "1d44509387d0747cd0351e95a533eca609058632")
-        (revision "0"))
+  (let ((commit "86e7e99fa9027c1d230adc83f3a2a74a2b83eb08")
+        (revision "1"))
    (package
      (name "sbcl-3d-transforms")
      (version (git-version "1.0.0" revision commit))
@@ -457,11 +457,11 @@ lookup, particularly suited for games.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/Shinmera/3d-transforms")
+               (url "https://codeberg.org/shinmera/3d-transforms")
               (commit commit)))
         (file-name (git-file-name "cl-3d-transforms" version))
         (sha256
-          (base32 "03pmv7dh1j6kl16ch6lnvxzjrld4jbr3jx8slzkiipgzdxg74pcx"))))
+          (base32 "04z532aq5rwfg3z7nijxzxikmcv504d6xx7gwmc7blk7z3mjk7dd"))))
      (build-system asdf-build-system/sbcl)
      (native-inputs
       (list sbcl-parachute))
@@ -470,7 +470,7 @@ lookup, particularly suited for games.")
             sbcl-3d-quaternions
             sbcl-3d-vectors
             sbcl-documentation-utils))
-      (home-page "https://shinmera.github.io/3d-transforms/")
+      (home-page "https://shinmera.com/docs/3d-transforms")
      (synopsis
       "Common structure to encapsulate spatial transformations in Common Lisp")
      (description
@@ -484,7 +484,7 @@ alternative 4x4 matrix representation.")
  (sbcl-package->cl-source-package sbcl-3d-transforms))

 ;; TODO: Build failure:
-;; https://github.com/Shinmera/3d-quaternions/issues/2
+;; https://codeberg.org/shinmera/3d-quaternions/issues/1
 ;;
 ;; (define-public ecl-3d-transforms
 ;;   (sbcl-package->ecl-package sbcl-3d-transforms))
@@ -1654,7 +1654,7 @@ Clojure, as well as several expansions on the idea.")
 (define-public asdf-cli
  (package
    (name "asdf-cli")
-    (version "0.1.1")
+    (version "0.2.1")
    (source
     (origin
       (method git-fetch)
@@ -1663,16 +1663,23 @@ Clojure, as well as several expansions on the idea.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "asdf-cli" version))
       (sha256
-        (base32 "1dsvmqazn25h3b55ycd96am5f18ymk9rga8xy72d6ykm4ki8w7pn"))))
+        (base32 "1x925sl7q7m8c0larysqswlvmzm26fi39cwd45snl1z71rdgkmaw"))))
    (build-system asdf-build-system/sbcl)
    (arguments
     (list
      #:tests? #f ; There are no tests.
+      #:asd-systems ''("charje.asdf-cli")
      #:phases
      #~(modify-phases %standard-phases
          (replace 'build
-            (lambda* _
+            (lambda _
              (setenv "HOME" (getcwd))
+              ;; TEMPLATES is a buildtime option for asdf-cli to show where
+              ;; the templates are installed.
+              (setenv "TEMPLATES"
+                      (string-append
+                       #$output
+                       "/share/common-lisp/sbcl/asdf-cli/src/templates/"))
              (invoke "./build")))
          (add-after 'build 'install
            (lambda _
@@ -1680,8 +1687,12 @@ Clojure, as well as several expansions on the idea.")
                (install-file "asdf" bin)))))))
    (inputs
     (list sbcl-alexandria
-           sbcl-command-line-args
-           sbcl-cl-annot))
+           sbcl-charje.loop
+           sbcl-cl-annot
+           sbcl-cl-fad
+           sbcl-cl-semver
+           sbcl-cl-str
+           sbcl-command-line-args))
    (propagated-inputs
     (list sbcl
           cl-quickproject))
@@ -14408,9 +14419,8 @@ them as strings.")
  (sbcl-package->ecl-package sbcl-decimals))

 (define-public sbcl-deeds
-  ;; tagged branch is outdated
-  (let ((revision "1")
-        (commit "f5df54eac79b58a34030e0eb8acf3952c788410d"))
+  (let ((revision "2")
+        (commit "c63502b9ca3bd7946411686ac98b040c0c6b3e1c"))
    (package
      (name "sbcl-deeds")
      (version (git-version "1.1.1" revision commit))
@@ -14418,16 +14428,16 @@ them as strings.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/Shinmera/deeds")
+               (url "https://codeberg.org/shinmera/deeds")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "062cnb2dwli6pw3zvv46jfxyxdzcbzwsck5pa6nw03qf1j1hyg3k"))))
+          (base32 "1kx5x783cxw5whfwl1akwmzybh6dbrrjmygqmigirqcwdmxk5h8c"))))
      (build-system asdf-build-system/sbcl)
      (inputs
       (list sbcl-bordeaux-threads sbcl-closer-mop sbcl-form-fiddle
             sbcl-lambda-fiddle))
-      (home-page "https://github.com/Shinmera/deeds")
+      (home-page "https://shinmera.com/docs/deeds")
      (synopsis "Extensible Event Delivery System")
      (description
       "@code{deeds} allows for efficient event delivery to multiple handlers
@@ -14441,23 +14451,24 @@ with a complex event filtering system.")
  (sbcl-package->ecl-package sbcl-deeds))

 (define-public sbcl-definitions
-  (let ((commit "1f4bd7a634a2299aea19cefb5da8041bbb27f2ec"))
+  (let ((commit "869796051d97bf67779f192733d52714929b48f1")
+        (revision "2"))
    (package
      (name "sbcl-definitions")
-      (version (git-version "1.0.0" "1" commit))
+      (version (git-version "1.0.0" revision commit))
      (source
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/Shinmera/definitions/")
+               (url "https://codeberg.org/shinmera/definitions")
               (commit commit)))
         (file-name (git-file-name "cl-definitions" version))
         (sha256
-          (base32 "16dh9iy3v344xj4qllsp47007px3yx26fxxh9gh2cvs8dqgk3kch"))))
+          (base32 "0vd32rj87f8icqglpkylgr0bs2m4qjsii3wd5i5ixiy5dz3918md"))))
      (build-system asdf-build-system/sbcl)
      (inputs
       (list sbcl-documentation-utils))
-      (home-page "https://shinmera.github.io/definitions")
+      (home-page "https://shinmera.com/docs/definitions")
      (synopsis "General definitions reflection library")
      (description
       "This system implements a general definitions introspection library.
@@ -24350,61 +24361,60 @@ instead of #'FOO.
  (sbcl-package->ecl-package sbcl-nkeymaps))

 (define-public sbcl-nodgui
-  (let ((commit "9a1b2c6419adce2ba317497328276f8d63843279")
-        (revision "2"))
-    (package
-      (name "sbcl-nodgui")
-      (version (git-version "0.7.2.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://codeberg.org/cage/nodgui.git")
-               (commit commit)))
-         (file-name (git-file-name "cl-nodgui" version))
-         (sha256
-          (base32 "1qanhxn46bwq8a10v61n46q4j8avp7n1m2687bi2wdylz1pgakyq"))))
-      (build-system asdf-build-system/sbcl)
-      (native-inputs
-       (list sbcl-clunit2))
-      (inputs
-       (list sbcl-alexandria
-             sbcl-bordeaux-threads
-             sbcl-cl-colors2
-             sbcl-cl-ppcre-unicode
-             sbcl-cl-unicode
-             sbcl-esrap
-             sbcl-flexi-streams
-             sbcl-jpeg-turbo
-             sbcl-named-readtables
-             sbcl-cl-opengl
-             sbcl-parse-number
-             sbcl-pngload
-             sbcl-sdl2
-             sbcl-sdl2-ttf
-             sbcl-static-vectors
-             sbcl-trivial-garbage
-             sbcl-zpng
-             tk
-             tklib
-             tcllib))
-      (arguments
-       (list #:phases
-             #~(modify-phases %standard-phases
-                 (add-after 'unpack 'fix-paths
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     (substitute* "src/wish-communication.lisp"
-                       (("\\(guess-wish-interpreter-path\\)")
-                        (string-append "\""
-                                       (search-input-file inputs "/bin/wish")
-                                       "\""))))))))
-      (synopsis "Common Lisp bindings for the Tk GUI toolkit")
-      (description
-       "Nodgui (@emph{No Drama GUI}) is a Common Lisp binding for the Tk GUI
+  (package
+    (name "sbcl-nodgui")
+    (version "0.7.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://codeberg.org/cage/nodgui.git")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name "cl-nodgui" version))
+       (sha256
+        (base32 "0c2f7g6swd9fkzjnmlkm22cds4v2y67g09w7s66ak3zcxaxppdbj"))))
+    (build-system asdf-build-system/sbcl)
+    (native-inputs
+     (list sbcl-clunit2))
+    (inputs
+     (list sbcl-alexandria
+           sbcl-bordeaux-threads
+           sbcl-cl-colors2
+           sbcl-cl-ppcre-unicode
+           sbcl-cl-unicode
+           sbcl-esrap
+           sbcl-flexi-streams
+           sbcl-jpeg-turbo
+           sbcl-named-readtables
+           sbcl-cl-opengl
+           sbcl-parse-number
+           sbcl-pngload
+           sbcl-sdl2
+           sbcl-sdl2-ttf
+           sbcl-static-vectors
+           sbcl-trivial-garbage
+           sbcl-zpng
+           tk
+           tklib
+           tcllib))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/wish-communication.lisp"
+                (("\\(guess-wish-interpreter-path\\)")
+                 (string-append "\""
+                                (search-input-file inputs "/bin/wish")
+                                "\""))))))))
+    (synopsis "Common Lisp bindings for the Tk GUI toolkit")
+    (description
+     "Nodgui (@emph{No Drama GUI}) is a Common Lisp binding for the Tk GUI
 toolkit.  It also provides a few additional widgets more than the standard Tk
 ones.")
-      (home-page "https://www.autistici.org/interzona/nodgui.html")
-      (license license:llgpl))))
+    (home-page "https://www.autistici.org/interzona/nodgui.html")
+    (license license:llgpl)))

 (define-public cl-nodgui
  (sbcl-package->cl-source-package sbcl-nodgui))
@@ -29198,7 +29208,7 @@ running into parallelism problems when having to change directory.")
 (define-public sbcl-simple-matrix
  (package
    (name "sbcl-simple-matrix")
-    (version "3.4")
+    (version "3.5")
    (source
     (origin
       (method git-fetch)
@@ -29207,7 +29217,7 @@ running into parallelism problems when having to change directory.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-simple-matrix" version))
       (sha256
-        (base32 "1zxan2v4rcqdplxwfy02ylawlm59j1583jk894jl2aa946v66zxj"))))
+        (base32 "1zdj16vy1h24ypm7kjb20pzniclqm6xdndb5kh3f6kcgfsmc6m06"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs (list sbcl-fiveam))
    (synopsis "Matrix library for Common Lisp")
@@ -33562,7 +33572,7 @@ precisely controls the behavior of the parser via Common Lisp restarts.")
 (define-public sbcl-usocket
  (package
    (name "sbcl-usocket")
-    (version "0.8.8")
+    (version "0.8.9")
    (source
     (origin
       (method git-fetch)
@@ -33571,7 +33581,7 @@ precisely controls the behavior of the parser via Common Lisp restarts.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-usocket" version))
       (sha256
-        (base32 "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"))))
+        (base32 "0msrrp069vrma70fr0wzw5jc94r796ha53dhpq8bdm1h3fm7f103"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs
     (list sbcl-rt))
@@ -609,50 +609,6 @@ high-level, object-oriented functional programming language.  CLISP includes
 an interpreter, a compiler, a debugger, and much more.")
    (license license:gpl2+)))

-(define-public confusion-mdl
-  (let* ((commit "12a055581fc262225272df43287dae48281900f5"))
-    (package
-      (name "confusion-mdl")
-      (version "0.2")
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url (string-append "https://gitlab.com/emacsomancer/" name))
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "1zi8kflzvwqg97ha1sa5xjisbjs5z1mvbpa772vfxiv5ksnpxp0d"))
-                (file-name (git-file-name name version))))
-      (build-system gnu-build-system)
-      (arguments
-       `(#:tests? #f                    ; there are no tests
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'configure)
-           (replace 'build
-             (lambda* (#:key (make-flags '()) #:allow-other-keys)
-               (apply invoke "make" "CC=gcc" make-flags)))
-           (replace 'install
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (bin (string-append out "/bin")))
-                 (install-file "mdli" bin)
-                 #t))))))
-      (native-inputs
-       (list perl))
-      (inputs
-       (list libgc))
-      (synopsis "Interpreter for the MIT Design Language (MDL)")
-      (description "MDL (the MIT Design Language) is a descendant of Lisp.  It
-was originally developed in 1971 on the PDP-10 computer under the Incompatible
-Timesharing System (ITS) to provide high level language support for the
-Dynamic Modeling Group at MIT's Project MAC.  Infocom built the original
-PDP-10 Zork in MDL and their later ZIL (Zork Implementation Language) was
-based on a subset of MDL.  Confusion is a MDL interpreter that works just well
-enough to play the original mainframe Zork all the way through.")
-      (home-page "http://www.russotto.net/git/mrussotto/confusion/src/master/src/README")
-      (license license:gpl3+))))
-
 (define-public ecl
  (package
    (name "ecl")
@@ -904,7 +860,7 @@ interface to the Tk widget system.")
 (define-public janet
  (package
    (name "janet")
-    (version "1.39.1")
+    (version "1.40.1")
    (source
     (origin
       (method git-fetch)
@@ -913,7 +869,7 @@ interface to the Tk widget system.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "03mnza3fbgngr389mri12vq1jn7cf7a2a1a45gkbnzzxwjwh7pqx"))))
+        (base32 "1dzvkjgkz41biafcqwm3ynx0v16w01lig33q1my06hir1xb62ph5"))))
    (build-system gnu-build-system)
    (arguments
     (list #:make-flags
@@ -1073,69 +1029,6 @@ and make for REPLs that start blazing fast.
@end itemize\n")
    (license license:gpl3+)))

-(define-public lush2
-  (package
-    (name "lush2")
-    (version "2.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/lush/lush2/lush-"
-                           version ".tar.gz"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (substitute* "src/unix.c"
-             (("\\{ \"LUSH_DATE\", __DATE__ \\},") "")
-             (("\\{ \"LUSH_TIME\", __TIME__ \\},") ""))
-           (substitute* "src/main.c"
-             (("\" \\(built \" __DATE__ \"\\)\"") ""))
-           #t))
-       (sha256
-        (base32
-         "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(;; We have to add these LIBS so that they are found.
-       #:configure-flags (list "LIBS=-lz"
-                               "X_EXTRA_LIBS=-lfontconfig"
-                               "--with-x")
-       #:tests? #f)) ; No make check.
-    (native-inputs (list intltool))
-    (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("sdl" ,sdl)
-       ("sdl-image" ,sdl-image)
-       ("sdl-mixer" ,sdl-mixer)
-       ("sdl-net" ,sdl-net)
-       ("sdl-ttf" ,sdl-ttf)
-       ("libxft" ,libxft)
-       ("fontconfig" ,fontconfig)
-       ("gsl" ,gsl)
-       ("openblas" ,openblas)
-       ("glu" ,glu)
-       ("mesa" ,mesa)
-       ("mesa-utils" ,mesa-utils)
-       ("binutils" ,binutils)
-       ("libiberty" ,libiberty)
-       ("readline" ,readline)
-       ("zlib" ,zlib)
-       ("gettext-minimal" ,gettext-minimal)))
-    (synopsis "Lisp Universal Shell")
-    (description
-     "Lush is an object-oriented Lisp interpreter/compiler with features
-designed to please people who want to prototype large numerical
-applications.  Lush includes an extensive library of
-vector/matrix/tensor manipulation, numerous numerical libraries
-(including GSL, LAPACK, and BLAS), a set of graphic functions, a
-simple GUI toolkit, and interfaces to various graphic and multimedia
-libraries such as OpenGL, SDL, Video4Linux, and ALSA (video/audio
-grabbing), and others.  Lush is an ideal frontend script language for
-programming projects written in C or other languages.  Lush also has
-libraries for Machine Learning, Neural Nets and statistical estimation.")
-    (home-page "https://lush.sourceforge.net/")
-    (license license:lgpl2.1+)))
-
 (define-public picolisp
  (package
    (name "picolisp")
@@ -595,7 +595,7 @@ output), and Binutils.")
    ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la")
    ("19.1.7" . "18hkfhsm88bh3vnj21q7f118vrcnf7z6q1ylnwbknyb3yvk0343i")
    ("20.1.8" . "0v0lwf58i96vcwsql3hlgy72z3ncfvqwgyghyn26m2ri8vy83k6a")
-    ("21.1.1" . "01xf0yl9xf1f29v2afyzs0rl4sqa7n7wd5bdv4qgih8cnbfmj7r0")))
+    ("21.1.5" . "0fwfs8gd5c5r5kw6dkpc4817ihd6r8h3qsyl2c9ffyc9hiqlmrnw")))

 (define %llvm-patches
  '(("14.0.6" . ("clang-14.0-libc-search-path.patch"
@@ -613,7 +613,7 @@ output), and Binutils.")
                 "clang-17.0-link-dsymutil-latomic.patch"))
    ("20.1.8" . ("clang-18.0-libc-search-path.patch"
                 "clang-17.0-link-dsymutil-latomic.patch"))
-    ("21.1.1" . ("clang-18.0-libc-search-path.patch"
+    ("21.1.5" . ("clang-18.0-libc-search-path.patch"
                 "clang-17.0-link-dsymutil-latomic.patch"))))

 (define (llvm-monorepo version)
@@ -1240,7 +1240,7 @@ Library.")
  (make-clang-toolchain clang-20 libomp-20))

 (define-public llvm-21
-  (make-llvm "21.1.1"))
+  (make-llvm "21.1.5"))

 (define-public clang-runtime-21
  (clang-runtime-from-llvm llvm-21))
@@ -1255,7 +1255,7 @@ Library.")
                    (package-version llvm-21)))
     (sha256
      (base32
-       "0sv0snykw4zl45apj9dfm5yrs8grhmmmnss7nmg5ab8v9n52zpl0")))))
+       "057k2707v4cin44b422r9gi12m41yh4ymqi3vakxx9d08d8q8lqm")))))

 (define-public libomp-21
  (package
@@ -145,7 +145,7 @@
 using its Lua modding API.  It allows playing a wide range of voxel-based
 games, installing mods and texture packs.  This package only provides the base
 platform, users need to install games themselves (for example,
-@code{luanti-game}), either through Guix, the built-in interface or other
+@code{luanti-minetest-game}), either through Guix, the built-in interface or other
 sources.")
    (home-page "https://www.luanti.org/")
    (license license:lgpl2.1+)))
@@ -185,10 +185,10 @@ Luanti games with multiplayer support.  This package provides
@command{luantiserver} to run a Luanti server.")))

 (define-public minetest-game
-  (let ((commit "0351c6691595c6eb88a1bea2383f6fae46a686ce")
-        (revision "1"))
+  (let ((commit "052ccb09280a1fa52022c7e120437b1e6dc82771")
+        (revision "2"))
    (package
-      (name "luanti-game")
+      (name "luanti-minetest-game")
      (version (git-version "0.0.0" revision commit))
      (source
       (origin
@@ -198,7 +198,7 @@ Luanti games with multiplayer support.  This package provides
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "13l33ghnm1g3ka0ivxljzdga50x0iv0fzyd7pqm15ickfbkwbm0v"))))
+          (base32 "072rlljd9srkxj1chdpz4sxw6nzc8nlhm8328npgwf0i9hwqmr8c"))))
      (build-system copy-build-system)
      (arguments
       (list
@@ -30,14 +30,14 @@
 (define-public m4
  (package
   (name "m4")
-   (version "1.4.19")
+   (version "1.4.20")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/m4/m4-"
                                version ".tar.xz"))
            (sha256
             (base32
-              "15mghcksh11saylpm86h1zkz4in0rbi0pk8i6nqxkdikdmfdxbk3"))))
+              "0axgilr6n88br7msm3ls8m4zlwgk4q3vcjqw1cknqpyg3hxfldp2"))))
   (build-system gnu-build-system)
   (arguments
    `(;; Explicitly disable tests when cross-compiling, otherwise 'make check'
@@ -513,25 +513,28 @@ transforms.")
 (define-public python-ml-collections
  (package
    (name "python-ml-collections")
-    (version "1.0.0")
+    (version "1.1.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://github.com/google/ml_collections")
-             (commit (string-append "v" version))))
+              (url "https://github.com/google/ml_collections")
+              (commit (string-append "v" version))))
       (sha256
-        (base32 "1f3rwbgnnvgh2jgnkwxfjdw18yly41hlx9fy56h0x36zyy8p0j21"))))
+        (base32 "1lv7vs84v4zwyrqg2zdlkrx3x6w08j9lyz74m8vk55ysl4399pqv"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      #:test-flags '(list "--pyargs" "ml_collections/config_dict/tests")))
+      ;; tests: 373 passed, 1 skipped, 81 warnings
+      #:test-flags
+      #~(list "--ignore=docs/"
+              "--ignore=ml_collections/config_dict/examples/examples_test.py")))
+    (native-inputs
+     (list python-flit-core
+           python-pytest))
    (propagated-inputs
-     (list python-absl-py python-pyyaml python-six))
-    (native-inputs (list python-pylint
-                         python-pytest
-                         python-pytest-xdist
-                         python-flit-core))
+     (list python-absl-py
+           python-pyyaml))
    (home-page "https://github.com/google/ml_collections")
    (synopsis "Python collections designed for Machine Learning usecases")
    (description
@@ -777,7 +780,7 @@ independently to be able to run a LLaMA model.")
 (define-public whisper-cpp
  (package
    (name "whisper-cpp")
-    (version "1.7.6")
+    (version "1.8.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -786,7 +789,7 @@ independently to be able to run a LLaMA model.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0gn64jw4pr4vfnn2hll7yd98r8yhaqg97hhg5z22vq4j423436kn"))))
+                "1x8m43myi1npgwwyw24dpza3vi95695vnya391fnn7nrf876ckir"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -794,7 +797,7 @@ independently to be able to run a LLaMA model.")
      #~(list "-DWHISPER_STANDALONE=TRUE"
              "-DWHISPER_SDL2=TRUE"
              "-DWHISPER_BUILD_TESTS=TRUE"
-                                        ; "-DWHISPER_FFMPEG=TRUE"  ; TODO
+              "-DWHISPER_FFMPEG=TRUE"
              "-DBUILD_SHARED_LIBS=ON"
              "-DGGML_BLAS=ON"
              "-DGGML_BLAS_VENDOR=OpenBLAS"
@@ -804,7 +807,6 @@ independently to be able to run a LLaMA model.")
              (string-append "-DBLAS_LIBRARIES="
                             #$(this-package-input "openblas")
                             "/lib/libopenblas.so")
-
              "-DGGML_NATIVE=OFF" ;no '-march=native'
              "-DGGML_FMA=OFF"    ;and no '-mfma', etc.
              "-DGGML_AVX2=OFF"
@@ -816,9 +818,11 @@ independently to be able to run a LLaMA model.")
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-paths
            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp"
+              (substitute*
+                  "ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp"
                (("\"/bin/sh\"")
-                 (string-append "\"" (search-input-file inputs "/bin/sh") "\"")))))
+                 (string-append
+                  "\"" (search-input-file inputs "/bin/sh") "\"")))))
          #$@(if (not (target-64bit?))
                 '((add-after 'unpack 'skip-failing-tests
                     (lambda _
@@ -836,13 +840,18 @@ independently to be able to run a LLaMA model.")
                (("\\$\\{VAD_TEST\\} PROPERTIES LABELS \"unit\"")
                 "${VAD_TEST} PROPERTIES DISABLED true")
                ;; error: failed to read audio data as wav (Unknown error)
-                (("\\$\\{VAD_TARGET\\} PROPERTIES LABELS \"base;en\"")
+                (("\\$\\{VAD_TEST\\} PROPERTIES LABELS \"base;en\"")
                 "${VAD_TEST} PROPERTIES DISABLED true")))))))
    (native-inputs
-     (list pkg-config shaderc))
+     (list git pkg-config shaderc))
    (inputs
-     (list openblas sdl2 git spirv-headers spirv-tools
-           vulkan-headers vulkan-loader))
+     (list ffmpeg
+           openblas
+           sdl2
+           spirv-headers
+           spirv-tools
+           vulkan-headers
+           vulkan-loader))
    (synopsis "OpenAI's Whisper model in C/C++")
    (description
     "This package is a high-performance inference of OpenAI's
@@ -1463,7 +1472,7 @@ unsupervised text tokenizer.")))
 (define-public python-sentence-transformers
  (package
    (name "python-sentence-transformers")
-    (version "5.1.0")
+    (version "5.1.2")
    (source
     (origin
       (method git-fetch)
@@ -1473,7 +1482,7 @@ unsupervised text tokenizer.")))
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1jkj77q25b21nxrdszvlw127jnx1m7x8czldiq2mfyj76yjk0ymj"))))
+         "0n873pw0c9mkn3z1i9par6y6c0q6mvgiwvcjy74jv0swc2cpilhl"))))
    (build-system pyproject-build-system)
    (arguments
     (list #:tests? #f))        ;network access is required
@@ -1996,7 +2005,7 @@ than 8 bits, and at the end only some significant 8 bits are kept.")
 (define-public dlib
  (package
    (name "dlib")
-    (version "19.24.6")
+    (version "20.0")
    (source
     (origin
      (method git-fetch)
@@ -2005,75 +2014,75 @@ than 8 bits, and at the end only some significant 8 bits are kept.")
            (commit (string-append "v" version))))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "11j86nxkj78v8xdx2s80mfplq4j0rs0y0iidqgma12b2pdk3p486"))
+       (base32 "1k6jwbb7n842snd2znv0ix8zwa4a35y324jb7mpkj0vn9arzndam"))
      (modules '((guix build utils)))
      (snippet
       '(begin
          (delete-file-recursively "dlib/external")))))
    (build-system cmake-build-system)
    (arguments
-     `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'disable-asserts
-           (lambda _
-             ;; config.h recommends explicitly enabling or disabling asserts
-             ;; when building as a shared library. By default neither is set.
-             (substitute* "dlib/config.h"
-               (("^//#define DLIB_DISABLE_ASSERTS") "#define DLIB_DISABLE_ASSERTS"))
-             #t))
-         (add-after 'disable-asserts 'disable-failing-tests
-           (lambda _
-             ;; One test times out on MIPS, so we need to disable it.
-             ;; Others are flaky on some platforms.
-             (let* ((system ,(or (%current-target-system)
-                                 (%current-system)))
-                    (disabled-tests (cond
-                                     ((string-prefix? "mips64" system)
-                                      '("object_detector" ; timeout
-                                        "data_io"))
-                                     ((string-prefix? "armhf" system)
-                                      '("learning_to_track"))
-                                     ((string-prefix? "i686" system)
-                                      '("optimization"))
-                                     (else '()))))
-               (for-each
-                (lambda (test)
-                  (substitute* "dlib/test/makefile"
-                    (((string-append "SRC \\+= " test "\\.cpp")) "")))
-                disabled-tests)
-               #t)))
-         (replace 'check
-           (lambda _
-             ;; XXX: This causes a rebuild--however, trying to run the tests
-             ;; without rebuilding causes a lot of errors.
-             ;; Also, the official way is to rebuild.
-             (mkdir "../source/dlib/test/build")
-             (with-directory-excursion "../source/dlib/test/build"
-               (invoke "cmake" "-DBUILD_SHARED_LIBS=ON" "..")
-               (invoke "cmake" "--build" "." "--config" "Release")
-               (invoke "./dtest" "--runall")))))))
+     (list
+      #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-asserts
+            (lambda _
+              ;; config.h recommends explicitly enabling or disabling asserts
+              ;; when building as a shared library. By default neither is set.
+              (substitute* "dlib/config.h"
+                (("^//#define DLIB_DISABLE_ASSERTS") "#define DLIB_DISABLE_ASSERTS"))
+              #t))
+          (add-after 'disable-asserts 'disable-failing-tests
+            (lambda _
+              ;; One test times out on MIPS, so we need to disable it.
+              ;; Others are flaky on some platforms.
+              (let* ((system ,(or (%current-target-system)
+                                  (%current-system)))
+                     (disabled-tests (cond
+                                      ((string-prefix? "mips64" system)
+                                       '("object_detector" ; timeout
+                                         "data_io"))
+                                      ((string-prefix? "armhf" system)
+                                       '("learning_to_track"))
+                                      ((string-prefix? "i686" system)
+                                       '("optimization"))
+                                      (else '()))))
+                (for-each
+                 (lambda (test)
+                   (substitute* "dlib/test/makefile"
+                     (((string-append "SRC \\+= " test "\\.cpp")) "")))
+                 disabled-tests))))
+          (replace 'check
+            (lambda _
+              ;; XXX: This causes a rebuild--however, trying to run the tests
+              ;; without rebuilding causes a lot of errors.
+              ;; Also, the official way is to rebuild.
+              (mkdir "../source/dlib/test/build")
+              (with-directory-excursion "../source/dlib/test/build"
+                (invoke "cmake" "-DBUILD_SHARED_LIBS=ON" "..")
+                (invoke "cmake" "--build" "." "--config" "Release")
+                (invoke "./dtest" "--runall")))))))
    (native-inputs
-     (list pkg-config
-           ;; For tests.
-           libnsl))
+     (list pkg-config))
    (inputs
-     `(("ffmpeg" ,ffmpeg)
-       ("giflib" ,giflib)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libjxl" ,libjxl-0.10)
-       ("libpng" ,libpng)
-       ("libwebp" ,libwebp)
-       ("libx11" ,libx11)
-       ("openblas" ,openblas)
-       ("zlib" ,zlib)))
+     (list ffmpeg
+           giflib
+           libjpeg-turbo
+           libjxl
+           libpng
+           libwebp
+           libx11
+           openblas
+           pybind11
+           zlib))
    (synopsis
-     "Toolkit for making machine learning and data analysis applications in C++")
+     "Toolkit for making machine learning and data analysis applications in
+C++")
    (description
     "Dlib is a modern C++ toolkit containing machine learning algorithms and
 tools.  It is used in both industry and academia in a wide range of domains
-including robotics, embedded devices, mobile phones, and large high performance
-computing environments.")
+including robotics, embedded devices, mobile phones, and large high
+performance computing environments.")
    (home-page "http://dlib.net")
    (license license:boost1.0)))

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2014, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2014-2015, 2017-2018, 2021, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu>
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
@@ -174,7 +174,7 @@ a flexible and convenient way.")
                   '("nroff" "eqn" "neqn" "tbl" "refer" "pic")))
           ;; At run time we should refer to GROFF-MINIMAL, not GROFF (the latter
           ;; pulls in Perl.)
-           #:disallowed-references (list groff)))
+           #:disallowed-references (list (this-package-native-input "groff"))))
    (native-inputs
     (list pkg-config flex
           ;; Groff is needed at build time for troff, grops, soelim, etc.
@@ -402,7 +402,7 @@ on any distribution, and the nroff source is included."))))
  ;; input "locales" contain the original (English) text.
  (package
    (name "help2man")
-    (version "1.49.2")
+    (version "1.49.3")
    (source
     (origin
       (method url-fetch)
@@ -410,7 +410,7 @@ on any distribution, and the nroff source is included."))))
                           version ".tar.xz"))
       (sha256
        (base32
-         "0dnxx96lbcb8ab8yrdkqll14cl5n0bch8qpd9qj3c2ky78hhwbly"))))
+         "0kzxla1w0w4z5la255lg9q51wy3qx8f1b0i6gbhaz9pcybg4yzjd"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -329,6 +329,18 @@ documents in the ms and man formats, LaTeX, gemini, and terminal output.")
    (home-page "https://www.pell.portland.or.us/~orc/Code/discount/")
    (license license:bsd-3)))

+(define-public discount-2
+  (package/inherit discount
+    (version "2.2.7d")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "http://www.pell.portland.or.us/~orc/Code/"
+                   "discount/discount-" version ".tar.bz2"))
+             (sha256
+              (base32
+               "0lkvnysnnaw431dam3b8b1f0ln1iscas5wcgw0bxx35fjqg098hj"))))))
+
 (define-public perl-text-markdown
  (package
    (name "perl-text-markdown")
@@ -384,7 +396,7 @@ maintained.")
                      "/lib")))
             #t)))))
    (inputs
-     (list discount))
+     (list discount-2))
    (home-page
     "https://metacpan.org/release/Text-Markdown-Discount")
    (synopsis
@@ -121,10 +121,14 @@ parsers to allow execution with Guile as extension languages.")
                "0wyrq9sc9j0yp34iwzsjfpz40503psbvd982vy8kx8ym99rn5w7r"))
              (modules '((guix build utils)))
              (snippet
-               '(substitute* "configure"
-                  (("GUILE_GLOBAL_SITE=\\$prefix.*")
-                   "GUILE_GLOBAL_SITE=\
-$prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n")))))))
+               '(begin
+                  (substitute* "configure"
+                    (("GUILE_GLOBAL_SITE=\\$prefix.*")
+                     "GUILE_GLOBAL_SITE=\
+$prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n"))
+                  (substitute* "module/Makefile.in"
+                    (("@NYACC_FH_BS_BINS@") "$(NYACC_FH_BS_BINS)"))))))
+    (propagated-inputs (list guile-bytestructures))))

 (define-public mes
  (package
@@ -1360,7 +1360,7 @@ Encryption to Gajim.")
 (define-public dino
  (package
    (name "dino")
-    (version "0.5.0")
+    (version "0.5.1")
    (source
     (origin
       (method url-fetch)
@@ -1368,7 +1368,7 @@ Encryption to Gajim.")
        (string-append "https://github.com/dino/dino/releases/download/v"
                       version "/dino-" version ".tar.gz"))
       (sha256
-        (base32 "1hghyldh95i6sx778nkbmfn5qbi2h7qpv59vzi7zz9anmxgjckli"))))
+        (base32 "0rfn7rmib2jin83j3rx7ssh63frcmgf8n61fnvaxmk8xapimw9hb"))))
    (build-system meson-build-system)
    (outputs '("out" "debug"))
    (arguments
@@ -1934,40 +1934,6 @@ for @uref{https://torproject.org,tor} router) and many more.")
                   ;; bin/psycplay states AGPL with no version:
                   license:agpl3+))))

-(define-public libpsyc
-  (package
-    (name "libpsyc")
-    (version "20160913")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://www.psyced.org/files/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "14q89fxap05ajkfn20rnhc6b1h4i3i2adyr7y6hs5zqwb2lcmc1p"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list perl netcat procps))
-    (arguments
-     `(#:make-flags
-       (list "CC=gcc"
-             (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         ;; The rust bindings are the only ones in use, the lpc bindings
-         ;; are in psyclpc.  The other bindings are not used by anything,
-         ;; the chances are high that the bindings do not even work,
-         ;; therefore we do not include them.
-         ;; TODO: Get a cargo build system in Guix.
-         (delete 'configure)))) ; no configure script
-    (home-page "https://about.psyc.eu/libpsyc")
-    (description
-     "@code{libpsyc} is a PSYC library in C which implements
-core aspects of PSYC, useful for all kinds of clients and servers
-including psyced.")
-    (synopsis "PSYC library in C")
-    (license license:agpl3+)))
-
 (define-public loudmouth
  (package
    (name "loudmouth")
@@ -2489,54 +2455,6 @@ implementation.")
    (license (list license:gpl3+        ; all source code
                   license:lgpl3+))))   ; icons/breeze

-(define-public hangups
-  (package
-    (name "hangups")
-    (version "0.4.18")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "hangups" version))
-       (sha256
-        (base32 "12mq22lygh6vz2h5dpvyjk18hx3jphb4kkavqsy298c7hw60hn7l"))))
-    (build-system pyproject-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'relax-dependencies
-           ;; Relax overly strict package version specifications.
-           (lambda _
-             (substitute* "setup.py"
-               (("==") ">=")
-               ((",<.*'") "'")))))))
-    (native-inputs
-     (list nss-certs-for-test
-           python-httpretty
-           python-pytest
-           python-setuptools
-           python-wheel))
-    (propagated-inputs
-     (list python-aiohttp
-           python-appdirs
-           python-async-timeout
-           python-configargparse
-           python-mechanicalsoup
-           python-protobuf
-           python-readlike
-           python-reparser
-           python-requests
-           python-urwid))
-    (home-page "https://hangups.readthedocs.io/")
-    (synopsis "Instant messaging client for Google Hangouts")
-    (description
-     "Hangups is an instant messaging client for Google Hangouts.  It includes
-both a Python library and a reference client with a text-based user interface.
-
-Hangups is implements a reverse-engineered version of Hangouts' proprietary,
-non-interoperable protocol, which allows it to support features like group
-messaging that aren’t available to clients that connect over XMPP.")
-    (license license:expat)))
-
 (define-public telegram-purple
  (package
    (name "telegram-purple")
@@ -467,6 +467,57 @@ HTTP.  Features:
@end itemize")
    (license license:gpl2)))

+(define-public dgop
+  (package
+    (name "dgop")
+    (version "0.1.11")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/AvengeMedia/dgop")
+              (commit (string-append "v" version))))
+       (sha256
+        (base32 "1iy9ndvrp7l1hr5ya2xf80j8ywcg8098z8wj2r47wdsqpagx2722"))
+       (file-name (git-file-name name version))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:install-source? #f
+      #:import-path "github.com/AvengeMedia/dgop/cmd/cli"
+      #:unpack-path "github.com/AvengeMedia/dgop"
+      #:test-subdirs
+      #~(list "../../...") ;test the whole libary
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'rename-cli
+            (lambda* (#:key output #:allow-other-keys)
+              (let* ((bin (string-append #$output "/bin")))
+                (rename-file (string-append bin "/cli")
+                             (string-append bin "/dgop"))))))))
+    (native-inputs
+     (list go-github-com-caarlos0-env
+           go-github-com-charmbracelet-bubbles
+           go-github-com-charmbracelet-lipgloss
+           go-github-com-charmbracelet-log
+           go-github-com-danielgtaylor-huma-v2
+           go-github-com-fsnotify-fsnotify
+           go-github-com-go-chi-chi-v5
+           go-github-com-gorilla-schema
+           go-github-com-shirou-gopsutil-v4
+           go-github-com-spf13-cobra
+           go-github-com-stretchr-testify))
+    (home-page "https://github.com/AvengeMedia/dgop")
+    (synopsis "Stateless system monitoring CLI + REST API")
+    (description
+     "dgop is a system monitoring tool.  It supports cursor-based sampling of
+CPU/memory/disk/network, plus an optional REST API server.  It supports
+cursor-based sampling for building real-time monitoring tools like
+@command{htop}.  Instead of relying on instantaneous snapshots, it may track
+system state changes over time for more accurate CPU usage calculations and
+network/disk rates.")
+    (license license:expat)))
+
 (define-public python-whisper
  (package
    (name "python-whisper")
@@ -790,14 +841,15 @@ devices.")
              (patches (search-patches "collectd-5.11.0-noinstallvar.patch"))))
    (build-system gnu-build-system)
    (arguments
-     `(#:configure-flags (list "--localstatedir=/var" "--sysconfdir=/etc")
+     `(#:configure-flags (list "--localstatedir=/var" "--sysconfdir=/etc"
+                               "CFLAGS=-Wno-error=deprecated-declarations")
       #:phases (modify-phases %standard-phases
                  (add-before 'configure 'autoreconf
                    (lambda _
                      ;; Required because of patched sources.
                      (invoke "autoreconf" "-vfi"))))))
    (inputs
-     (list rrdtool curl yajl))
+     (list rrdtool curl yajl zlib))
    (native-inputs
     (list autoconf automake libtool pkg-config))
    (home-page "https://collectd.org/")
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2015, 2019-2020, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2023 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016, 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017, 2018, 2019, 2021, 2022, 2023, 2025 Ricardo Wurmus <rekado@elephly.net>
@@ -255,7 +255,7 @@ servers from Python programs.")
                  (guix build utils))
      #:imported-modules `((guix build python-build-system)
                           ,@%default-gnu-imported-modules)
-      #:disallowed-references (list httpd)
+      #:disallowed-references (list (this-package-native-input "httpd"))
      #:configure-flags
      #~(list
         ;; Relax gcc-14's strictness.
@@ -35,69 +35,6 @@
  #:use-module (gnu packages python)
  #:use-module (gnu packages web))

-(define-public libtmcg
-  (package
-    (name "libtmcg")
-    (version "1.3.18")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/libtmcg/libTMCG-" version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "179b5jx3mqs9hgsj8cfwk6x8qib60kw9szk9fkz6s1gl3v83mnyx"))))
-    (build-system gnu-build-system)
-    (arguments '(#:configure-flags '("--enable-silent-rules")))
-    (inputs (list gmp libgcrypt))
-    (synopsis
-     "C++ library for creating secure and fair online card games")
-    (description
-     "The library provides a sort of useful classes, algorithms, and
-high-level protocols to support an application programmer in writing such
-software.  The most remarkable feature is the absence of a trusted third
-party (TTP), i.e. neither a central game server nor trusted hardware
-components are necessary.
-
-The corresponding cryptographic problem, actually called Mental Poker, has
-been studied since 1979 (Shamir, Rivest, and Adleman) by many authors.
-LibTMCG provides the first practical implementation of such protocols.")
-    (home-page "https://www.nongnu.org/libtmcg/")
-    (license license:gpl2+)))
-
-(define-public dkgpg
-  (package
-    (name "dkgpg")
-    (version "1.1.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/dkgpg/dkgpg-" version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "1hpfg7akd5icj49i03z74hp9zj0xwl90bndn0hnw0hpb8lk7qcxg"))))
-    (build-system gnu-build-system)
-    (arguments '(#:configure-flags
-                 '("--enable-silent-rules")
-                 ;; https://savannah.nongnu.org/bugs/?58772
-                 #:parallel-tests? #f))
-    (inputs (list bzip2 gmp libgcrypt libtmcg zlib))
-    (synopsis
-     "Distributed Key Generation and Threshold Cryptography for OpenPGP")
-    (description
-     "The Distributed Privacy Guard (DKGPG) implements Distributed Key
-Generation (DKG) and Threshold Cryptography for OpenPGP.  The generated public
-keys are compatible with the standard and thus can be used by any
-RFC4880-compliant application (e.g. GnuPG).  The main purposes of this
-software are distributing power among multiple parties, eliminating single
-points of failure, and increasing the difficulty of side-channel attacks on
-private key material.
-
-DKGPG consists of a bunch of simple command-line programs.  The current
-implementation is in experimental state and should NOT be used in production
-environments.")
-    (home-page "https://www.nongnu.org/dkgpg/")
-    (license license:gpl2+)))
-
 (define-public rnp
  (let ((day-of-release "2024-05-14"))
    (package
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013-2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015, 2017, 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
 ;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
@@ -792,8 +792,8 @@ which are indicated in the file name.")
 (define-public guix-modules
  (package
    (name "guix-modules")
-    (version "0.2.0")
-    (home-page "https://gitlab.inria.fr/guix-hpc/guix-modules")
+    (version "0.2.1")
+    (home-page "https://codeberg.org/guix-science/guix-modules")
    (source (origin
              (method git-fetch)
              (uri (git-reference (url home-page)
@@ -801,7 +801,7 @@ which are indicated in the file name.")
              (file-name (string-append "guix-modules-" version "-checkout"))
              (sha256
               (base32
-                "0k3mz2d1qjx7nclg7mgk77rwvyjsmz3j0hpzihvmznx5bly8wg92"))))
+                "1krdqnd4s0nz004dvpd5ban2rr3sjiy2620rb5vvi16x9q0pxvqj"))))
    (build-system guile-build-system)
    (arguments
     '(#:phases (modify-phases %standard-phases
@@ -2010,7 +2010,7 @@ environments.")
             guile-next))
      (inputs
       (list guile-next
-             sqlite
+             sqlite-next
             bash-minimal
             (libc-utf8-locales-for-target)
             sqitch))
@@ -2164,8 +2164,8 @@ in an isolated environment, in separate namespaces.")
    (license license:gpl3+)))

 (define-public nar-herder
-  (let ((commit "2f2f100144646d28df4559c669fd543c369ed468")
-        (revision "47"))
+  (let ((commit "1aa7b6199174e22a6d4ed559f9422ac5e38fc643")
+        (revision "49"))
    (package
      (name "nar-herder")
      (version (git-version "0" revision commit))
@@ -2176,7 +2176,7 @@ in an isolated environment, in separate namespaces.")
                      (commit commit)))
                (sha256
                 (base32
-                  "1npfs2g9cvvvr7qa12j4cb8yz9ymhnqvlqrbh6a2nbhifndv9ayh"))
+                  "0acbgaczw83n6bfqbqr70fhcrjg7jdrxbvjzv62ghrzb5rmkv6hi"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
      (arguments
@@ -80,14 +80,14 @@
 (define-public parallel
  (package
    (name "parallel")
-    (version "20250922")
+    (version "20251022")
    (source
     (origin
      (method url-fetch)
      (uri (string-append "mirror://gnu/parallel/parallel-"
                          version ".tar.bz2"))
      (sha256
-       (base32 "0ax3cm9bzr6krl575mzmlbx7867pnx5acnyygpcxqzgg4lqxqggf"))
+       (base32 "1qcynvqh7g78iwas0gwv4a29dk0i985pp6pqih3zrll8jvajchs7"))
      (snippet
       '(begin
          (use-modules (guix build utils))
@@ -1225,7 +1225,6 @@ using password-store through rofi interface:
                   (list "addpass" "rofi-pass")))))))))
    (inputs
     (modify-inputs (package-inputs rofi-pass)
-       (replace "rofi" rofi-wayland)
       (replace "xclip" wl-clipboard)
       (replace "xdotool" wtype)
       (delete "xset")))
--- a/Show More
+++ b/Show More