gnu: ruby: Update to use 3.4 series.

* gnu/packages/ruby.scm (ruby): Use Ruby-3.4 which is still in full maintenance period. Signed-off-by: Steve George <steve@futurile.net>
gnu: ruby-timeout: Update to 0.6.0.
2026-07-07 23:04:05 +02:00 · 2026-04-26 12:41:27 +01:00 · 2026-04-26 12:41:27 +01:00 · 2026-04-26 12:41:27 +01:00 · 2026-04-26 12:41:27 +01:00 · 2026-04-26 12:41:27 +01:00
261 changed files with 18165 additions and 76981 deletions
@@ -16,8 +16,6 @@
  ( ;; primary: "D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F"
   "01FD 85F4 1A7B 7F82 0583  06A5 935E BE07 36DC 857E"
   (name "avp"))
-  ("5D54 CF25 57B2 38E8 8DC1  80A2 2D22 3241 0AB7 4043"
-   (name "baleine"))
  ( ;; primary: "34FF 38BC D151 25A6 E340  A0B5 3453 2F9F AFCA 8B8E"
   "A3A4 B419 0074 087C A7DE  5698 BC45 CA67 E2F8 D007"
   (name "bavier"))
@@ -264,7 +264,6 @@ gnu/installer(\.scm$|/)                            @guix/installer
 gnu/packages/clojure\.scm                          @guix/java
 gnu/packages/java(-.+|)\.scm$                      @guix/java
 gnu/packages/maven(-.+|)\.scm$                     @guix/java
-gnu/packages/netbeans\.scm                         @guix/java
 guix/build/ant-build-system\.scm                   @guix/java
 guix/build/clojure-build-system\.scm               @guix/java
 guix/build/clojure-utils\.scm                      @guix/java
@@ -275,7 +274,6 @@ guix/build-system/ant\.scm                         @guix/java
 guix/build-system/clojure\.scm                     @guix/java
 guix/build-system/maven\.scm                       @guix/java

-gnu/packages/javascript\.scm                       @guix/javascript
 gnu/packages/node-xyz\.scm                         @guix/javascript
 gnu/packages/node\.scm                             @guix/javascript
 guix/build-system/node\.scm                        @guix/javascript
@@ -457,8 +457,6 @@ AUX_FILES =						\
  gnu/packages/aux-files/findclass.php			\
  gnu/packages/aux-files/guix.vim			\
  gnu/packages/aux-files/guix-nvim.vim			\
-  gnu/packages/aux-files/linux-libre/7.0-arm64.conf	\
-  gnu/packages/aux-files/linux-libre/7.0-x86_64.conf	\
  gnu/packages/aux-files/linux-libre/6.19-arm64.conf	\
  gnu/packages/aux-files/linux-libre/6.19-i686.conf	\
  gnu/packages/aux-files/linux-libre/6.19-x86_64.conf	\
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019-2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
@@ -324,31 +324,17 @@ actual file name."
                    ((('span ('@ ('class "category")) ;raw Texinfo 6.8
                             (? string-or-entity?) ...) rest ...)
                     #t)
-                    ((('span                      ;Texinfo 6, post-processed
-                       ('@ ('class "symbol-definition-category"))
-                       (? string-or-entity?) ...) rest ...)
-                     #t)
-                    ((('span                      ;Texinfo 7
-                       ('@ ('class "category-def")) _ ...)
-                      ('span ('strong ('@ ('class "def-name")) _ ...)
-                             _ ...)
-                      rest ...)
+                    ((('span ('@ ('class "symbol-definition-category"))
+                             (? string-or-entity?) ...) rest ...)
                     #t)
                    (x
                     #f))))

-              (define (definition-class? class)
-                ;; Return true for "deffn def-line", "deftp def-line", etc.
-                (string-suffix? " def-line" class))
-
              (let ((shtml (call-with-input-file file html->shtml)))
                (let loop ((shtml shtml)
                           (anchors anchors))
                  (match shtml
-                    ((or ('dt ('@ ('id id) _ ...) rest ...)      ;Texinfo 6
-                         ('dt ('@ ('class (? definition-class?)) ;Texinfo 7
-                                  ('id id))
-                              rest ...))
+                    (('dt ('@ ('id id) _ ...) rest ...)
                     (if (and (string-prefix? "index-" id)
                              (worthy-entry? rest))
                         (alist-cons (anchor-id->key id)
@@ -519,16 +505,10 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                   (loop rest (cons str strings)))
                  ((('*ENTITY* "additional" entity) . rest)
                   (loop rest (cons (entity->string entity) strings)))
-                  ((('*ENTITY* "additional-char" entity) . rest)
-                   (loop rest (cons (string
-                                     (integer->char (string->number entity)))
-                                    strings)))
                  ((('span _ lst ...) . rest)     ;for <span class="roman">
                   (loop (append lst rest) strings))
-                  ((('var ('@ _) name) . rest)    ;for @var{name} within @lisp
+                  ((('var name) . rest)           ;for @var{name} within @lisp
                   (loop rest (cons name strings))) ;XXX: losing formatting
-                  ((('var name) . rest)           ;likewise (Texinfo 6)
-                   (loop rest (cons name strings)))
                  (something
                   (pk 'unsupported-code-snippet something)
                   (primitive-exit 1)))))
@@ -557,10 +537,7 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                          (link (@ (rel "stylesheet")
                                   (type "text/css")
                                   (href #$syntax-css-url)))))
-                  ((or ('pre ('@ ('class "lisp")) ;Texinfo 6
-                             code-snippet ...)
-                       ('pre ('@ ('class "lisp-preformatted"))
-                             code-snippet ...))
+                  (('pre ('@ ('class "lisp")) code-snippet ...)
                   `(pre (@ (class "lisp"))
                         ,@(highlights->sxml*
                            (pair-open/close
@@ -568,16 +545,14 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                                        (concatenate-snippets code-snippet)))
                            anchors)))

-                  ;; For Texinfo 6: Replace the ugly <strong> used for @deffn
-                  ;; etc., which translate to <dt>, with more stylable
-                  ;; markup.  No such post-processing is needed for @deffn
-                  ;; with Texinfo 7.
+                  ;; Replace the ugly <strong> used for @deffn etc., which
+                  ;; translate to <dt>, with more stylable markup.
                  (('dt ('@ ('id id))             ;raw Texinfo 6.8
                        ('span ('@ ('class "category")) category ...)
                        ('span ('strong thing)
                               anchor))
                   (highlight-definition id category thing '()))
-                  (('dt ('@ ('id id))             ;ditto
+                  (('dt (@ ('id id))
                        ('span ('@ ('class "category")) category ...)
                        ('span ('strong thing)
                               (? space?) ('em args ...)
@@ -833,9 +808,16 @@ in SOURCE."
                (match sxml
                  (('*TOP* decl body ...)
                   `(*TOP* ,decl ,@(map loop body)))
-                  ((or ('body ('@ _) elements ...)
-                       ('body elements ...))
-                   `(body ,(navigation-bar
+                  (('head elements ...)
+                   ;; Add reference to our own manual CSS, which provides
+                   ;; support for the language menu.
+                   `(head ,@elements
+                          (link (@ (rel "stylesheet")
+                                   (type "text/css")
+                                   (href #$manual-css-url)))))
+                  (('body ('@ attributes ...) elements ...)
+                   `(body (@ ,@attributes)
+                          ,(navigation-bar
                            ;; TODO: Add "Contribute" menu, to report
                            ;; errors, etc.
                            (list (menu-dropdown
@@ -970,12 +952,12 @@ makeinfo OPTIONS."
                        (mkdir-p (string-append #$output "/"
                                                (normalize language)))
                        (setenv "LANGUAGE" language)
-                        (apply invoke #$(file-append texinfo-7 "/bin/makeinfo")
+                        (apply invoke #$(file-append texinfo "/bin/makeinfo")
                               "-o" (string-append #$output "/"
                                                   (normalize language)
                                                   "/html_node")
                               opts)
-                        (apply invoke #$(file-append texinfo-7 "/bin/makeinfo")
+                        (apply invoke #$(file-append texinfo "/bin/makeinfo")
                               "--no-split"
                               "-o"
                               (string-append #$output "/"
@@ -1427,7 +1409,7 @@ commit date (an integer)."
                                 (string-append #+tar "/bin:"
                                                #+xz "/bin:"
                                                #+zstd "/bin:"
-                                                #+texinfo-7 "/bin"))
+                                                #+texinfo "/bin"))
                         (invoke "tar" "xf" #$(package-source guile))
                         (mkdir-p (string-append #$output "/en/html_node"))

@@ -1446,7 +1428,7 @@ commit date (an integer)."
                              (string-append #$output "/en/html_node")))))))))

 (define %guile-manual-base-url
-  "https://doc.guix.gnu.org/guile/latest/en")
+  "https://www.gnu.org/software/guile/manual")

 (define (for-all-languages index)
  (map (lambda (language)
@@ -646,11 +646,9 @@ This field contains a description of the source code origin.  The

@enumerate
@item  The method, here @code{url-fetch} to download via HTTP/FTP, but other methods
-    exist, such as @code{git-fetch} for Git repositories.  @xref{origin
-    Reference,,, guix, GNU Guix Reference Manual}, for more info on the
-    available download methods.
+    exist, such as @code{git-fetch} for Git repositories.
@item  The URI, which is typically some @code{https://} location for @code{url-fetch}.  Here
-    the special @code{mirror://gnu} refers to a set of well known locations, all of
+    the special `mirror://gnu` refers to a set of well known locations, all of
    which can be used by Guix to fetch the source, should some of them fail.
@item  The @code{sha256} checksum of the requested file.  This is essential to ensure
    the source is not corrupted.  Note that Guix works with base32 strings,
@@ -1118,8 +1116,7 @@ Let's discuss those fields in depth.
@subsubsection @code{git-fetch} method

 Unlike the @code{url-fetch} method, @code{git-fetch} expects a @code{git-reference} which takes
-a Git repository and a commit (@pxref{origin Reference,,, guix, GNU Guix
-Reference Manual}).  The commit can be any Git reference such as
+a Git repository and a commit.  The commit can be any Git reference such as
 tags, so if the @code{version} is tagged, then it can be used directly.  Sometimes
 the tag is prefixed with a @code{v}, in which case you'd use @code{(commit (string-append
 "v" version))}.
@@ -1165,7 +1162,7 @@ Snippets might need additional Guile modules which can be imported from the

 There are 3 different input types.  In short:

-@table @code
+@table @asis
@item native-inputs
 Required for building but not runtime -- installing a package
 through a substitute won't install these inputs.
@@ -1233,14 +1230,9 @@ It's advised to separate outputs only when you've shown it's worth it: if the
 output size is significant (compare with @code{guix size}) or in case the package is
 modular.

-@xref{Packages with Multiple Outputs,,, guix, GNU Guix Reference
-Manual}, for more info.
-
@subsubsection Build system arguments

-The @code{arguments} is a keyword-value list used to configure the build
-process; these arguments are passed to the @dfn{build system}
-(@pxref{Build Systems,,, guix, GNU Guix Reference Manual}).
+The @code{arguments} is a keyword-value list used to configure the build process.

 The simplest argument @code{#:tests?} can be used to disable the test suite when
 building the package.  This is mostly useful when the package does not feature
@@ -1256,7 +1248,7 @@ following flags
                   "CC=gcc")
@end lisp

-translate into:
+translate into

@example
 $ make CC=gcc prefix=/gnu/store/...-<out>
@@ -1276,9 +1268,7 @@ Similarly, it's possible to set the configure flags:
 The @code{%build-inputs} variable is also generated in scope.  It's an association
 table that maps the input names to their store directories.

-The @code{phases} keyword lists the sequential steps of the build
-system.  @xref{Build Phases,,, guix, GNU Guix Reference Manual}, for
-details; in a nutshell,
+The @code{phases} keyword lists the sequential steps of the build system.  Typically
 phases include @code{unpack}, @code{configure}, @code{build}, @code{install} and @code{check}.  To know
 more about those phases, you need to work out the appropriate build system
 definition in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm}:
@@ -1393,12 +1383,10 @@ Its return value is ignored.

@subsubsection Code staging

-The astute reader may have noticed the hash-tilde and hash-dollar syntax in the
+The astute reader may have noticed the quasi-quote and comma syntax in the
 argument field.  Indeed, the build code in the package declaration should not be
 evaluated on the client side, but only when passed to the Guix daemon.  This
 mechanism of passing code around two running processes is called @uref{https://arxiv.org/abs/1709.00833, code staging}.
-@xref{G-Expressions,,, guix, GNU Guix Reference Manual}, for info on the
-this mechanism, which is called @dfn{g-expressions}.

@subsubsection Utility functions

@@ -1407,7 +1395,7 @@ equivalent system invocations (@code{make}, @code{mkdir}, @code{cp}, etc.)@: com
 regular ``Unix-style'' installations.

 Some like @code{chmod} are native to Guile.
-@xref{File System,,, guile, Guile reference manual} for a complete list.
+@xref{,,, guile, Guile reference manual} for a complete list.

 Guix provides additional helper functions which prove especially handy in the
 context of package management.
@@ -1587,9 +1575,7 @@ noticed that a significant number of them have a @code{inherit} field:

 All unspecified fields are inherited from the parent package.  This is very
 convenient to create alternative packages, for instance with different source,
-version or compilation options.  @xref{Defining Package Variant,,, guix,
-GNU Guix Reference Manual}, for a discussion of inheritance and of other
-ways to create package variants.
+version or compilation options.

@node Getting help
@subsection Getting help
@@ -1630,8 +1616,7 @@ hopefully we will see your contributions soon!

@itemize
@item
-@xref{Defining Packages,,, guix, GNU Guix Reference Manual}, for the
-@code{package} reference in the manual.
+The @uref{https://guix.gnu.org/manual/en/html_node/Defining-Packages.html, package reference in the manual}

@item
@uref{https://gitlab.com/pjotrp/guix-notes/blob/master/HACKING.org, Pjotr’s hacking guide to GNU Guix}
@@ -3271,8 +3256,8 @@ your Linode Summary section.) Now you can run the "install guix from

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

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

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

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

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

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

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

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

@c Base URL for downloads.
@set BASE-URL https://ftpmirror.gnu.org/gnu/guix
@@ -264,7 +264,6 @@ Setting Up the Daemon
 * Build Environment Setup::     Preparing the isolated build environment.
 * Daemon Offload Setup::        Offloading builds to remote machines.
 * SELinux Support::             Using an SELinux policy for the daemon.
-* AppArmor Support::            Using an AppArmor profile for the daemon.

 System Installation

@@ -481,14 +480,12 @@ Home Services
 * GPG: GNU Privacy Guard.       Setting up GPG and related tools.
 * Desktop: Desktop Home Services.  Services for graphical environments.
 * Guix: Guix Home Services.     Services for Guix.
-* Backup: Backup Home Services.  Services for backing up User's files.
+* Backup: Backup Home Services.   Services for backing up User's files.
 * Fonts: Fonts Home Services.   Services for managing User's fonts.
 * Sound: Sound Home Services.   Dealing with audio.
 * Mail: Mail Home Services.     Services for managing mail.
 * Messaging: Messaging Home Services.  Services for managing messaging.
 * Media: Media Home Services.   Services for managing media.
-* mpv Media Player::
-* Niri: Niri window manager.    Setting up the Niri.
 * Sway: Sway window manager.    Setting up the Sway configuration.
 * Networking: Networking Home Services.  Networking services.
 * Secrets: Secrets Home Services.  Services for storing secrets.
@@ -2661,13 +2658,12 @@ bootloaders.

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

@example
 mkfs.fat -F32 /dev/sda1
@@ -4783,91 +4779,14 @@ These options are provided for convenience, but you can also specify your
 configuration in the @file{~/.config/guix/channels.scm} file or using the
@option{--channels} option (see below).

-@item --channels=@var{file-or-uri}
-@itemx -C @var{file-or-uri}
-Read the list of channels from @var{file-or-uri} instead of
+@item --channels=@var{file}
+@itemx -C @var{file}
+Read the list of channels from @var{file} instead of
@file{~/.config/guix/channels.scm} or @file{/etc/guix/channels.scm}.
-@var{file-or-uri} must contain Scheme code that
+@var{file} must contain Scheme code that
 evaluates to a list of channel objects.  @xref{Channels}, for more
 information.

-As you can guess, @var{file-or-uri} can be a URL, in which case the
-given channels file is transparently downloaded.  In the example below,
-we pull from the latest revision of Guix that was successfully
-evaluated:
-
-@example
-guix pull \
-  -C https://ci.guix.gnu.org/eval/latest/channels.scm?spec=master
-@end example
-
-@cindex SWHID, for channel files
-Alternatively, you can refer to a channel file by its
-@uref{https://swhid.org,Software Hash Identifier}, or SWHID, which
-uniquely and unambiguously identifies contents, as in this example:
-
-@example
-guix pull \
-  -C swh:1:cnt:ae02d8ba3538a385ee799e61cdd0dfc5e14a8d1b
-@end example
-
-This command downloads the data designated by the given identifier from
-@uref{https://archive.softwareheritage.org, the Software Heritage
-archive}.
-
-@anchor{trusted-channels}
-@cindex trusted channels, for downloaded channel files
-In both cases, the command errors out if the returned channels are not
-among the user's @dfn{trusted channels}, defined as:
-
-@itemize
-@item
-the channels returned by @file{~/.config/guix/trusted-channels.scm},
-which has the same format as any channel file;
-
-@item
-or, if the above file doesn't exist, the currently-used channels as
-returned by @command{guix describe}.
-@end itemize
-
-@item --allow-untrusted-channels[=yes|no]
-Whether to allow pulls from untrusted channels.
-
-By default, @command{guix pull} aborts when downloading a channel file
-that specifies an untrusted channel and merely warns if the list of
-channels comes from a local file.  This option allows you to change
-that.
-
-@quotation Warning
-Allowing untrusted channels can effectively lead to arbitrary code
-execution on your system.
-@end quotation
-
-@anchor{unsafe-channel-evaluation}
-@item --unsafe-channel-evaluation
-Allow arbitrary code execution from channel files, both the default
-@file{channels.scm} files and those passed with @option{--channels} as
-mentioned above.
-
-@cindex sandboxing, of channel evaluation
-By default, channel files are evaluated in an isolated ``sandbox''
-where only trivial declarative code returning a list of channels is
-allowed---calls to procedures such as @code{list}, @code{cons},
-@code{string-append}, as well as the @code{channel} constructor.
-Attempts from a channel file to access unauthorized bindings such as
-@code{system} (to run shell code) or to use additional modules with
-@code{use-modules} are impossible.
-
-The @option{--unsafe-channel-evaluation} option disables these
-safeguards.
-
-@quotation Warning
-When using @code{--unsafe-channel-evaluation}, channel files can
-@emph{run arbitrary code on your machine}.  While this is useful in some
-cases, only use @code{--unsafe-channel-evaluation} when you fully
-understand the code of the channel files you use!
-@end quotation
-
@item --no-channel-files
@itemx -q
 Inhibit loading of the user and system channel files,
@@ -5002,17 +4921,6 @@ information.
 In addition, @command{guix pull} supports all the common build options
 (@pxref{Common Build Options}).

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

@@ -5109,68 +5017,12 @@ Use the @code{guix} channel from the specified @var{url}, at the
 given @var{commit} (a valid Git commit ID represented as a hexadecimal
 string or the name of a tag), or @var{branch}.

-@item --channels=@var{file-or-uri}
-@itemx -C @var{file-or-uri}
-Read the list of channels from @var{file-or-uri}.  @var{file-or-uri}
-must contain Scheme code that evaluates to a list of channel objects.
+@item --channels=@var{file}
+@itemx -C @var{file}
+Read the list of channels from @var{file}.  @var{file} must contain
+Scheme code that evaluates to a list of channel objects.
@xref{Channels} for more information.

-When @var{file-or-uri} is a URL, channels are transparently downloaded.
-In the example below, we pull from the latest revision of Guix that was
-successfully evaluated:
-
-@example
-guix time-machine \
-  -C https://ci.guix.gnu.org/eval/latest/channels.scm?spec=master \
-  -- describe
-@end example
-
-@cindex SWHID, for channel files
-Note that downloading a channel file potentially harms reproducibility:
-the file might vanish or be modified on the server behind your back.
-From a reproducibility viewpoint the safe approach is to keep channel
-files under version control, or to refer to them by their
-@uref{https://swhid.org,Software Hash Identifier}, or SWHID, which
-uniquely and unambiguously identifies contents.  Here is an example:
-
-@example
-guix time-machine \
-  -C swh:1:cnt:ae02d8ba3538a385ee799e61cdd0dfc5e14a8d1b \
-  -- @dots{}
-@end example
-
-This command downloads the data designated by the identifier from
-@uref{https://archive.softwareheritage.org, the Software Heritage
-archive}; it is fully reproducible because the data it refers to is
-immutable.
-
-@xref{Invoking guix pull}, for more information, and @pxref{Invoking
-guix hash}, for info on how to compute the SWHID of a file.
-
-@item --allow-untrusted-channels[=yes|no]
-Whether to allow pulls from untrusted channels.
-
-@quotation Warning
-Allowing untrusted channels can effectively lead to arbitrary code
-execution on your system.
-@end quotation
-
-@xref{trusted-channels, @command{guix pull} documentation}, for more
-info.
-
-@item --unsafe-channel-evaluation
-Allow arbitrary code execution from channels files.
-
-@quotation Warning
-When using @code{--unsafe-channel-evaluation}, channel files can
-@emph{run arbitrary code on your machine}.  Only use
-@code{--unsafe-channel-evaluation} when you fully understand the code of
-the channel files you use!
-
-@xref{unsafe-channel-evaluation, @option{--unsafe-channel-evaluation} in
-@command{guix pull}}, for background information.
-@end quotation
-
@item --no-channel-files
@itemx -q
 Inhibit loading of the user and system channel files,
@@ -5899,7 +5751,6 @@ pull} uses the latest commit with available substitutes for the package
 definitions: this is done by querying the continuous integration
 server at @url{https://ci.guix.gnu.org}.

-@findex channel-with-substitutes-available
@lisp
 (use-modules (guix ci))

@@ -5914,21 +5765,6 @@ substitutes.  It only ensures that @command{guix pull} will not try to
 compile package definitions.  This is particularly useful when using
 machines with limited resources.

-@quotation Warning
-Use of this functionality in your channel file requires it to be
-evaluated in ``unsafe'' mode, with the
-@option{--unsafe-channel-evaluation} option.
-@xref{unsafe-channel-evaluation, the @command{guix pull} documentation},
-for more info.
-
-However, a similar result can be achieved by running, say:
-
-@example
-guix pull \
-  -C https://ci.guix.gnu.org/eval/latest/channels.scm?spec=master
-@end example
-@end quotation
-
@node Creating a Channel
@section Creating a Channel

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

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

-@item --cwd=@var{directory}
-For containers, change to @var{directory} inside the container instead
-of the default location.  The default location is the current working
-directory when @option{--no-cwd} is not used, or the user's home
-directory when @option{--no-cwd} is used.  When @var{directory} is a
-relative file name, it is interpreted relative to the current working
-directory on the host.  Note that @option{--cwd} does not automatically
-share @var{directory}---you must ensure it is accessible via the default
-current directory sharing or explicit @option{--share}/@option{--expose}
-options.
-
@item --expose=@var{source}[=@var{target}]
@itemx --share=@var{source}[=@var{target}]
 For containers, @option{--expose} (resp. @option{--share}) exposes the
@@ -14838,32 +14648,8 @@ guix hash @var{option} @var{file} ...
@end example

 When @var{file} is @code{-} (a hyphen), @command{guix hash} computes the
-hash of data read from standard input.
-
-Here are a few examples:
-
-@table @asis
-@item SHA256 of a file for use in an @code{origin} record:
-@example
-guix hash example.tar.gz
-@end example
-
-@item SHA256 of directory @var{checkout} for use in an @code{origin} record:
-@example
-guix hash -rx @var{checkout}
-@end example
-
-@item SHA1 hash of @var{file} like the @code{sha1sum} command:
-@example
-guix hash -H sha1 -f hex @var{file}
-@end example
-
-@cindex SWHID, computing
-@item SHA1 hash of @var{file} for a @code{swh:1:cnt} @uref{https://swhid.org, SWHID}:
-guix hash -S git -H sha1 -f hex @var{file}
-@end table
-
-@command{guix hash} has the following options:
+hash of data read from standard input.  @command{guix hash} has the
+following options:

@table @code

@@ -15071,7 +14857,7 @@ provided through NuGet's v3 API at @code{api.nuget.org} and includes
 most relevant information, including package dependencies.
 There are some caveats, however.  The metadata does not always include
 repository information, in which case the importer attempts to extract
-it from the symbol package (@file{.snupkg}) if available.
+it from the symbol package (@file{.snupkg}) if available. 
 Additionally, dependencies are grouped by target framework in NuGet,
 but the importer flattens all dependency groups into a single list.

@@ -16170,10 +15956,51 @@ Use @var{host} as the OpenPGP key server when importing a public key.
@cindex format conventions
 The @command{guix style} command helps users and packagers alike style
 their package definitions and configuration files according to the
-latest fashionable trends, or patch them with specific rewrites.  It can
-either reformat whole files, with the @option{--whole-file} option, or
-apply specific @dfn{styling rules} to individual package definitions.
-The command provides multiple styling rules, explained below.
+latest fashionable trends.  It can either reformat whole files, with the
+@option{--whole-file} option, or apply specific @dfn{styling rules} to
+individual package definitions.  The command currently provides the
+following styling rules:
+
+@itemize
+@item
+formatting package definitions according to the project's conventions
+(@pxref{Formatting Code});
+
+@item
+rewriting package inputs to the ``new style'', as explained below.
+@end itemize
+
+The way package inputs are written is going through a transition
+(@pxref{package Reference}, for more on package inputs).  Until version
+1.3.0, package inputs were written using the ``old style'', where each
+input was given an explicit label, most of the time the package name:
+
+@lisp
+(package
+  ;; @dots{}
+  ;; The "old style" (deprecated).
+  (inputs `(("libunistring" ,libunistring)
+            ("libffi" ,libffi))))
+@end lisp
+
+Today, the old style is deprecated and the preferred style looks like
+this:
+
+@lisp
+(package
+  ;; @dots{}
+  ;; The "new style".
+  (inputs (list libunistring libffi)))
+@end lisp
+
+Likewise, uses of @code{alist-delete} and friends to manipulate inputs
+is now deprecated in favor of @code{modify-inputs} (@pxref{Defining
+Package Variants}, for more info on @code{modify-inputs}).
+
+In the vast majority of cases, this is a purely mechanical change on the
+surface syntax that does not even incur a package rebuild.  Running
+@command{guix style -S inputs} can do that for you, whether you're working on
+packages in Guix proper or in an external channel.

 The general syntax is:

@@ -16236,45 +16063,14 @@ definition of the Coreutils package like so:
@end example

@item inputs
-Rewrite package inputs to the ``new style''. This is how you would
-rewrite inputs of package @code{whatnot} in your own channel:
+Rewrite package inputs to the ``new style'', as described above.  This
+is how you would rewrite inputs of package @code{whatnot} in your own
+channel:

@example
 guix style -L ~/my/channel -S inputs whatnot
@end example

-The way package inputs are written is going through a transition
-(@pxref{package Reference}, for more on package inputs).  Until version
-1.3.0, package inputs were written using the ``old style'', where each
-input was given an explicit label, most of the time the package name:
-
-@lisp
-(package
-  ;; @dots{}
-  ;; The "old style" (deprecated).
-  (inputs `(("libunistring" ,libunistring)
-            ("libffi" ,libffi))))
-@end lisp
-
-Today, the old style is deprecated and the preferred style looks like
-this:
-
-@lisp
-(package
-  ;; @dots{}
-  ;; The "new style".
-  (inputs (list libunistring libffi)))
-@end lisp
-
-Likewise, uses of @code{alist-delete} and friends to manipulate inputs
-is now deprecated in favor of @code{modify-inputs} (@pxref{Defining
-Package Variants}, for more info on @code{modify-inputs}).
-
-In the vast majority of cases, this is a purely mechanical change on the
-surface syntax that does not even incur a package rebuild.  Running
-@command{guix style -S inputs} can do that for you, whether you're working on
-packages in Guix proper or in an external channel.
-
 Rewriting is done in a conservative way: preserving comments and bailing
 out if it cannot make sense of the code that appears in an inputs field.
 The @option{--input-simplification} option described below provides
@@ -16313,29 +16109,6 @@ rebuild of the affected packages.  Furthermore, if a package definition
 happens to be using G-expressions already, @command{guix style} leaves
 it unchanged.

-@item remove-input
-@itemx remove-native-input
-@itemx remove-propagated-input
-These styling rules remove an input from the given package(s).
-
-Removing these packages respects the package syntax, doesn't affect
-margin comments or parentheses, and will put all remaining inputs on a
-single line if there are less than three.
-
-This is a focused styling rule for use in teams, when updating
-build-systems, or removing unwanted development inputs from
-native-inputs.
-
-To remove package @var{whatnot} from all inputs, use the
-@code{--parameter} option:
-
-@example
-guix style -S remove-input --parameter=@var{whatnot}
-@end example
-
-It is also possible to do that for a collection of packages by appending
-them to the above invocation.
-
@item git-source
 If the @code{home-page} is a Git repository (as per
@code{git-repository-url?}), and the actual Git repository is tagged
@@ -19442,7 +19215,7 @@ Partitioning}, for an example.

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

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

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

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

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

@@ -46415,26 +46179,6 @@ up not being used much for the reasons described there.
@end deftp
@end defvar

-@cindex fwupd
-@cindex firmware update
-@subsubheading fwupd Service
-
-@defvar fwupd-service-type
-This service allows users of supported hardware to update their firmware.  The
-service's value is a @code{fwupd-configuration} record.
-
-@deftp {Data Type} fwupd-configuration
-This is the data type representing the configuration for the fwupd
-service.
-
-@table @asis
-@item @code{fwupd} (default @code{fwupd})
-The fwupd package that will be installed in the system profile.
-@end table
-
-@end deftp
-@end defvar
-
@node Hurd Services
@subsection Hurd Services

@@ -49215,28 +48959,8 @@ This option in enabled by default.  In some cases involving the
 in RAM, it can be handy to disable the option by setting it to
@code{#f}.

-@item @code{extra-initrd} (default: @code{#f})
-File name of an additional initrd to load during the boot.  It may or
-may not point to a file in the store, but the main use case is for
-out-of-store files containing secrets.
+@subsubheading Automatic LUKS Master Key Passing

-For any use case not involving secrets, you should use regular initrd
-(@pxref{operating-system Reference, @code{initrd}}) instead.
-
-Be careful when using this option, since pointing to a file that is not
-readable by the grub while booting will cause the boot to fail and
-require a manual edit of the initrd line in the grub menu.
-
-Currently only supported by GRUB.
-@end table
-
-@end deftp
-
-@anchor{grub-luks-root-device-key}
-@unnumberedsubsec Automatic LUKS Master Key Passing
-
-@cindex LUKS, root file system encryption
-@cindex passphrase, for LUKS-encrypted root
 When booting from a LUKS-encrypted device using GRUB, the password is
 normally requested twice: once by GRUB to access @file{/boot}, and a
 second time by the initial RAM disk to mount the root file system.
@@ -49277,7 +49001,22 @@ No configuration is required: GRUB's @code{procfs} and @code{luks}
 modules are loaded automatically when encrypted devices are declared
 via @code{luks-device-mapping} (@pxref{Mapped Devices}).

-@unnumberedsubsec Additional Boot Entries
+@item @code{extra-initrd} (default: @code{#f})
+File name of an additional initrd to load during the boot.  It may or
+may not point to a file in the store, but the main use case is for
+out-of-store files containing secrets.
+
+For any use case not involving secrets, you should use regular initrd
+(@pxref{operating-system Reference, @code{initrd}}) instead.
+
+Be careful when using this option, since pointing to a file that is not
+readable by the grub while booting will cause the boot to fail and
+require a manual edit of the initrd line in the grub menu.
+
+Currently only supported by GRUB.
+@end table
+
+@end deftp

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

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

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

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

@example
-image=$(guix system image --image-type=qcow2-gpt \
+image=$(guix system image --image-type=qcow2 \
        gnu/system/examples/lightweight-desktop.tmpl)
 cp $image /tmp/my-image.qcow2
 chmod +w /tmp/my-image.qcow2
@@ -51493,7 +51228,7 @@ after receiving @code{SIGHUP}.

 After adding
@lisp
-(shepherd-signal-action 'reload SIGHUP)
+(shepherd-signal-action 'reload SIGHUP))
@end lisp

 the @code{reload} action will be available and can be used with
@@ -52428,13 +52163,12 @@ services)}.
 * GPG: GNU Privacy Guard.       Setting up GPG and related tools.
 * Desktop: Desktop Home Services.  Services for graphical environments.
 * Guix: Guix Home Services.     Services for Guix.
-* Backup: Backup Home Services.  Services for backing up User's files.
+* Backup: Backup Home Services.   Services for backing up User's files.
 * Fonts: Fonts Home Services.   Services for managing User's fonts.
 * Sound: Sound Home Services.   Dealing with audio.
 * Mail: Mail Home Services.     Services for managing mail.
 * Messaging: Messaging Home Services.  Services for managing messaging.
 * Media: Media Home Services.   Services for managing media.
-* mpv Media Player::
 * Niri: Niri window manager.    Setting up the Niri.
 * Sway: Sway window manager.    Setting up the Sway configuration.
 * Networking: Networking Home Services.  Networking services.
@@ -30,7 +30,7 @@ COOKBOOK_LANGUAGES = de es fr it ko pt_BR ru sk sv ta zh_CN

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

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

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

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

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

-(define-member (person "gemmaro"
-                       "gemmaro.dev@gmail.com"
-                       "gemmaro")
-  ruby)
-
-(define-member (person "bdunahu"
-                       "bdunahu@operationnull.com"
-                       "bdunahu")
-  games)
-

 (define (find-team name)
  (or (hash-ref %teams (string->symbol name))
@@ -446,11 +446,9 @@ when booting a root file system on a Btrfs subvolume."
               (modules (menu-entry-multiboot-modules entry)))
          #~(format port "
 menuentry ~s {
-  ~a
  multiboot ~a root=~a~a~a
 }~%"
                    #$label
-                    #$(grub-root-search device kernel)
                    #$kernel
                    #$(device-name->hurd-device-name device-name #:disk disk)
                    (string-join (list #$@arguments) " " 'prefix)
@@ -1226,12 +1226,10 @@ file name or an nfs-root containing ':/')."

  (match spec
    ((? string?)
-     (if (string-match "^/dev/[a-zA-Z0-9]+$" spec)
+     (if (string-prefix? "/dev/" spec)
         ;; Nothing to do, but wait until SPEC shows up.
         (resolve device-exists? spec identity)
-         ;; Do not resolve NFS / CIFS / tmpfs devices
-         ;; or bcachefs multi-device specifications.
-         spec))
+         spec)) ; do not resolve NFS / CIFS / tmpfs devices
    ((? file-system-label?)
     ;; Resolve the label.
     (resolve find-partition-by-label
@@ -445,14 +445,10 @@ load path must be adjusted as needed."
          ;; Behave like an init process: create a sub-process that calls
          ;; THUNK, and wait for child processes.  Furthermore, forward
          ;; RELAYED-SIGNALS to the child process.
-          ;; We presently use `safe-clone` here due to a bug in the interaction
-          ;; between Guix and `primitive-fork` in Guile 3.0.11:
-          ;; https://codeberg.org/guix/guix/issues/7690#issuecomment-12744123
-          (safe-clone
-            SIGCHLD
-            (lambda ()
+          (match (primitive-fork)
+            (0
             (call-with-clean-exit thunk))
-            (lambda (pid)
+            (pid
             (install-signal-handlers pid)
             (let loop ()
               (match (wait-child-process)
@@ -57,7 +57,7 @@
 # Copyright © 2022 ( <paren@disroot.org>
 # Copyright © 2022, 2026 jgart <jgart@dismail.de>
 # Copyright © 2022-2023, 2025-2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-# Copyright © 2023-2026 Zheng Junjie <z572@z572.online>
+# Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
 # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
 # Copyright © 2023 Andy Tai <atai@atai.org>
 # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
@@ -502,7 +502,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/myrddin.scm			\
  %D%/packages/ncdu.scm				\
  %D%/packages/ncurses.scm			\
-  %D%/packages/netbeans.scm			\
  %D%/packages/netpbm.scm			\
  %D%/packages/nettle.scm			\
  %D%/packages/networking.scm			\
@@ -756,7 +755,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/services/docker.scm			\
  %D%/services/authentication.scm		\
  %D%/services/file-sharing.scm			\
-  %D%/services/firmware.scm			\
  %D%/services/games.scm			\
  %D%/services/ganeti.scm			\
  %D%/services/getmail.scm				\
@@ -1095,7 +1093,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/catdoc-CVE-2017-11110.patch		\
  %D%/packages/patches/chez-irregex-import-cond-expand.patch	\
  %D%/packages/patches/chez-scheme-bin-sh.patch			\
-  %D%/packages/patches/cianna-remove-error-for-missing-cuda.patch		\
  %D%/packages/patches/circos-remove-findbin.patch		\
  %D%/packages/patches/cdparanoia-fpic.patch			\
  %D%/packages/patches/cdrkit-libre-cross-compile.patch	\
@@ -1169,6 +1166,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/cryfs-boost-1.89-fix.patch		\
  %D%/packages/patches/csvkit-set-locale-for-tests.patch			\
  %D%/packages/patches/ctranslate2-local-build.patch		\
+  %D%/packages/patches/ctune-cmake-disable-git-clone.patch		\
  %D%/packages/patches/cube-nocheck.patch			\
  %D%/packages/patches/cups-relax-root-ownership-check.patch		\
  %D%/packages/patches/cura-engine-gcc-14.patch			\
@@ -1179,6 +1177,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/curlftpfs-fix-memory-leak.patch		\
  %D%/packages/patches/curlftpfs-fix-no_verify_hostname.patch	\
  %D%/packages/patches/cursynth-wave-rand.patch			\
+  %D%/packages/patches/cvc5-reproducible-build.patch		\
  %D%/packages/patches/cvs-CVE-2017-12836.patch		\
  %D%/packages/patches/cyrus-sasl-fix-time-h.patch              \
  %D%/packages/patches/d-feet-drop-unused-meson-argument.patch	\
@@ -1241,7 +1240,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-treelib-remove-python2-compat.patch	\
  %D%/packages/patches/elm-offline-package-registry.patch	\
  %D%/packages/patches/elm-reactor-static-files.patch		\
-  %D%/packages/patches/emacs-agent-shell-fix-tests.patch        \
+  %D%/packages/patches/emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch	\
  %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
  %D%/packages/patches/emacs-disable-jit-compilation.patch			\
  %D%/packages/patches/emacs-doc-toc-shell-commands.patch	\
@@ -1364,8 +1363,16 @@ dist_patch_DATA =						\
  %D%/packages/patches/ganeti-disable-version-symlinks.patch	\
  %D%/packages/patches/ganeti-haskell-pythondir.patch		\
  %D%/packages/patches/ganeti-lens-compat.patch			\
+  %D%/packages/patches/ganeti-openssh-test-fix.patch		\
+  %D%/packages/patches/ganeti-pyyaml-compat.patch		\
+  %D%/packages/patches/ganeti-procps-compat.patch		\
+  %D%/packages/patches/ganeti-reorder-arbitrary-definitions.patch	\
+  %D%/packages/patches/ganeti-relax-dependencies.patch		\
  %D%/packages/patches/ganeti-shepherd-master-failover.patch	\
  %D%/packages/patches/ganeti-shepherd-support.patch		\
+  %D%/packages/patches/ganeti-sphinx-import.patch		\
+  %D%/packages/patches/ganeti-template-haskell-2.17.patch	\
+  %D%/packages/patches/ganeti-template-haskell-2.18.patch	\
  %D%/packages/patches/gawk-shell.patch				\
  %D%/packages/patches/gcc-arm-bug-71399.patch			\
  %D%/packages/patches/gcc-arm-link-spec-fix.patch		\
@@ -1505,7 +1512,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch	\
  %D%/packages/patches/glibc-supported-locales.patch     	\
  %D%/packages/patches/glibc-versioned-locpath.patch		\
-  %D%/packages/patches/glycin-sandbox-Adapt-bwrap-invocation.patch	\
  %D%/packages/patches/gmime-disable-tests.patch		\
  %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
  %D%/packages/patches/gmp-faulty-test.patch			\
@@ -1658,7 +1664,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/isl-0.11.1-aarch64-support.patch		\
  %D%/packages/patches/ispell-for-linphone-cmake.patch		\
  %D%/packages/patches/jami-avutil-link.patch   		\
-  %D%/packages/patches/jami-libjami-cmake.patch			\
  %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch	\
  %D%/packages/patches/jamvm-1.5.1-armv7-support.patch	\
  %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch	\
@@ -1670,7 +1675,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/java-commons-collections-fix-java8.patch \
  %D%/packages/patches/java-guava-remove-annotation-deps.patch \
  %D%/packages/patches/java-jeromq-fix-tests.patch		\
-  %D%/packages/patches/java-jtidy-remove-xerces-dependency.patch	\
  %D%/packages/patches/java-openjfx-build-jdk_version.patch     \
  %D%/packages/patches/java-powermock-fix-java-files.patch		\
  %D%/packages/patches/java-simple-xml-fix-tests.patch		\
@@ -1679,8 +1683,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/java-xerces-build_dont_unzip.patch	\
  %D%/packages/patches/java-xerces-xjavac_taskdef.patch	\
  %D%/packages/patches/jbr-17-xcursor-no-dynamic.patch	\
-  %D%/packages/patches/jbr-25-wayland-drag-icon.patch	\
-  %D%/packages/patches/jbr-25-wayland-intra-jvm-dnd.patch	\
  %D%/packages/patches/jdk-currency-time-bomb.patch		\
  %D%/packages/patches/jdk-currency-time-bomb2.patch		\
  %D%/packages/patches/jfsutils-add-sysmacros.patch		\
@@ -1711,6 +1713,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
  %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch        \
  %D%/packages/patches/libretranslate-use-flasgger.patch	\
+  %D%/packages/patches/librewolf-150.0-encoding_rs-rust-fix.patch       \
  %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch       \
  %D%/packages/patches/librewolf-compare-paths.patch		\
  %D%/packages/patches/librewolf-neuter-locale-download.patch	\
@@ -1972,12 +1975,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/netcdf-date-time.patch			\
  %D%/packages/patches/netdde-build-fix.patch			\
  %D%/packages/patches/netdde-csum.patch			\
-  %D%/packages/patches/java-apache-xml-commons-resolver-1.2-netbeans.patch \
-  %D%/packages/patches/java-simplevalidation-1.14.1.patch	\
-  %D%/packages/patches/netbeans-25-nativeexecution-paths.patch \
-  %D%/packages/patches/netbeans-25-terminal-no-login-shell.patch \
-  %D%/packages/patches/netbeans-25-source-only-build.patch	\
-  %D%/packages/patches/netbeans-25-wayland-font-rendering.patch	\
  %D%/packages/patches/netpbm-CVE-2017-2586.patch		\
  %D%/packages/patches/netpbm-CVE-2017-2587.patch		\
  %D%/packages/patches/netsurf-message-timestamp.patch		\
@@ -2007,7 +2004,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/nvi-assume-preserve-path.patch		\
  %D%/packages/patches/nvi-dbpagesize-binpower.patch		\
  %D%/packages/patches/nvi-db4.patch				\
-  %D%/packages/patches/obs-advanced-masks-nlohmann-json.patch	\
  %D%/packages/patches/obs-modules-location.patch		\
  %D%/packages/patches/ocaml-ctypes-test-oo.patch		\
  %D%/packages/patches/ocaml-multiple-definitions.patch		\
@@ -2073,7 +2069,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/open-zwave-hidapi.patch			\
  %D%/packages/patches/opusfile-CVE-2022-47021.patch		\
  %D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
-  %D%/packages/patches/orca-fix-gst-init-check-call.patch \
  %D%/packages/patches/orpheus-cast-errors-and-includes.patch	\
  %D%/packages/patches/ots-no-include-missing-file.patch	\
  %D%/packages/patches/owncloud-disable-updatecheck.patch	\
@@ -2176,8 +2171,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/perl-www-curl-remove-symbol.patch	\
  %D%/packages/patches/perl-xml-libxml-fix-function-prototypes.patch	\
  %D%/packages/patches/phoronix-test-suite-fsdg.patch		\
-  %D%/packages/patches/php-01-fix-expired-certificate.patch	\
-  %D%/packages/patches/php-02-fix-sni-tests.patch		\
  %D%/packages/patches/picprog-non-intel-support.patch		\
  %D%/packages/patches/pidgin-add-search-path.patch		\
  %D%/packages/patches/pinball-system-ltdl.patch		\
@@ -2281,6 +2274,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
  %D%/packages/patches/qtscript-disable-tests.patch		\
  %D%/packages/patches/quagga-reproducible-build.patch          \
+  %D%/packages/patches/quickjs-ng-64-bits-precision-on-i686.patch	\
+  %D%/packages/patches/quickjs-ng-fix-atomics.pause-on-32-bit.patch	\
  %D%/packages/patches/quilt-grep-compat.patch 			\
  %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch 	\
  %D%/packages/patches/qtwayland-update-wayland-xml.patch	\
@@ -2354,16 +2349,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/renpy-fix-integer-slots.patch			\
  %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch	\
  %D%/packages/patches/rdkit-unbundle-external-dependencies.patch	\
-  %D%/packages/patches/r-biostrings-r4.6.0-compat.patch		\
-  %D%/packages/patches/r-h5mread-0001-h5mread-1.3.2-Get-rid-of-non-API-calls-to-R.patch \
  %D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch	\
-  %D%/packages/patches/r-mscoreutils-0001-fix-non-API-call-to-R-SETLENGTH-by-using-lengthgets.patch \
-  %D%/packages/patches/r-rsamtools-r-4.6.0-compat.patch		\
-  %D%/packages/patches/r-snpstats-0001-fixed-non-API-except-for-IS_S4_OBJECT.patch \
-  %D%/packages/patches/r-snpstats-0002-fixed-IS_S4_OBJECT.patch \
  %D%/packages/patches/r-sapa-lapack.patch			\
-  %D%/packages/patches/r-shortread-0001-ShortRead-1.69.3-Get-rid-of-non-API-calls-to-R.patch \
-  %D%/packages/patches/r-sparsearray-r-4.6.0-compat.patch	\
  %D%/packages/patches/ripperx-missing-file.patch		\
  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
  %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch	\
@@ -2413,9 +2400,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/rust-codex-0.120.0-connectors-cache-test-race.patch	\
  %D%/packages/patches/rust-codex-0.120.0-remove-libwebrtc.patch	\
  %D%/packages/patches/rust-codex-0.120.0-test-timeout.patch	\
-  %D%/packages/patches/rust-codex-0.124.0-code-mode-stub-toolname.patch	\
-  %D%/packages/patches/rust-codex-0.124.0-remove-patch-sections.patch	\
-  %D%/packages/patches/rust-librocksdb-sys-unbundled-sources.patch	\
  %D%/packages/patches/rust-ring-0.17-ring-core.patch		\
  %D%/packages/patches/rw-igraph-0.10.patch			\
  %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch	\
@@ -2614,7 +2598,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/webrtc-audio-processing-big-endian.patch	\
  %D%/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch \
  %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch	\
-  %D%/packages/patches/websocketpp-boost-compat.patch		\
  %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch	\
  %D%/packages/patches/wmctrl-64-fix.patch			\
  %D%/packages/patches/wmfire-dont-inline-draw-fire.patch	\
@@ -202,7 +202,7 @@ Have you run 'guix archive --generate-key'?")
  (build-locally? hetzner-configuration-build-locally? ; boolean
                  (default #t))
  (delete? hetzner-configuration-delete? ; boolean
-           (default #t))
+           (default #f))
  (labels hetzner-configuration-labels ; list of strings
          (default '()))
  (location hetzner-configuration-location ; #f | string
@@ -395,7 +395,9 @@ Available locations:~%~%~a~%~%For more details, see: ~a")
                                       (type ,root-fs-type))
                                     %base-file-systems))))
       (services
-        (cons* (service dhcpcd-service-type)
+        ;; guix 1.4.0 does not have dhcpcd-service-type,
+        ;; so we use dhcp-client-service-type here.
+        (cons* (service dhcp-client-service-type)
               (service openssh-service-type
                        (openssh-configuration
                         (openssh openssh-sans-x)
@@ -585,9 +587,9 @@ chmod 600 /mnt/root/.ssh/authorized_keys

 # Small instance don't have much disk space.  Bind mount the store of the
 # rescue system to the tmp directory of the new Guix system.
-mkdir -p /mnt/tmp/gnu
-mkdir -p /gnu
-mount --bind /mnt/tmp/gnu /gnu
+mkdir -p /mnt/tmp/gnu/store
+mkdir -p /gnu/store
+mount --bind /mnt/tmp/gnu/store /gnu/store

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

-(define* (maybe-nasm #:optional
-                     (system (or (%current-target-system)
-                                 (%current-system))))
-  ;; For some packages nasm is only needed when compiling to/for x86/x86_64.
-  (if (target-x86? system)
-      (list nasm)
-      '()))
-
-(export maybe-nasm)
-
 (define-public yasm
  (package
    (name "yasm")
@@ -51,7 +51,7 @@
 ;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
 ;;; Copyright © 2024 Roman Scherer <roman@burningswell.com>
 ;;; Copyright © 2024 Sughosha <sughosha@disroot.org>
-;;; Copyright © 2025, 2026 Junker <dk@junkeria.club>
+;;; Copyright © 2025 Junker <dk@junkeria.club>
 ;;; Copyright © 2025 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright © 2025 Kjartan Oli Agustsson <kjartanoli@outlook.com>
@@ -127,7 +127,6 @@
  #:use-module (gnu packages linphone)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages llvm)
-  #:use-module (gnu packages logging)
  #:use-module (gnu packages machine-learning)
  #:use-module (gnu packages man)
  #:use-module (gnu packages maths)
@@ -195,45 +194,6 @@
  #:use-module (srfi srfi-26)
  #:use-module (ice-9 match))

-(define-public adplug
-  (package
-    (name "adplug")
-    (version "2.4")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/adplug/adplug")
-                    (commit (string-append "adplug-" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0l31ya42g3q7ry2m0y5djgjb9ax8ciy8jn86252vdjkjswwqgscd"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list #:configure-flags
-           #~(list "-DBUILD_SHARED_LIBS=ON")
-           #:modules
-           '((guix build cmake-build-system)
-             (guix build utils)
-             (srfi srfi-26))                 ;for cute
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'install 'install-headers
-                 (lambda _
-                   (for-each (cute install-file <>
-                                  (string-append #$output "/include/adplug"))
-                             (find-files "../source/src" "\\.h$")))))))
-    (propagated-inputs
-     (list libbinio))
-    (home-page "https://adplug.github.io/")
-    (synopsis "AdLib sound player library")
-    (description
-     "AdPlug is a hardware independent AdLib sound player library, mainly
-written in C++.  AdPlug plays sound data, originally created for the AdLib
-(OPL2/3) audio board, on top of an OPL2/3 emulator or by using the real
-hardware.  No OPL2/3 chips are required for playback.")
-    (license license:lgpl2.1+)))
-
 (define-public opensles
  (package
    (name "opensles")
@@ -1250,7 +1210,7 @@ PulseAudio clients, featuring:
 (define-public ardour
  (package
    (name "ardour")
-    (version "9.2")
+    (version "9.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1267,7 +1227,7 @@ PulseAudio clients, featuring:
 namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
              (sha256
               (base32
-                "14s6cq3x7l7b682ah9k8cdr6plfirlgm882dc2nm51lxwl91zcfd"))
+                "00bramm8dq0ihr376n7l9rg0mjzxmzw6lxvsbsdlrdsimfwsy16p"))
              (file-name (git-file-name name version))))
    (build-system waf-build-system)
    (arguments
@@ -4505,33 +4465,6 @@ This includes device enumeration and initialization, file loading, and
 streaming.")
    (license license:expat)))

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

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

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

 ;; This source is a fork of vst3sdk with the documentation and VSTGUI
 ;; submodules removed and a dummy `meson.build` file that just lists all
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'ert)

 (eval-when-compile
@@ -1989,7 +1989,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_PMCRAID is not set
 # CONFIG_SCSI_PM8001 is not set
-CONFIG_SCSI_VIRTIO=m
+# CONFIG_SCSI_VIRTIO is not set
 # CONFIG_SCSI_DH is not set
 # end of SCSI device support

@@ -37,6 +37,8 @@
  #:use-module (gnu packages elf)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages readline)
+  #:use-module (gnu packages ruby-check)
+  #:use-module (gnu packages ruby-xyz)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages libffi)
@@ -53,6 +55,7 @@
  #:use-module (guix store)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system ruby)
  #:use-module (guix build-system trivial)
  #:autoload   (guix gnupg) (gnupg-verify*)
  #:autoload   (guix base32) (bytevector->nix-base32-string)
@@ -513,6 +516,46 @@ function interface (FFI) directly in your shell.  In other words, it allows
 you to call routines in shared libraries from within Bash.")
    (license license:expat)))

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

+(define-public discrover
+  (package
+    (name "discrover")
+    (version "1.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/maaskola/discrover")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "173fwi2vb6a5kp406hm3jj6j7v4whww796f2qcygp4rpvamh307y"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; there are no tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'set-force-source-date
+           ;; for reproducible dates, texlive needs this to respect
+           ;; SOURCE_DATE_EPOCH
+           (lambda _
+             (setenv "FORCE_SOURCE_DATE" "1")))
+         (add-before 'build 'use-writable-texmfvar
+           ;; Use writable TEXMFVAR to generate fonts.
+           (lambda _
+             (setenv "TEXMFVAR" "/tmp")))
+         (add-after 'unpack 'fix-latex-errors
+           (lambda _
+             (with-fluids ((%default-port-encoding #f))
+               (substitute* "doc/references.bib"
+                 (("\\{S\\}illanp[^,]+,")
+                  "{S}illanp{\\\"a}{\\\"a},")))
+             ;; XXX: I just can't get pdflatex to not complain about these
+             ;; characters.  They end up in the manual via the generated
+             ;; discrover-cli-help.txt.
+             (substitute* "src/hmm/cli.cpp"
+               (("µ") "mu")
+               (("η") "eta")
+               (("≤") "<="))
+             ;; This seems to be a syntax error.
+             (substitute* "doc/discrover-manual.tex"
+               (("theverbbox\\[t\\]") "theverbbox"))))
+         (add-after 'unpack 'add-missing-includes
+           (lambda _
+             (substitute* "src/executioninformation.hpp"
+               (("#define EXECUTIONINFORMATION_HPP" line)
+                (string-append line "\n#include <random>")))
+             (substitute* "src/plasma/fasta.hpp"
+               (("#define FASTA_HPP" line)
+                (string-append line "\n#include <random>"))))))))
+    (inputs
+     (list boost cairo rmath-standalone))
+    (native-inputs
+     (list (texlive-local-tree
+            (list texlive-doi
+                  texlive-etoolbox
+                  texlive-examplep
+                  texlive-forloop
+                  texlive-listofitems
+                  texlive-natbib
+                  texlive-pgf           ;tikz
+                  texlive-readarray
+                  texlive-verbatimbox))
+           imagemagick))
+    (home-page "https://dorina.mdc-berlin.de/public/rajewsky/discrover/")
+    (synopsis "Discover discriminative nucleotide sequence motifs")
+    (description "Discrover is a motif discovery method to find binding sites
+of nucleic acid binding proteins.")
+    (license license:gpl3+)))
+
 (define-public eddylab-squid
  (package
    (name "eddylab-squid")
@@ -328,15 +328,15 @@ with the @uref{https://keepassxc.org, KeePassXC} password manager.")
 (define noscript
  (package
    (name "noscript")
-    (version "13.6.18.1984")
+    (version "13.2.2")
    (source (origin
              (method url-fetch/zipbomb)
              (uri (string-append
-                    "https://archive.torproject.org/tor-package-archive/torbrowser/noscript/noscript-"
-                    version ".xpi"))
+                    "https://noscript.net/download/releases/noscript-" version
+                    ".xpi"))
              (sha256
               (base32
-                "0assv8v89hhg302q81vvv7ln3q8k9m6rzjkbprv2j05ghb23kkvm"))))
+                "0w2w0a76dk01bkh83mqwgs9ky02rjqk15z5sxg4a6mw0hpr81bpm"))))
    (build-system copy-build-system)
    (properties '((addon-id . "{73a6fe31-595d-460b-a920-fcc0f8843232}")))
    (arguments
@@ -1452,36 +1452,3 @@ It is an alternative to e.g. @command{make(1)} and @command{redo(1)}.  Features:
@end itemize
 ")
    (license license:wtfpl2)))
-
-(define-public xmake
-  (package
-   (name "xmake")
-   (version "3.0.8")
-   (source (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/xmake-io/xmake.git")
-             (commit (string-append "v" version))
-             ;; Requires some dependencies from "xmake-core-*" repos
-             (recursive? #t)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1pdjz52w9lzfbcpx9wmzy0bsjg7i19xz43f63czk7jz9v0xba6gi"))))
-   (build-system gnu-build-system)
-   (arguments
-    (list
-     ;; No check rule in make
-     ;; TODO: find how to run Lua tests in "test" directory
-     #:tests? #f))
-   (home-page "https://xmake.io/")
-   (synopsis "Cross-platform build utility based on Lua")
-   (description "@command{xmake} is a cross-platform build utility based on Lua.
-Features:
-@itemize
-@item Built-in caching and parallel compilation,
-@item Concise Lua syntax,
-@item Custom rules, plugins and modules,
-@item Support for C++20 modules and compile_commands.json,
-@item Support for languages outside C/C++ (e.g. Go, Rust, Zig).
-@end itemize")
-   (license license:asl2.0)))
@@ -81,7 +81,6 @@
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages web)
  #:use-module (gnu packages xml))
@@ -1328,6 +1327,25 @@ for the @acronym{AWS,Amazon Web Services} SDK.")
    (home-page "https://github.com/awslabs/aws-c-sdkutils")
    (license license:asl2.0)))

+(define-public pcl
+  (package
+    (name "pcl")
+    (version "1.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+              "http://www.xmailserver.org/pcl-" version ".tar.gz"))
+       (sha256
+        (base32
+         "06ly65rq4iyj2p4704i215c8y4rgspwl8sxfaifmf4ahfr30bcz7"))))
+    (build-system gnu-build-system)
+    (home-page "http://www.xmailserver.org/libpcl.html")
+    (synopsis "Portable Coroutine Library")
+    (description "The @acronym{PCL, Portable Coroutine Library} implements the
+low level functionality for coroutines.")
+    (license license:gpl2+)))
+
 (define-public aws-c-http
  (package
    (name "aws-c-http")
@@ -1501,48 +1519,6 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
    (home-page "https://microsoft.github.io/mimalloc/")
    (license license:expat)))

-(define-public mps
-  (package
-    (name "mps")
-    (version "1.118.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Ravenbrook/mps")
-             (commit (string-append "release-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "078iv3fsz0dnfwb7g63apkvcksczbqfxrxm73k80jwnwca6pgafy"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-cflags
-            ;; The recursive make call in the test suite doesn't pass CFLAGS
-            ;; down properly so we need to do it ourselves
-            (lambda _
-              (substitute* "Makefile.in"
-                (("CFLAGS=\"(.*)\"" _ flags)
-                 (string-append "CFLAGS=\"" flags " $(CFLAGS)\""))))))
-      #:parallel-build? #f ;Parallel build fails
-      #:test-target "test"
-      #:make-flags
-      #~(list "CFLAGS=-Wno-error=dangling-pointer -Wno-maybe-uninitialized"
-              ;; These flags are needed for the recursive make calls in testing
-              (string-append "CC=" #$(cc-for-target)) "-j" "1")))
-    (inputs (list sqlite))
-    (home-page "http://www.ravenbrook.com/project/mps")
-    (synopsis "Memory pool system")
-    (description
-     "This package provides a cross-platform memory management system.  It
-permits the flexible combination of memory management techniques, supporting
-manual and automatic memory management, in-line allocation, finalization,
-weakness, and multiple concurrent co-operating incremental generational
-garbage collections.  It also includes a library of memory pool classes
-implementing specialized memory management policies.")
-    (license license:bsd-2)))
 ;;; The package is named orangeduck-mpc to differentiate it from GNU mpc.
 (define-public orangeduck-mpc
  ;; The last release lacks an 'install' target.
@@ -337,7 +337,7 @@ reconstruction capability.")
 (define-public cdrdao
  (package
    (name "cdrdao")
-    (version "1.2.6")
+    (version "1.2.5")
    (source
     (origin
       (method git-fetch)
@@ -347,18 +347,30 @@ reconstruction capability.")
              (string-append "rel_" (string-replace-substring version "." "_")))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0hb8dfb88zk01yk5nfl8m5hsg4x2scb2899pxb717zywznr8jijw"))))
-    (build-system glib-or-gtk-build-system)
+        (base32 "1hh1lm4wr1vhsq2brczn94h88h3bppvjidj9cfqkl20jhaj38968"))))
+    (build-system gnu-build-system)
    (arguments
-     (list
-      #:configure-flags
-      #~(list
-         ;; Use the native SCSI interface.
-         "--without-scglib")))
+     '(#:configure-flags
+       (list
+        ;; GCDMaster depends on obsolete libgnomeuimm, see
+        ;; <https://github.com/cdrdao/cdrdao/issues/3>.
+        "--without-gcdmaster"
+        ;; Use the native SCSI interface.
+        "--without-scglib")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'bootstrap 'fix-configure.ac
+           (lambda _
+             ;; Remove references to missing macros.
+             (substitute* "configure.ac"
+              (("^AM_GCONF_SOURCE_2.*") "")
+              ;; This was introduced in autoconf-2.70, but is described
+              ;; as usually not needed in the autoconf documentation.
+              (("^AC_CHECK_INCLUDES_DEFAULT") "")))))))
    (native-inputs
-     (list autoconf-2.72 automake `(,glib "bin") pkg-config))
+     (list autoconf automake pkg-config))
    (inputs
-     (list ao gtkmm-3 lame libmad libsigc++-2 libvorbis))
+     (list ao lame libmad libvorbis))
    (home-page "https://cdrdao.sourceforge.net")
    (synopsis "Read and write CDs in disk-at-once mode")
    (description "cdrdao records audio or data CDs in disk-at-once (DAO) mode,
@@ -79,9 +79,12 @@
  '("base/third_party/cityhash" ;Expat
    "base/third_party/double_conversion" ;BSD-3
    "base/third_party/icu" ;Unicode, X11-style
+    "base/third_party/nspr" ;MPL-2.0
    "base/third_party/superfasthash" ;BSD-3
    "base/third_party/symbolize" ;BSD-3
    "base/third_party/xdg_user_dirs" ;Expat
+    "buildtools/third_party/libc++" ;BSD
+    "buildtools/third_party/libc++abi" ;BSD
    "net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
    "net/third_party/quiche" ;BSD-3
    "net/third_party/uri_template" ;ASL2.0
@@ -219,6 +222,7 @@
    "third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3
    "third_party/libaom/source/libaom/third_party/vector" ;Expat
    "third_party/libaom/source/libaom/third_party/x86inc" ;ISC
+    "third_party/libc++" ;Expat
    "third_party/libdrm" ; Expat
    "third_party/libgav1" ;ASL2.0
    "third_party/libjingle_xmpp" ;BSD-3
@@ -244,6 +248,8 @@
    "third_party/libzip" ;BSD-3
    "third_party/lit" ;BSD-3
    "third_party/lit/v3_0" ;BSD-3
+    "third_party/llvm-libc" ;ASL2.0
+    "third_party/llvm-libc/src/shared" ;ASL2.0
    "third_party/lottie" ;Expat
    "third_party/lss" ;BSD-3
    "third_party/lzma_sdk" ;public domain
@@ -394,7 +400,7 @@
  ;; run the Blink performance tests, just remove everything to save ~70MiB.
  '("third_party/blink/perf_tests"))

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

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

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

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

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

-              #$@(if (string-prefix? "aarch64" (or (%current-target-system)
-                                                   (%current-system)))
-                     '("use_v4l2_codec=true"
-                       "use_vaapi=false"
-                       "use_av1_hw_decoder=true")
-                     '())
-
              ;; Do not artificially restrict formats supported by system ffmpeg.
              "proprietary_codecs=true"
              "ffmpeg_branding=\"Chrome\""
@@ -771,7 +769,12 @@
                   (string-append libclang "clang_base_path"))
                  (("(_rustfmt_path = \")\\$\\{rust_bindgen_root\\}" _ rustfmt)
                   (string-append rustfmt "${rust_sysroot_absolute}"))))))
-          (add-after 'patch-stuff 'add-absolute-references
+          (add-after 'patch-stuff 'include-pthreadpool
+            ;; FIXME: Somehow the build system cannot locate this header.
+            (lambda _
+              (copy-file "third_party/pthreadpool/src/include/pthreadpool.h"
+                         "pthreadpool.h")))
+          (add-after 'include-pthreadpool 'add-absolute-references
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((cups-config (search-input-file inputs "/bin/cups-config"))
                    (libnssckbi.so (search-input-file inputs
@@ -889,15 +892,13 @@
                                       "resources.pak"
                                       "v8_context_snapshot.bin"
                                       "chrome_crashpad_handler"
-                                       "icudtl.dat"

                                       ;; Swiftshader ICD.
                                       "libvk_swiftshader.so"
                                       "vk_swiftshader_icd.json"

-                                       ;; Chromium ships its own libGL and
-                                       ;; vulkan implementation called ANGLE.
-                                       "libvulkan.so.1"
+                                       ;; Chromium ships its own libGL
+                                       ;; implementation called ANGLE.
                                       "libEGL.so" "libGLESv2.so"))
                     (locales        (string-append lib "/locales"))
                     (resources      (string-append lib "/resources"))
@@ -913,11 +914,9 @@

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

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

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

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

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

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

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

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

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

@@ -115,7 +115,6 @@
       (uri (git-reference
              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
              (commit (string-append "adns-" version))))
-       (file-name (git-file-name name version))
       (sha256
        (base32
         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
@@ -841,14 +840,14 @@ to result in system-wide compromise.")
 (define-public unbound
  (package
    (name "unbound")
-    (version "1.25.0")
+    (version "1.24.2")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://www.unbound.net/downloads/unbound-"
                           version ".tar.gz"))
       (sha256
-        (base32 "1iyyplggqhh2h1sbssq65v8z2s8mk1v9n1z4pr0z1qizfbd6wah6"))))
+        (base32 "1nwwwmwazwx40nm88lhh7k1basml2ai6j9q30gnclvca00zbbrs4"))))
    (build-system gnu-build-system)
    (outputs '("out" "python"))
    (native-inputs
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2018, 2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@@ -192,20 +192,21 @@ markup) can be customized and extended by the user.")

 (define-deprecated asciidoc-py3 asciidoc)

-(define-public doxygen-1.16
+(define-public doxygen
  (package
    (name "doxygen")
-    (version "1.16.1")
+    (version "1.14.0")
    (home-page "https://www.doxygen.nl/")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append home-page "files/doxygen-" version
-                                 ".src.tar.gz")
-                  (string-append "mirror://sourceforge/doxygen/rel-" version
-                                 "/doxygen-" version ".src.tar.gz")))
-       (sha256
-        (base32 "1a33w82ln692qsf3ls0j31f6khljjs1cy3bwd70pra2fa4xy6710"))))
+    (source (origin
+              (method url-fetch)
+              (uri (list (string-append home-page "files/doxygen-"
+                                        version ".src.tar.gz")
+                         (string-append "mirror://sourceforge/doxygen/rel-"
+                                        version "/doxygen-" version
+                                        ".src.tar.gz")))
+              (sha256
+               (base32
+                "0pbbdvc1zxps6mi58bry16rcrdw6b9gvf9nhv0kp60qkmc8nslyl"))))
    (build-system cmake-build-system)
    (native-inputs
     (list bison
@@ -249,25 +250,6 @@ IDL (Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl,
 and to some extent D.")
    (license license:gpl3+)))

-(define-public doxygen-1.14
-  (package
-    (inherit doxygen-1.16)
-    (name "doxygen")
-    (version "1.14.0")
-    (home-page "https://www.doxygen.nl/")
-    (source (origin
-              (method url-fetch)
-              (uri (list (string-append home-page "files/doxygen-"
-                                        version ".src.tar.gz")
-                         (string-append "mirror://sourceforge/doxygen/rel-"
-                                        version "/doxygen-" version
-                                        ".src.tar.gz")))
-              (sha256
-               (base32
-                "0pbbdvc1zxps6mi58bry16rcrdw6b9gvf9nhv0kp60qkmc8nslyl"))))))
-
-(define-public doxygen doxygen-1.14)
-
 (define-public halibut
  (package
    (name "halibut")
@@ -148,13 +148,13 @@ system.")
 (define-public r-duckdb
  (package
    (name "r-duckdb")
-    (version "1.5.2")
+    (version "1.5.1")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "duckdb" version))
       (sha256
-        (base32 "1dldlfwvc33czvlxfmwaj4p9y6sjjj5iqy98yda47a8kclrqmyam"))
+        (base32 "177621m08whqqk4yhj3zrr08l3d9hhlqh3gm9jzhi5cplg47cksq"))
       ;; This package bundles the duckdb sources and builds a custom variant
       ;; of duckdb.  I'd be happy to link it with our duckdb library instead,
       ;; but it does not seem possible to do that.
@@ -204,3 +204,48 @@ and EFI variable management.")
    ;; Library routines (in lib/) are under LGPL 2.1.
    ;; Compiling/linking/using OpenSSL is permitted.
    (license (list license:gpl2 license:lgpl2.1))))
+
+(define-public efilinux
+  (package
+    (name "efilinux")
+    (version "1.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/mfleming/efilinux")
+                    (commit (string-append "efilinux-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0b4nxzr3wl5v4b52r79iw1arfgasz26xb38r2blw9v2qz2s1q9w2"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags
+       (list "CC=gcc"
+             ,@(match (%current-system)
+                 ("aarch64-linux"
+                  '("ARCH=aarch64"))
+                 ("armhf-linux"
+                  '("ARCH=arm"))
+                 (_ '()))
+             (string-append "INCDIR=" (assoc-ref %build-inputs "gnu-efi")
+                            "/include")
+             (string-append "LIBDIR=" (assoc-ref %build-inputs "gnu-efi")
+                            "/lib"))
+       #:tests? #f ; No tests exist.
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (install-file "efilinux.efi"
+                           (string-append (assoc-ref outputs "out")
+                                          "/libexec"))
+             #t)))))
+    (inputs
+     (list gnu-efi))
+    (synopsis "Minimal Linux loader for UEFI")
+    (description "This package provides a minimal Linux loader as an UEFI
+program.")
+    (home-page "https://github.com/mfleming/efilinux")
+    (license license:bsd-2)))
@@ -2331,7 +2331,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
 (define-public nvc
  (package
    (name "nvc")
-    (version "1.20.1")
+    (version "1.19.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2340,7 +2340,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1b38x2ch468s4p6mrq6c8s0d95vb84p6w4v8in79l4w7sfy8jnr0"))))
+                "1zizz2dafm53lzpjayy6vig5pz5ri9cszdivg0jzzh8s3ggkpy1i"))))
    (build-system gnu-build-system)
    (arguments
     (list #:out-of-source? #t
@@ -3461,7 +3461,7 @@ form of AXI, AXI lite, and AXI stream modules.")
 (define-public python-edalize
  (package
    (name "python-edalize")
-    (version "0.6.8")
+    (version "0.6.6")
    (source
     (origin
       (method git-fetch)
@@ -3470,7 +3470,7 @@ form of AXI, AXI lite, and AXI stream modules.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "04m2lhkclw9fj92k43c06j003qnq9i1yhy2131fvcnkkr0d9438m"))))
+        (base32 "115nc15n2cx4x9irjim07zkg0287418djqd6ja7rm8jrnyldvln9"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -4516,7 +4516,7 @@ unique design feature of Trilinos is its focus on packages.")
 (define-public verilator
  (package
    (name "verilator")
-    (version "5.048")
+    (version "5.046")
    (source
     (origin
       (method git-fetch)
@@ -4525,7 +4525,7 @@ unique design feature of Trilinos is its focus on packages.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "16c1x66kqmc5ldqjij81kypj471fibfihcqn6kz4wbxvnn0smyn6"))))
+        (base32 "1gr1qhxvl4856hnmnx46dqd2qp0jhdh959zm2qfmxzzh19np7xkm"))))
    (native-inputs
     (list autoconf
           automake
@@ -62,7 +62,7 @@ as bold, underscore or italic.")
 (define-public emacs-buttercup
  (package
    (name "emacs-buttercup")
-    (version "1.40")
+    (version "1.38")
    (source
     (origin
       (method git-fetch)
@@ -72,7 +72,9 @@ as bold, underscore or italic.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r"))))
+         "09n8skr5wi8bs7x81d5bi6z89dd8s1zi9a5f4r2qadaz69slncxq"))
+       (patches
+        (search-patches "emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -28,7 +28,6 @@
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com>
 ;;; Copyright © 2025 John Kehayias <john@guixotic.coop>
-;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -387,7 +386,6 @@
                  (lambda ()
                    (display
                     (string-append
-                      ";; -*- lexical-binding: t; -*-\n"
                      "(setq find-function-C-source-directory \"" dest "\")\n\n"
                      "(provide 'guix-emacs-c-source)")))))))
          (add-after 'install 'install-site-start
@@ -414,7 +412,6 @@
                  (lambda ()
                    (display
                     (string-append
-                      ";; -*- lexical-binding: t; -*-\n"
                      "(when (require 'guix-emacs nil t)\n"
                      "  (guix-emacs-autoload-packages 'no-reload)\n"
                      "  (advice-add 'package-load-all-descriptors"
@@ -632,8 +629,6 @@ editor (console only)")
               libx11
               libxft
               libxpm
-               libxrender
-               libxt
               libwebp
               pango
               poppler)))))
@@ -706,8 +701,8 @@ editor (with wide ints)" )
        #~(cons "--with-wide-int" #$flags))))))

 (define-public emacs-next-minimal
-  (let ((commit "d969185878bf50faedbafbd609c361875b891b53")
-        (revision "3"))
+  (let ((commit "509228fc6c026921c67459f21164e0325efc583b")
+        (revision "2"))
  (package
    (inherit emacs-minimal)
    (name "emacs-next-minimal")
@@ -721,7 +716,7 @@ editor (with wide ints)" )
             (commit commit)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1pmx71b6pazjpyfs1d2ngby1idsviwbap3xbr5b7dgf0rngim32s"))
+        (base32 "04aalyrx5jysk5fhlka98fhfx23sy99zp8j16i0ils20sflyig6n"))
       (patches
        (search-patches "emacs-next-disable-jit-compilation.patch"
                        "emacs-next-exec-path.patch"
@@ -874,7 +869,7 @@ Started in 2014 as a GSOC project, Guile-Emacs was resurrected in 2024.")
         "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list gettext-minimal))
+     `(("gettext" ,gettext-minimal)))
    (arguments
     `(#:configure-flags
       (list (string-append "--with-charmaps="
@@ -1264,8 +1264,7 @@ Enjoy all of your favorite Atari 2600 games on your PC thanks to Stella!")
        (base32 "1xf15b6c3i0vv92b420a92pfvfaxhji56ivin8pn5r7fajkqyfb7"))))
    (build-system gnu-build-system)
    (native-inputs
-     (cons* pkg-config which
-            (maybe-nasm)))
+     (list pkg-config nasm which))
    (inputs
     (list freetype
           glu
@@ -1290,6 +1289,8 @@ Enjoy all of your favorite Atari 2600 games on your PC thanks to Stella!")
                      (list "all" (string-append "PREFIX=" out)))
       ;; There are no tests.
       #:tests? #f))
+    ;; As per the Makefile (in projects/unix/Makefile):
+    (supported-systems '("i686-linux" "x86_64-linux"))
    (home-page "https://www.mupen64plus.org/")
    (synopsis "Nintendo 64 emulator core library")
    (description
@@ -2163,9 +2164,7 @@ as RetroArch.")
              (lambda _
                (install-file "mupen64plus_next_libretro.so"
                              (string-append #$output "/lib/libretro/")))))))
-      (native-inputs
-       (cons* pkg-config
-              (maybe-nasm)))
+      (native-inputs (list nasm pkg-config))
      (inputs (list mesa libpng minizip unzip xxhash zlib))
      (home-page "https://github.com/libretro/mupen64plus-libretro-nx")
      (synopsis "Improved Mupen64Plus libretro core")
@@ -2,7 +2,7 @@
 ;;; Copyright © 2017 Dave Love <fx@gnu.org>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2023, 2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -226,19 +226,15 @@ testing InfiniBand networks.")

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

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

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

@@ -2601,7 +2601,7 @@ mining.")
 (define-public p2pool
  (package
    (name "p2pool")
-    (version "4.15")
+    (version "4.14")
    (source
     (origin
       (method git-fetch)
@@ -2610,7 +2610,7 @@ mining.")
             (commit (string-append "v" version))
             (recursive? #t)))
       (file-name (git-file-name name version))
-       (sha256 (base32 "1jfrq3dnkkvrk9zsn3viix5dcjwk0nmp15y1m1vj5py89hm57rxq"))
+       (sha256 (base32 "10dp6kxmvdx5lz4n144s9av32nzfxgfw28kf92dnmrv13q5p7id2"))
       (modules '((guix build utils)))
       (snippet
        #~(for-each delete-file-recursively
@@ -1159,10 +1159,10 @@ Executables included are:
      (native-inputs
       (append
         (list acpica
+               nasm
               perl
               python-3
               (list util-linux "lib"))
-         (maybe-nasm (string-append arch "-" arch))
         (if (not (string-prefix? arch (%current-system)))
             (if (string=? arch "armhf")
                 (list (cross-gcc "arm-linux-gnueabihf")
@@ -3873,7 +3873,7 @@ typographical palette.")
 (define-public font-mona-sans
  (package
    (name "font-mona-sans")
-    (version "2.0.23")
+    (version "2.0.8")
    (source
     (origin
       (method git-fetch)
@@ -3883,7 +3883,7 @@ typographical palette.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1pa6bghch1y0drxmz627055fwgsbdyp9vsj0f3va64pmvgkyf5jl"))))
+         "1gdblparf0v5mdbp891wnsc5x4dxr433fg0dmz0mhzrdw9vaalig"))))
    (build-system font-build-system)
    (outputs '("out" "ttf" "woff"))
    (home-page "https://github.com/mona-sans")
@@ -43,8 +43,6 @@
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 wvlab <me@wvlab.xyz>
 ;;; Copyright © 2025 jgart <jgart@dismail.de>
-;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
-;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3055,10 +3053,10 @@ useful with system integration.")
         "0zs4z7l9b57jldwz0ban77f3c2zq43ambd0dssf5qg9i216f9lmj"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list dbus-test-runner
-           (list glib "bin")
-           pkg-config
-           xorg-server-for-tests))
+     `(("dbus-test-runner" ,dbus-test-runner)
+       ("glib:bin" ,glib "bin")
+       ("pkg-config" ,pkg-config)
+       ("xvfb" ,xorg-server-for-tests)))
    (inputs
     (list gtk+ glib))
    (arguments
@@ -3419,50 +3417,50 @@ interfaces.")
 (define-public xdg-desktop-portal-wlr
  (package
    (name "xdg-desktop-portal-wlr")
-    (version "0.8.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/emersion/xdg-desktop-portal-wlr")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1jj0a9s3h3i04qsxkhcpxjzbb17hs9ngdy7wkypja09233zdz10w"))
-       (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
+    (version "0.7.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/emersion/xdg-desktop-portal-wlr")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1mbq3czka9swwmfaasnaj89y2m254p3qa522ayclh688jdwh70hq"))
+              (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
    (build-system meson-build-system)
    (arguments
-     (list
-      #:configure-flags
-      #~(list "-Dsystemd=disabled"
-              "-Dsd-bus-provider=libelogind")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'hardcode-binaries
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((sh (search-input-file inputs "/bin/sh"))
-                    (grim (search-input-file inputs "/bin/grim"))
-                    (slurp (search-input-file inputs "/bin/slurp")))
-                (substitute* '("src/screencast/chooser.c"
-                               "src/screenshot/screenshot.c")
-                  (("grim") grim)
-                  (("slurp") slurp)
-                  (("/bin/sh") sh))
-                (substitute* "src/screencast/screencast.c"
-                  (("execvp\\(\"sh")
-                   (format #f "execvp(\"~a" sh))))))
-          (add-after 'install 'install-documentation
-            (lambda _
-              (install-file "../source/README.md"
-                            (string-append #$output "/share/doc/"
-                                           #$name)))))))
-    (native-inputs (list cmake-minimal pkg-config scdoc))
-    (inputs (list bash-minimal
-                  elogind
+     `(#:configure-flags
+       '("-Dsystemd=disabled"
+         "-Dsd-bus-provider=libelogind")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'hardcode-binaries
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((sh (search-input-file inputs "/bin/sh"))
+                   (grim (search-input-file inputs "/bin/grim"))
+                   (slurp (search-input-file inputs "/bin/slurp")))
+               (substitute* "src/screenshot/screenshot.c"
+                 (("grim") grim)
+                 (("slurp") slurp)
+                 (("execl\\(\"/bin/sh\", \"/bin/sh\"")
+                  (string-append "execl(\"" sh "\", \"" sh "\"")))
+               (substitute* "src/screencast/screencast.c"
+                 (("execvp\\(\"sh")
+                  (string-append "execvp(\"" sh))))))
+         (add-after 'install 'install-documentation
+           (lambda* (#:key outputs #:allow-other-keys)
+             (install-file "../source/README.md"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/doc/" ,name)))))))
+    (native-inputs
+     (list cmake-minimal pkg-config scdoc))
+    (inputs (list elogind
+                  bash-minimal
                  grim
                  iniparser
-                  libinih
                  mesa
+                  libinih
                  pipewire
                  slurp
                  wayland
@@ -3476,45 +3474,6 @@ remote-desktop @code{xdg-desktop-portal} interfaces for wlroots based
 compositors.")
    (license license:expat)))

-(define-public xdg-desktop-portal-termfilechooser
-  (package
-    (name "xdg-desktop-portal-termfilechooser")
-    (version "1.3.0")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-              (url "https://github.com/hunkyburrito/xdg-desktop-portal-termfilechooser")
-              (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "1wvmwl678fr5pxz7x248pm5v4jd3bycz8nqa2q87akys5b9d1xpd"))))
-    (build-system meson-build-system)
-    (arguments
-      (list #:phases
-            #~(modify-phases %standard-phases
-                (add-after 'install 'fix-paths
-                  (lambda* (#:key inputs #:allow-other-keys)
-                    (let ((sed (search-input-file inputs "/bin/sed")))
-                      (substitute* (find-files #$output "-wrapper\\.sh")
-                        ((" sed") (string-append " " sed)))))))))
-    (native-inputs
-      (list cmake-minimal
-            pkg-config
-            scdoc))
-    (inputs
-      (list basu
-            libinih
-            sed))
-    (home-page "https://github.com/hunkyburrito/xdg-desktop-portal-termfilechooser")
-    (synopsis "@code{xdg-desktop-portal} backend for choosing files with your
-favorite terminal file chooser")
-    (description
-     "This package provides a backend implementation for xdg-desktop-portal that
-allows using your preferred terminal file manager as file chooser in other
-applications.")
-    (license license:expat)))
-
 (define-public poweralertd
  (package
    (name "poweralertd")
@@ -2391,47 +2391,6 @@ games.")
    (home-page "https://openmw.org")
    (license license:gpl3)))

-(define-public jolt-physics
-  (package
-    (name "jolt-physics")
-    (version "5.5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/jrouwe/JoltPhysics")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0dzqi4mxrzg5cyf5k8rdlb078939ib849n7gs6014d3ljymf839r"))
-       (modules '((guix build utils)))
-       ;; Unbundle Roboto font.
-       (snippet
-        '(begin
-           (delete-file-recursively "Assets/Fonts")
-           (substitute* "TestFramework/TestFramework.cmake"
-             ((".*Roboto-Regular\\.ttf.*") ""))))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:configure-flags
-      #~(list "-DBUILD_SHARED_LIBS=ON")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'change-directory
-            (lambda _
-              (chdir "Build")))
-          (add-after 'install 'change-directory
-            (lambda _
-              (chdir ".."))))))
-    (home-page "https://github.com/jrouwe/JoltPhysics")
-    (synopsis "Rigid body physics and collision detection library")
-    (description
-     "Jolt Physics is a multi core friendly rigid body physics and collision
-detection library, written in C++.  It is suitable for games and VR
-applications.")
-    (license license:expat)))
-
 (define-public godot-lts
  (package
    (name "godot")
@@ -227,7 +227,6 @@
  #:use-module (gnu packages shells)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages squirrel)
-  #:use-module (gnu packages stb)
  #:use-module (gnu packages swig)
  #:use-module (gnu packages tcl)
  #:use-module (gnu packages terminals)
@@ -553,14 +552,14 @@ use with @code{udev-service-type}.")
 (define-public armagetronad
  (package
    (name "armagetronad")
-    (version "0.2.9.3.0")
+    (version "0.2.9.2.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/armagetronad/stable/"
                                  version "/armagetronad-" version ".tbz"))
              (sha256
               (base32
-                "1q1zlbhbcimr6bw0ms1pr8hz4q850ivi3hvxn3467jfgiq22f3cy"))))
+                "0a6rlp2lj5bp7pg1yf8brjyb3mw7nqp3amj19wvz3xni21bbc31k"))))
    (build-system gnu-build-system)
    (arguments
     (list #:configure-flags
@@ -577,7 +576,6 @@ use with @code{udev-service-type}.")
                     (("^install_link .*BINDIR.*") "")))))))
    (native-inputs (list pkg-config))
    (inputs (list libxml2
-                  curl
                  (sdl-union (list sdl sdl-image sdl-mixer))
                  freeglut
                  libpng
@@ -1235,11 +1233,11 @@ original rogue game found on 4.2BSD.")
    (license license:bsd-3)))

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

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

 (define-public unknown-horizons
@@ -5797,14 +5713,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define-public openttd-engine
  (package
    (name "openttd-engine")
-    (version "15.3")
+    (version "15.2")
    (source
     (origin (method url-fetch)
             (uri (string-append "https://cdn.openttd.org/openttd-releases/"
                                 version "/openttd-" version "-source.tar.xz"))
             (sha256
              (base32
-               "1rrvjxsr2dp9zr6b35ifiw41c0dwqqcaq90r0x18misrgpm1x8jy"))))
+               "0xpzschcf562giqh3p8jj9gbi8chqrikdwgqqipabyn0nwbvd6nj"))))
    (build-system cmake-build-system)
    (inputs
     (list allegro
@@ -6038,7 +5954,7 @@ Transport Tycoon Deluxe.")
  (package
    (inherit openttd)
    (name "openttd-jgrpp")
-    (version "0.72.0")
+    (version "0.71.1")
    (source
     (origin
       (method git-fetch)
@@ -6047,7 +5963,7 @@ Transport Tycoon Deluxe.")
             (commit (string-append "jgrpp-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0xbnnx03y8vhbgi6s7hsxhiqhsy6rhj7fypq6dfqh0z74m5bldkf"))))
+        (base32 "1cy1ghc1mc61hdz8lykx2ggs5nld30jdgj8y4vdli2v1ffhy7xy9"))))
    (inputs (modify-inputs inputs
              (append zstd harfbuzz)))
    (arguments
@@ -44,7 +44,7 @@
 (define-public gramps
  (package
    (name "gramps")
-    (version "6.0.8")
+    (version "5.2.3")
    (source
     (origin
       (method git-fetch)
@@ -53,7 +53,7 @@
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "06kdcf6h9rqdcsx097a3n2z4q8yvln20ja7ajwrna1i133591bra"))))
+        (base32 "1gzhi5hxpgc6pxs40xsxf67hndjifnfhm89s3ly68c70x83qmwhd"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -68,11 +68,6 @@
        (guix build utils))
      #:phases
      #~(modify-phases %standard-phases
-          (add-before 'build 'fix-gexiv2-dependency
-            (lambda _
-              ;; Use our own version
-              (substitute* (find-files "." ".*\\.py$")
-                (("\"GExiv2\", \"0.10\"") "\"GExiv2\", \"0.16\""))))
          (add-before 'check 'prepare-tests
            (lambda _
              (setenv "HOME" (getenv "TMPDIR"))
@@ -118,7 +113,6 @@
           python-bsddb3
           python-jsonschema
           python-lxml
-           python-orjson
           python-pillow
           python-pycairo
           python-pygobject
@@ -425,29 +425,14 @@ hierarchical hexagonal geospatial indexing system")
               (base32
                "00qdk9a4048pzfj2rhzkfw3lvm642znf6kr4x29i3d94494pxsnn"))))
    (build-system cmake-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ,@(if (or (target-x86-32?) (target-arm32?))
-               '((add-after 'unpack 'disable-broken-tests
-                   (lambda _
-                     ;; This test fails due to limited accuracy.
-                     (delete-file "tests/xmltester/tests/general/TestCentroid.xml")
-                     (with-directory-excursion "tests/unit"
-                       ;; These also fail due to limited accuracy.
-                       (delete-file "algorithm/MinimumAreaRectangleTest.cpp")
-                       (delete-file "capi/GEOSMinimumRotatedRectangleTest.cpp")
-                       ;; It is unclear why these fail, but I'm guessing:
-                       ;; limited accuracy.
-                       (delete-file "linearref/LengthIndexedLineTest.cpp")
-                       (delete-file "math/DDTest.cpp")))))
-               '())
-         (add-after
-             'unpack 'patch-test-shebangs
-           (lambda _
-             (substitute* '("tests/xmltester/testrunner.sh"
-                            "tests/xmltester/safe_to_xml.sh")
-               (("/bin/sh") (which "sh"))))))))
+    (arguments `(#:phases
+                 (modify-phases %standard-phases
+                   (add-after
+                    'unpack 'patch-test-shebangs
+                    (lambda _
+                      (substitute* '("tests/xmltester/testrunner.sh"
+                                     "tests/xmltester/safe_to_xml.sh")
+                        (("/bin/sh") (which "sh"))))))))
    (inputs
     (list glib))
    (home-page "https://libgeos.org/")
@@ -970,29 +955,6 @@ hydrology and waste deposition.")
        (base32
         "03r6mspfv22fs4x4jcgv25v9gsj5k6zy8incvyf94qf50g47s2bc"))))
    (build-system cmake-build-system)
-    (arguments
-     (if (target-32bit?)
-         (list
-          #:phases
-          '(modify-phases %standard-phases
-             (add-after 'unpack 'patch-tests
-               (lambda _
-                 ;; These regression tests fail due to accuracy problems.
-                 (substitute* "test/unit/test_factory.cpp"
-                   (("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
-                    (string-append m "\nGTEST_SKIP();\n")))
-                 (substitute* "test/unit/test_grids.cpp"
-                   (("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
-                    (string-append m "\nGTEST_SKIP();\n")))
-                 (substitute* "test/unit/test_defmodel.cpp"
-                   (("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
-                    (string-append m "\nGTEST_SKIP();\n")))
-                 ;; These regression tests fail due to accuracy problems.
-                 (substitute* "test/CMakeLists.txt"
-                   (("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
-                   (("proj_add_gie_test\\(\"Builtins\".+") "")
-                   (("proj_add_gie_test\\(\"peirce_q\".+") ""))))))
-         '()))
    (native-inputs (list googletest pkg-config))
    (propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc
    (home-page "https://proj.org/")
@@ -1022,34 +984,7 @@ lets developers use the functionality of Proj in their own software.")
                           version ".tar.gz"))
       (sha256
        (base32
-         "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))
-    (arguments
-     (if (target-32bit?)
-         (list
-          #:phases
-          '(modify-phases %standard-phases
-             (add-after 'unpack 'patch-tests
-               (lambda _
-                 ;; These regression tests fail due to accuracy problems.
-                 (substitute* "test/unit/test_factory.cpp"
-                   (("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
-                    (string-append m "\nGTEST_SKIP();\n")))
-                 (substitute* "test/unit/test_grids.cpp"
-                   (("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
-                    (string-append m "\nGTEST_SKIP();\n")))
-                 (substitute* "test/unit/test_defmodel.cpp"
-                   (("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
-                    (string-append m "\nGTEST_SKIP();\n")))
-                 ;; These regression tests fail due to accuracy problems.
-                 (substitute* "test/CMakeLists.txt"
-                   (("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
-                   (("proj_add_gie_test\\(\"Builtins\".+") "")
-                   (("proj_add_gie_test\\(\"peirce_q\".+") "")
-                   (("proj_add_gie_test\\(\"adams_ws2\".+") ""))
-                 (substitute* "test/cli/CMakeLists.txt"
-                   (("proj_add_test_script_sh\\(\"testvarious\" CS2CS_BIN\\)") ""))))))
-         '()))))
-
+         "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))))

 (define-public python-obspy
  (package
@@ -1284,23 +1219,20 @@ readily with other Python GIS packages such as pyproj, Rtree, and Shapely.")
 (define-public python-geopack
  (package
    (name "python-geopack")
-    (version "1.0.12")
+    (version "1.0.10")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tsssss/geopack")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "geopack" version))
       (sha256
-        (base32 "0ap5j4359xxjkbz06y097yq5d37sxcwlnlsfwrv6dvza7ydmgcgg"))))
+        (base32 "0mryjp7m4h99qlpvnn40s81sygr73qcv8rkmjp9pcli1gz829kjf"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      ;; XXX Reported upstream <https://github.com/tsssss/geopack/issues/21>.
      #:tests? #f))
    (native-inputs
-     (list python-setuptools))
+     (list python-pytest python-setuptools python-wheel))
    (propagated-inputs
     (list python-numpy python-scipy))
    (home-page "https://github.com/tsssss/geopack")
@@ -682,7 +682,7 @@ and a high score table.")
 (define-public komikku
  (package
    (name "komikku")
-    (version "50.3.0")
+    (version "50.1.0")
    (source
     (origin
       (method git-fetch)
@@ -692,7 +692,7 @@ and a high score table.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0hm1infvdsms193g2yp7qw7lrsxjsx5zziib8hgch34y6dbhfhf1"))))
+         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -780,7 +780,7 @@ developed with the aim of being used with the Librem 5 phone.")
 (define-public komikku-servers
  (package
    (name "komikku-servers")
-    (version "50.3.0")
+    (version "50.1.0")
    (source
     (origin
       (method git-fetch)
@@ -790,7 +790,7 @@ developed with the aim of being used with the Librem 5 phone.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0hm1infvdsms193g2yp7qw7lrsxjsx5zziib8hgch34y6dbhfhf1"))))
+         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
    (build-system copy-build-system)
    (arguments
     (list
@@ -10674,7 +10674,6 @@ playing media, scanning, and much more.")
                            system-config-printer
                            xdg-desktop-portal
                            xdg-user-dirs
-                            xdg-user-dirs-gtk
                            yelp
                            zenity))
   (description "This package provides a list of packages required for
@@ -11564,71 +11563,6 @@ accessibility infrastructure.")
    (license license:lgpl2.0)
    (properties '((upstream-name . "pyatspi")))))

-(define-public accerciser
-  (package
-    (name "accerciser")
-    (version "3.48.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://gitlab.gnome.org/GNOME/accerciser.git")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1ddh466im0hxqx0ncxglrif72jfwcdl1ayarw874mp1464wkbc4m"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:glib-or-gtk? #t
-      #:imported-modules (append %meson-build-system-modules
-                                 %pyproject-build-system-modules)
-      #:modules
-      `((guix build meson-build-system)
-        ((guix build pyproject-build-system) #:prefix py:)
-        (guix build utils))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'skip-gnome-post-install
-            (lambda _
-              (substitute* "meson.build"
-                (("gtk_update_icon_cache: true")
-                 "gtk_update_icon_cache: false")
-                (("update_desktop_database: true")
-                 "update_desktop_database: false"))))
-          (add-after 'install 'wrap-python
-            (assoc-ref py:%standard-phases 'wrap))
-          (add-after 'wrap-python 'wrap-program
-            (lambda _
-              (let ((typelib-path (getenv "GI_TYPELIB_PATH")))
-                (wrap-program (string-append #$output "/bin/accerciser")
-                  `("GI_TYPELIB_PATH" ":" prefix (,typelib-path)))))))))
-    (native-inputs
-     (list (list glib "bin")
-           gettext-minimal
-           gobject-introspection
-           pkg-config
-           yelp-tools))
-    (inputs
-     (list appstream
-           appstream-glib
-           at-spi2-core
-           bash-minimal
-           gdk-pixbuf
-           glib
-           gtk+
-           python
-           python-dbus
-           python-pyatspi
-           python-pycairo
-           python-pygobject
-           python-pyxdg))
-    (synopsis "Accessibility explorer")
-    (description "This package provides an interactive accessibility explorer
-for the GNOME desktop.")
-    (home-page "https://gitlab.gnome.org/GNOME/accerciser")
-    (license license:bsd-3)))
-
 (define-public orca
  (package
    (name "orca")
@@ -11641,8 +11575,7 @@ for the GNOME desktop.")
                    name "-" version ".tar.xz"))
              (sha256
               (base32
-                "0sfs06f66dsibvnp87jshhs7n3f8shkn9x7j3ygpk8409za2n2xy"))
-              (patches (search-patches "orca-fix-gst-init-check-call.patch"))))
+                "0sfs06f66dsibvnp87jshhs7n3f8shkn9x7j3ygpk8409za2n2xy"))))
    (build-system meson-build-system)
    (arguments
     '(#:glib-or-gtk? #t
@@ -11660,7 +11593,10 @@ for the GNOME desktop.")
                   (pgrep (string-append
                           (assoc-ref inputs "procps") "/bin/pgrep")))
               (substitute* "src/orca/orca_modifier_manager.py"
-                 (("\"xkbcomp\"") (format #f "'~a'" xkbcomp)))
+                 (("'xkbcomp'") (format #f "'~a'" xkbcomp)))
+               (substitute* "src/orca/debug.py"
+                 (("'pgrep %s'")
+                  (format #f "'~a %s'" pgrep)))
               (substitute* "src/orca/orca_bin.py.in"
                 (("'pgrep -u %s -x orca'")
                  (format #f "'~a -u %s -x orca'" pgrep))))))
@@ -11691,7 +11627,6 @@ for the GNOME desktop.")
           `(,liblouis "python")
           procps                       ; for pgrep
           python
-           python-dbus
           python-pygobject-3.50
           python-pyatspi
           speech-dispatcher
@@ -26,7 +26,6 @@
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
 ;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
-;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -972,8 +971,10 @@ passphrase when @code{gpg} is run and needs it.")))
           (lambda _
             (invoke "sh" "autogen.sh"))))))
    (native-inputs
-     (modify-inputs native-inputs
-       (prepend autoconf automake gettext-minimal)))
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gettext-minimal)
+       ,@(package-native-inputs pinentry-tty)))
    (inputs
     (modify-inputs inputs
       (prepend efl)))
@@ -605,9 +605,9 @@ in the case of Firefox, it is browser/locales/all-locales."
    "zh-TW"))

 ;;; Please keep these versions in sync with icedove.
-(define %icecat-base-version "140.10.2")
+(define %icecat-base-version "140.10.0")
 (define %icecat-version (string-append %icecat-base-version "-gnu1"))
-(define %icecat-build-id "20260509000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-build-id "20260421000000") ;must be of the form YYYYMMDDhhmmss

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

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

         ;; 'search-patch' returns either a valid file name or #f, so wrap it
         ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@@ -245,55 +245,6 @@ go-fuzz-headers.")
@end itemize")
    (license license:expat)))

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

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

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

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

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

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

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

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

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

-(define-public go-github-com-tailscale-golang-x-crypto
-  (package
-    (name "go-github-com-tailscale-golang-x-crypto")
-    (version "0.91.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tailscale/golang-x-crypto")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0m9qkk48mihrkmfh1fzfhc39l8957qkpfx8qbw4xdjws7dy4vzbz"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:tests? #f ;Tests have broken package imports (expected as per readme)
-      #:import-path "github.com/tailscale/golang-x-crypto"))
-    (propagated-inputs
-     (list go-golang-org-x-crypto
-           go-golang-org-x-term
-           go-golang-org-x-sys
-           go-golang-org-x-net))
-    (home-page "https://github.com/tailscale/golang-x-crypto")
-    (synopsis "Supplementary Go crypto libraries")
-    (description
-     "This package holds supplementary Go cryptography libraries, it's a fork
-of @code{golang.org/x/crypto} maintained by Tailscale.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-tink-crypto-tink-go-v2
  (package
    (name "go-github-com-tink-crypto-tink-go-v2")
@@ -3900,7 +3869,7 @@ is an extremely fast non-cryptographic hash algorithm.")
      ;; XXX: Source only, to break cycle with
      ;; go-github-com-zmap-zcrypto. Addintional inputs requaired only to
      ;; build CLI:
-      ;;
+      ;; 
      ;; -  github.com/sirupsen/logrus
      ;; -  github.com/zmap/zcrypto
      ;; -  github.com/zmap/zlint/v3
@@ -456,29 +456,6 @@ penalization.")
 FFT (Schonhage-Strassen method for multiplying integers).")
    (license license:bsd-3)))

-(define-public go-github-com-robinus2-golang-moving-average
-  (package
-    (name "go-github-com-robinus2-golang-moving-average")
-    (version "1.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/RobinUS2/golang-moving-average")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "02z3ad29653fz7whxkjjpq820ig9j8m68xj4kay14jyazkr5in1f"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/RobinUS2/golang-moving-average"))
-    (home-page "https://github.com/RobinUS2/golang-moving-average")
-    (synopsis "Moving average implementation for Go")
-    (description
-     "This package provides a moving average implementation for Go.")
-    (license license:asl2.0)))
-
 (define-public go-github-com-shopspring-decimal
  (package
    (name "go-github-com-shopspring-decimal")
@@ -628,17 +628,9 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.")
       #:configure-flags
         (list
          "-DEMBREE_ISPC_SUPPORT=OFF"
-          ,@(cond
-              ((target-x86-64?)
-               ;; They SAY that that's the default--but it isn't
-               ;; (that would be AVX512--and that segfaults GCC (!)).
-               `("-DEMBREE_MAX_ISA=AVX2"))
-              ((target-aarch64?)
-               `("-DEMBREE_ARM=ON"
-                 "-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
-                 "-DCMAKE_CXX_FLAGS=-flax-vector-conversions"))
-              (else
-               '())))))
+          ;; They SAY that that's the default--but it isn't
+          ;; (that would be AVX512--and that segfaults GCC (!)).
+          "-DEMBREE_MAX_ISA=AVX2")))
    (inputs
     (list glfw onetbb))
    (home-page "https://www.embree.org/")
@@ -647,16 +639,13 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.")
     "Embree is a collection of high-performance ray tracing kernels.
 Embree is meant to increase performance of photo-realistic rendering
 applications.")
-    ;; From the README: Embree requires at least an x86 CPU with support for
-    ;; SSE2 or an Apple M1 CPU.
-    (supported-systems '("x86_64-linux" "aarch64-linux"))
    (license license:asl2.0)))

 (define-public embree-3
  (package
    (inherit embree)
    (name "embree")
-    (version "3.13.5")
+    (version "3.3.15")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2763,43 +2763,6 @@ entire output.  It supports all Layer Shell features including popups and
 popovers.")
    (license license:expat)))

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

-(define-public guile-arguments
-  (package
-    (name "guile-arguments")
-    (version "0.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://codeberg.org/fishinthecalculator/arguments")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1r71l6099afk017a3ck5mpp2xhb3bm45s6nga24lhby52rxbkayl"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'generate-api-reference
-            (lambda _
-              (invoke "scripts/generate_api_reference.sh")))
-          (add-after 'build 'build-html-manual
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (apply invoke `("make" "html" ,@make-flags))))
-          (add-after 'install 'install-html-manual
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (apply invoke `("make" "install-html" ,@make-flags)))))))
-    (native-inputs
-     (list autoconf
-           automake
-           guile-documenta
-           pkg-config
-           texinfo))
-    (inputs (list guile-3.0))
-    (synopsis "Parse command line arguments into structured objects")
-    (description "This package provides a Guile library to parse command line
-arguments into structured objects.  It allows declaring arguments through a
-small @acronym{DSL, Domain Specific Language}, then call a procedure to parse the
-command line into a structured object.")
-    (home-page "https://codeberg.org/fishinthecalculator/arguments")
-    (license license:gpl3+)))
-
 (define-public guile-oauth
  (package
    (name "guile-oauth")
@@ -7807,8 +7764,8 @@ is an attempt to combine both into something useful.")
      (license license:asl2.0))))

 (define-public guile-knots
-  (let ((commit "49996c432a4616e03ecaf01cb42afc5fd78eafd5")
-        (revision "35"))
+  (let ((commit "f767eca066495e6582e89ba1b91907c0c5657878")
+        (revision "34"))
    (package
    (name "guile-knots")
    (version (git-version "0.1" revision commit))
@@ -7819,7 +7776,7 @@ is an attempt to combine both into something useful.")
                    (commit commit)))
              (sha256
               (base32
-                "0i6vk432shy7qmsq1hli71a9kmgf8yy9hx3bck0r9qzsldv1m3m9"))
+                "18fqmpyrrxy8phxxm5b7d1qhhvc3rsrs243xiinkj2hn2ca1cqi8"))
              (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -467,15 +467,15 @@ without requiring the source code to be rewritten.")

    (native-search-paths
     (list (search-path-specification
-             (variable "GUILE_LOAD_PATH")
-             (files '("share/guile/site/3.0")))
+            (variable "GUILE_LOAD_PATH")
+            (files '("share/guile/site/3.0")))
           (search-path-specification
-             (variable "GUILE_LOAD_COMPILED_PATH")
-             (files '("lib/guile/3.0/site-ccache"
-                      "share/guile/site/3.0")))
+            (variable "GUILE_LOAD_COMPILED_PATH")
+            (files '("lib/guile/3.0/site-ccache"
+                     "share/guile/site/3.0")))
           (search-path-specification
-             (variable "GUILE_EXTENSIONS_PATH")
-             (files '("lib/guile/3.0/extensions")))))))
+            (variable "GUILE_EXTENSIONS_PATH")
+            (files '("lib/guile/3.0/extensions")))))))

 (define-public guile-3.0.11
  (package
@@ -23,7 +23,6 @@
 ;;; Copyright © 2025 Eric Bavier <bavier@posteo.net>
 ;;; Copyright © 2025 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2025 James Smith <jsubuntuxp@disroot.org>
-;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1001,21 +1000,22 @@ information can be viewed in real time and/or logged to a file.")
    (source
     (origin
       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/dell/libsmbios")
-              (commit (string-append "v" version))))
+       (uri
+        (git-reference
+         (url (string-append "https://github.com/dell/" name))
+         (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list autoconf
-           automake
-           gettext-minimal
-           libtool
-           pkg-config
-           perl
-           python))
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gettext-minimal)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
+       ("perl" ,perl)
+       ("python" ,python)))
    (inputs
     (list libxml2))
    (arguments
@@ -49,6 +49,123 @@
  #:use-module ((guix build utils) #:select (alist-replace))
  #:use-module (srfi srfi-1))

+(define-public musl-cross
+  (let ((revision "3")
+        (commit "a8a66490dae7f23a2cf5e256f3a596d1ccfe1a03"))
+  (package
+    (name "musl-cross")
+    (version (git-version "0.1" revision commit))
+    (source
+     (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/GregorR/musl-cross")
+              (commit commit)))
+        (file-name "musl-cross-checkout")
+        (sha256
+         (base32
+          "1xvl9y017wb2qaphy9zqh3vrhm8hklr8acvzzcjc35d1jjhyl58y"))
+        (patches (search-patches "musl-cross-locale.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; No tests in main project.
+       #:modules
+       ((guix build utils)
+        (guix build gnu-build-system)
+        (srfi srfi-1)) ; drop
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda _
+             (setenv "SHELL" "bash")
+             (setenv "CONFIG_SHELL" "bash")
+             #t))
+         (add-after 'unpack 'unpack-dependencies
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (define (install-file* source-key destination-directory
+                                    destination-suffix)
+               (let* ((source-file (assoc-ref inputs source-key))
+                      (source-basename (basename source-file))
+                      (source-parts (string-split source-basename #\-))
+                      (destination-file
+                       (string-join (drop source-parts 1) "-")))
+                 (copy-file source-file
+                  (string-append destination-directory "/"
+                                 destination-file destination-suffix))))
+             (for-each (lambda (name)
+                         (install-file* name "tarballs" ""))
+                       '("binutils" "target-gcc-5" "linux-headers" "musl"))
+             (copy-file (string-append (assoc-ref inputs "config.sub")
+                                       "/share/automake-1.16/config.sub")
+                        "tarballs/config.sub;hb=3d5db9ebe860")
+             (copy-file (string-append (assoc-ref inputs "config.sub")
+                                       "/share/automake-1.16/config.guess")
+                        "tarballs/config.guess;hb=3d5db9ebe860")
+             (substitute* "config.sh"
+              (("^CC_BASE_PREFIX=.*")
+               (string-append "CC_BASE_PREFIX=" (assoc-ref outputs "out")
+                              "/crossgcc\n")))
+             ;; Note: Important: source/gcc-5.3.0/gcc/exec-tool.in
+             ;; Note: Important: source/kernel-headers-3.12.6-5/tools/install.sh
+             ;; Note: Important: move-if-change (twice)
+             ;; Make sure that shebangs are patched after new extractions.
+             (substitute* "defs.sh"
+              (("touch \"[$]2/extracted\"")
+               (string-append "touch \"$2/extracted\"
+for s in mkinstalldirs move-if-change compile depcomp callprocs configure \\
+mkdep compile libtool-ldflags config.guess install-sh missing config.sub \\
+config.rpath progtest.m4 lib-ld.m4 acx.m4 gen-fixed.sh mkheader.sh ylwrap \\
+merge.sh godeps.sh lock-and-run.sh print-sysroot-suffix.sh mkconfig.sh \\
+genmultilib exec-tool.in install.sh
+do
+  find . -name $s -exec sed -i -e 's;!/bin/sh;!" (assoc-ref inputs "bash")
+"/bin/sh;' '{}' ';'
+  find . -name $s -exec sed -i -e 's; /bin/sh; " (assoc-ref inputs "bash")
+"/bin/sh;' '{}' ';'
+done
+" )))
+             #t))
+         (replace 'build
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "./build.sh")))
+         (delete 'install))))
+    (native-inputs
+     `(("config.sub" ,automake)
+       ("bash" ,bash)
+       ("flex" ,flex)
+       ("gmp" ,gmp)
+       ("mpfr" ,mpfr)
+       ("mpc" ,mpc)
+       ("binutils"
+        ,(origin
+           (method url-fetch)
+           (uri "https://ftpmirror.gnu.org/gnu/binutils/binutils-2.27.tar.bz2")
+           (sha256
+            (base32 "125clslv17xh1sab74343fg6v31msavpmaa1c1394zsqa773g5rn"))))
+       ("target-gcc-5"
+        ,(origin
+           (method url-fetch)
+           (uri "https://ftpmirror.gnu.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.bz2")
+           (sha256
+            (base32 "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"))))
+       ("linux-headers"
+        ,(origin
+           (method url-fetch)
+           (uri "http://ftp.barfooze.de/pub/sabotage/tarballs/linux-headers-4.19.88.tar.xz")
+           (sha256
+            (base32 "1srgi2nqw892jb6yd4kzacf2xzwfvzhsv2957xfh1nvbs7varwyk"))))
+       ("musl"
+        ,(origin
+           (method url-fetch)
+           (uri "http://www.musl-libc.org/releases/musl-1.1.24.tar.gz")
+           (sha256
+            (base32 "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"))))))
+    (supported-systems (remove target-hurd? %supported-systems))
+    (home-page "https://github.com/osresearch/heads")
+    (synopsis "Cross gcc 5 toolchain")
+    (description "Musl-cross toolchain: binutils, gcc 5 and musl.")
+    (license license:isc))))
+
 ;; This package provides a "dev.cpio" file usable as a base for booting Heads.
 (define-public heads-dev-cpio
  (package
@@ -414,7 +414,7 @@ much more.")
 (define-public bvi
  (package
    (name "bvi")
-    (version "1.5.0")
+    (version "1.4.2")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -422,7 +422,7 @@ much more.")
                    "/bvi-" version ".src.tar.gz"))
              (sha256
               (base32
-                "1jvldfxdpgf044hnhjhxi24a9bkbn8adl22icc8rfarv39m72h35"))))
+                "1wllrvs8r8bdm11sx01095j8cj4drjmw0dlkjfdkm5lnnk11dfjb"))))
    (build-system gnu-build-system)
    (arguments '(#:tests? #f))          ; no check target
    (inputs
@@ -334,61 +334,6 @@ Hurd-minimal package which are needed for both glibc and GCC.")
 (define %add-to-hurd-subdirs
  (list "libmachdevdde" "libddekit"))

-(define-public libacpica
-  (let ((commit "0c3593e27947ef0734a070143caadaed28438354")
-        (revision "0"))
-    (package
-      (name "libacpica")
-      (home-page "https://salsa.debian.org/hurd-team/libacpica")
-      (version (git-version "20220331" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url home-page)
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "0hyfg4w2ch6a833kkxjcsddqq2712gqlbvrl6zv5yzvallpfzh7d"))
-                (file-name (git-file-name name version))))
-      (arguments
-       (list
-        #:tests? #f ;no tests
-        #:modules '((srfi srfi-26)
-                    (ice-9 rdelim)
-                    (guix build utils)
-                    (guix build gnu-build-system))
-        #:make-flags #~`(,(string-append "CC=" #$(cc-for-target))
-                         ,(string-append "PREFIX=" #$output))
-        ;; As we are using the Debian package as upstream, we follow their
-        ;; build:
-        ;;   * apply patches in debian/patches taken from the
-        ;;     debian/patches/series file
-        #:phases
-        #~(modify-phases %standard-phases
-            (delete 'configure)
-            (add-after 'unpack 'apply-patches
-              (lambda* (#:key target #:allow-other-keys)
-                (let* ((patch-directory "debian/patches/")
-                       (series (string-append patch-directory "series"))
-                       (text (with-input-from-file series read-string))
-                       (lines (string-split (string-trim-right text) #\newline))
-                       (patches (filter (negate (cute string-prefix? "#" <>))
-                                        lines))
-                       (patch-files (map
-                                     (cute string-append patch-directory <>)
-                                     patches)))
-                  (for-each
-                   (cute invoke "patch" "--force" "-p1" "-i" <>)
-                   patch-files)))))))
-      (inputs (list libirqhelp
-                    libpciaccess))
-      (build-system gnu-build-system)
-      (supported-systems %hurd-systems)
-      (synopsis "ACPICA as a library")
-      (description "libacpica provides ACPICA as a library.")
-      (license (list bsd-3
-                     gpl2)))))
-
 (define-public hurd
  (package
    (name "hurd")
@@ -643,8 +588,7 @@ exec ${system}/rc \"$@\"
                "CFLAGS=-fcommon")))
    (build-system gnu-build-system)
    (inputs
-     `(("libacpica" ,libacpica)                  ;for hurd/acpi.static
-       ("libgcrypt" ,libgcrypt)                  ;for /hurd/random
+     `(("libgcrypt" ,libgcrypt)                  ;for /hurd/random
       ("libdaemon" ,libdaemon)                  ;for /bin/console --daemonize
       ("libxcrypt" ,libxcrypt)                  ;for password hashing
       ("unifont" ,unifont)
@@ -795,11 +739,11 @@ in userland processes thanks to the DDE layer.")
      (license gpl2))))

 (define-public rumpkernel
-  (let ((commit "debian/0_20250111-6")
-        (revision "1"))
+  (let ((commit "2aad456903b2dc2232fa18c7f286cea6d77b570f")
+        (revision "0"))
    (package
      (name "rumpkernel")
-      (version (git-version "0-20250111" revision (substring commit 7)))
+      (version (git-version "0-20250111" revision commit))
      ;; This uses the Debian Salsa rumpkernel package git as upstream as that
      ;; is where development happens.  Once things have stabilized, upstream
      ;; may change to the NetBSD git from where Debian takes their snapshots.
@@ -810,7 +754,7 @@ in userland processes thanks to the DDE layer.")
                      (commit commit)))
                (sha256
                 (base32
-                  "1pvd54k06rlgvppfbzl1d0qqcjc0kshamw1iw40s3apabh87pw1i"))
+                  "14fiv2llvd5s1vi9gigmi1vi0b9yvg2zqyc9xg67ffxl1phv7p8j"))
                (file-name (git-file-name name version))))
      (build-system gnu-build-system)
      (arguments
@@ -38,7 +38,6 @@
 ;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
-;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -306,7 +305,7 @@ actions.")
 (define-public geeqie
  (package
    (name "geeqie")
-    (version "2.7")
+    (version "2.6.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -314,12 +313,11 @@ actions.")
                    (commit (string-append "v" version))))
              (sha256
               (base32
-                "139ffzqqq79d3k5q99r8i1jr9v9vfwv89dkh6vvw1mdnv6b3s9n8"))
+                "08yr8jqli33rn1zvj9mjvinyzjp2myakxgf8wqqq8yidmm0vvn1p"))
              (file-name (git-file-name name version))))
    (build-system meson-build-system)
    (arguments
     (list
-      #:glib-or-gtk? #t
      #:phases
      #~(modify-phases %standard-phases
          ;; Disable test which requires binaries not present
@@ -348,7 +346,6 @@ actions.")
           libwebp))
    (native-inputs
     (list `(,glib "bin") ; glib-gettextize
-           gsettings-desktop-schemas
           intltool
           pkg-config
           python         ; for tests
@@ -927,15 +924,15 @@ with tiling window managers.  Features include:
           ;; That is required for testing.
           xorg-server-for-tests))
    (inputs
-     (list imlib2
-           glib
-           gtk+-2
-           lcms
-           libjpeg-turbo
-           libtiff
-           libexif
-           libx11
-           libxext))
+     `(("imlib2" ,imlib2)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+-2)
+       ("lcms" ,lcms)
+       ("libjpeg" ,libjpeg-turbo)
+       ("libtiff" ,libtiff)
+       ("libexif" ,libexif)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)))
    (arguments
     `(#:phases
       (modify-phases %standard-phases
@@ -71,12 +71,11 @@
  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
-  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
  #:use-module (gnu packages curl)
+  #:use-module (gnu packages compression)
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages fonts)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gcc)
@@ -97,11 +96,10 @@
  #:use-module (gnu packages mcrypt)
  #:use-module (gnu packages mp3)
  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages ocr)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages photo)
-  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages popt)
+  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-check)
@@ -117,6 +115,7 @@
  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fonts)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix gexp)
@@ -184,81 +183,36 @@ convert images in more than 100 different formats.")
 (define-public gradia
  (package
    (name "gradia")
-    (version "1.13.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/AlexanderVanhee/Gradia")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "00s6xj9crj5gkh233q98fmq67f41y877xgrn49cycwb3kybp237n"))))
+    (version "1.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/AlexanderVanhee/Gradia")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "07hal4h3kkjf7la02nqmqgw19sa6hkd130bkfmgwjimkv9zi8z2i"))))
    (build-system meson-build-system)
    (arguments
-     (list
-      #:imported-modules (append %meson-build-system-modules
-                                 %pyproject-build-system-modules)
-      #:modules '((guix build meson-build-system)
-                  ((guix build pyproject-build-system)
-                   #:prefix py:)
-                  (guix build utils))
-      #:glib-or-gtk? #t
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'skip-gtk-update-icon-cache
-            (lambda _
-              (substitute* "meson.build"
-                (("gtk_update_icon_cache: true")
-                 "gtk_update_icon_cache: false")
-                (("update_desktop_database: true")
-                 "update_desktop_database: false"))))
-          (add-after 'unpack 'set-tesseract-and-tessdata-path
-            (lambda _
-              (let* ((tesseract #$(this-package-input "tesseract-ocr"))
-                     (tesseract-bin (string-append tesseract "/bin/tesseract"))
-                     (tessdata (string-append tesseract "/share/tessdata")))
-                (substitute* "meson.build"
-                  (("OCR_TESSERACT_CMD = '/app/bin/tesseract'")
-                   (format #f "OCR_TESSERACT_CMD = '~a'" tesseract-bin))
-                  (("OCR_ORIGINAL_TESSDATA_DIR = '/app/share/tessdata'")
-                   (format #f "OCR_ORIGINAL_TESSDATA_DIR = '~a'" tessdata))))))
-          (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (wrap-program (string-append #$output "/bin/gradia")
-                `("GUIX_PYTHONPATH" =
-                  (,(getenv "GUIX_PYTHONPATH") ,(py:site-packages inputs
-                                                                  outputs)))
-                `("GI_TYPELIB_PATH" =
-                  (,(getenv "GI_TYPELIB_PATH")))
-                `("GDK_PIXBUF_MODULE_FILE" =
-                  (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))
-    (inputs (list bash-minimal
-                  gtk
-                  gtksourceview
-                  libadwaita
-                  libportal
-                  libsoup
-                  python
-                  python-pillow
-                  python-pycairo
-                  python-pygobject
-                  python-pytesseract
-                  tesseract-ocr
-                  webp-pixbuf-loader))
-    (native-inputs (list blueprint-compiler
-                         desktop-file-utils
-                         gettext-minimal
-                         `(,glib "bin")
-                         gobject-introspection
-                         pkg-config))
+     (list #:glib-or-gtk? #t
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'skip-gtk-update-icon-cache
+                 (lambda _
+                   (substitute* "meson.build"
+                     (("gtk_update_icon_cache: true")
+                      "gtk_update_icon_cache: false")
+                     (("update_desktop_database: true")
+                      "update_desktop_database: false")))))))
+    (inputs (list gtk libadwaita python python-pygobject))
+    (native-inputs
+     (list blueprint-compiler gettext-minimal `(,glib "bin") pkg-config))
    (home-page "https://github.com/AlexanderVanhee/Gradia")
    (synopsis "Edit screenshots")
-    (description
-     "Gradia is a GTK 4 application for enhancing and preparing
+    (description "Gradia is a GTK 4 application for enhancing and preparing
 screenshots for blogs, social media, and documentation.  It supports background
 customization, annotation tools (pen, arrow, text, highlight, stamp), padding,
-cropping, @acronym{OCR, optical character recognition} and various export formats.")
+cropping, and various export formats.")
    (license license:gpl3+)))

 (define-public iqa
@@ -18,7 +18,6 @@
 ;;; Copyright © 2024 Christian Miller <christian.miller@dadoes.de>
 ;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
-;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -422,8 +421,8 @@ using a mouse.  It is customizable and extensible with plugins and scripts.")
     (origin
       (method git-fetch)
       (uri (git-reference
-              (url "https://github.com/SrainApp/srain")
-              (commit version)))
+             (url "https://github.com/SrainApp/srain")
+             (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32 "105z2kbj9ar6zk6i1qrbysrp9vbz692kbl2dwdxcwly0yh4cbd0p"))))
@@ -434,11 +433,11 @@ using a mouse.  It is customizable and extensible with plugins and scripts.")
      #:tests? #f ;there are no tests
      #:glib-or-gtk? #t))
    (native-inputs
-     (list gettext-minimal
-           `(,glib "bin")
-           pkg-config
-           python-wrapper
-           python-sphinx))
+     `(("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("python-sphinx" ,python-sphinx)))
    (inputs
     (list glib-networking
           gsettings-desktop-schemas
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2019, 2021, 2026 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021, 2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017, 2022 Marius Bakke <marius@gnu.org>
@@ -226,18 +226,6 @@ JNI.")
             (setenv "JAVACMD" (search-input-file inputs "/bin/jamvm"))
             (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
             (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
-         ,@(if (target-x86-32?)
-               ;; XXX: On i686 isFile() always seems to return true.  Patching
-               ;; this here is very ugly, but the effects are limited.  None
-               ;; of these changes remain by the time we've built Icedtea and
-               ;; the other JDKs.
-               '((add-after 'unpack 'disable-isFile-checks
-                   (lambda _
-                     (substitute* "src/main/org/apache/tools/ant/util/ResourceUtils.java"
-                       (("destFile = \\(\\(FileProvider\\).*") ""))
-                     (substitute* "src/main/org/apache/tools/ant/taskdefs/Mkdir.java"
-                       (("dir.isFile\\(\\)") "false")))))
-               '())
         (replace 'build
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; Ant complains if this file doesn't exist.
@@ -165,18 +165,17 @@ ascii art drawings that contain characters that resemble lines like @samp{|}
                "017n1w6hds4wrz597jk7v8r6pz0kz5j9xwd240nq7s8hc58d4c2q"))
              (modules '((guix build utils)))
              (snippet
-               ;; Remove pre-built native libraries.
-               '(for-each delete-file
-                          (find-files "." "\\.(dll|dylib|so)$")))))
+               '(for-each
+                 delete-file
+                 (find-files "flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/"
+                             ".*")))))
    (build-system ant-build-system)
    (arguments
     (list
-      #:jdk openjdk17
      #:tests? #false                   ;XXX requires junit5
-      #:modules '((guix build ant-build-system)
-                  (guix build java-utils)
-                  (guix build utils)
-                  (sxml simple))
+      #:jar-name "flatlaf.jar"
+      #:source-dir '(list "flatlaf-core/src/main/java")
+      #:test-dir '(list "flatlaf-core/src/test")
      #:phases
      #~(modify-phases %standard-phases
          (add-before 'configure 'build-native-code
@@ -225,58 +224,8 @@ ascii art drawings that contain characters that resemble lines like @samp{|}
          (add-before 'build 'copy-resources
            (lambda _
              (copy-recursively "flatlaf-core/src/main/resources"
-                                "build/classes")))
-          (add-before 'build 'generate-pom
-            (lambda _
-              (call-with-output-file "pom.xml"
-                (lambda (port)
-                  (sxml->xml
-                   `(*TOP*
-                     (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")
-                     (project
-                      (modelVersion "4.0.0")
-                      (groupId "com.formdev")
-                      (artifactId "flatlaf")
-                      (version ,#$version)))
-                   port)))))
-          (replace 'build
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let* ((jdk (assoc-ref inputs "jdk"))
-                     (src-dir "flatlaf-core/src/main/java")
-                     (java9-dir "flatlaf-core/src/main/java9")
-                     (classes-dir "build/classes")
-                     (classes9-dir "build/classes9")
-                     (jar-file
-                      (string-append "build/flatlaf-" #$version ".jar")))
-                ;; Compile main sources (Java 8 target).
-                (apply invoke "javac"
-                       "--release" "8"
-                       "-d" classes-dir
-                       (find-files src-dir "\\.java$"))
-                ;; Compile Java 9 multi-release sources.
-                (mkdir-p classes9-dir)
-                (apply invoke "javac"
-                       "--release" "9"
-                       "-cp" classes-dir
-                       "-d" classes9-dir
-                       (find-files java9-dir "\\.java$"))
-                ;; Create multi-release JAR.
-                (let ((meta-versions
-                       (string-append classes-dir
-                                      "/META-INF/versions/9")))
-                  (mkdir-p meta-versions)
-                  (copy-recursively classes9-dir meta-versions))
-                (call-with-output-file "build/manifest.mf"
-                  (lambda (port)
-                    (display "Multi-Release: true\n" port)))
-                (invoke "jar" "--create"
-                        "--file" jar-file
-                        "--manifest" "build/manifest.mf"
-                        "-C" classes-dir "."))))
-          (replace 'install
-            (install-from-pom "pom.xml")))))
-    (inputs
-     (list libx11 libxt))
+                                "build/classes"))))))
+    (inputs (list libx11 libxt))
    (home-page "https://www.formdev.com/flatlaf/")
    (synopsis "Flat Look and Feel for Java Swing applications")
    (description "FlatLaf is a cross-platform Look and Feel for Java Swing
@@ -1088,9 +1088,9 @@ wrappers.")
  (origin
    (method git-fetch)
    (uri (git-reference (url "https://github.com/tc39/test262")
-                        (commit "a6f387de323eb9ae56448bdb71c5d315df631ce4")))
+                        (commit "a5e69a1534de88d1eb29b76657d84c8541b72df7")))
    (file-name "test262")
-    (sha256 (base32 "09avg4f75rzbmh3hcybdvjij7hbl2m79x6xp1hgl6h8ihfbn33l0"))
+    (sha256 (base32 "078a7nim0n9x36q7q8yvjwhk4ig29p25b03rr4l7g2b545cky66l"))
    (modules '((guix build utils)))
    (snippet #~(begin
                 (for-each delete-file
@@ -1100,7 +1100,7 @@ wrappers.")
 (define-public quickjs-ng
  (package
    (name "quickjs-ng")
-    (version "0.14.0")
+    (version "0.11.0")
    (source
     (origin
       (method git-fetch)
@@ -1109,7 +1109,11 @@ wrappers.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05k8niswh0ly5sx0129jdhiinqs84s86b7sv29ff68v3546dl04i"))))
+        (base32 "0mfk32zvvh6c9a9plp6ad07888g795lhdmal3jyaclyn2k5iig9i"))
+       ;; Remove these patches on next release as they will be included.
+       (patches (search-patches
+                 "quickjs-ng-64-bits-precision-on-i686.patch"
+                 "quickjs-ng-fix-atomics.pause-on-32-bit.patch"))))
    (arguments
     (list
      #:configure-flags
@@ -1142,23 +1146,6 @@ wrappers.")
                 "")
                (("BUILD_DIR=build")
                 "BUILD_DIR=../build"))))
-          ;; XXX: Unknown test failures in quickjs-ng 1.4.0.
-          ;; Remove for future versions.
-          (add-before 'configure 'skip-failing-tests
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let* ((test262 (assoc-ref inputs "test262"))
-                     (lang-path (in-vicinity test262 "test/language")))
-                (substitute* "test262.conf"
-                  (("# list excluded tests and directories here" all)
-                   (string-join
-                    (cons* all
-                           (map (lambda (f)
-                                  (in-vicinity lang-path f))
-                                '(;; export 'foo' in module /gnu/store is ambiguous
-                                  "module-code/ambiguous-export-bindings/"
-                                  ;; Could not find export 'default'
-                                  "import/import-attributes/text-self.js")))
-                    "\n"))))))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
@@ -5,7 +5,7 @@
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
-;;; Copyright © 2024-2026 Spencer King <spencer.king@wustl.edu>
+;;; Copyright © 2024, 2025 Spencer King <spencer.king@geneoscopy.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5592,28 +5592,6 @@ arbitrary normed vector spaces (e.g. matrix-valued integrands).")
 format.")
    (license license:expat)))

-(define-public julia-quantuminterface
-  (package
-    (name "julia-quantuminterface")
-    (version "0.4.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/qojulia/QuantumInterface.jl")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "05792hkhjghlpm919ip8hzbhwv8xcngmyyks2nr8bln6qa8f8r9i"))))
-    (build-system julia-build-system)
-    (native-inputs (list julia-safetestsets))
-    (home-page "https://github.com/qojulia/QuantumInterface.jl")
-    (synopsis "Lightweight interface for Quantum Physics related packages")
-    (description
-     "This package provides a lightweight interface for Quantum Physics
-related packages.")
-    (license license:expat)))
-
 (define-public julia-quaternions
  (package
    (name "julia-quaternions")
@@ -233,12 +233,7 @@ This package is part of the KDE multimedia module.")
                 (lambda* (#:key tests? #:allow-other-keys)
                   (when tests?
                     ;; testsqlscanmanager fails, even when run manually.
-                     (invoke "ctest" "-E" "testsqlscanmanager"))))
-               (add-after 'install 'wrap-program
-                 (lambda _
-                   (wrap-program (string-append #$output "/bin/amarok")
-                     `("GST_PLUGIN_SYSTEM_PATH" ":" suffix
-                       (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))))))
+                     (invoke "ctest" "-E" "testsqlscanmanager")))))))
    (native-inputs
     (list extra-cmake-modules
           googletest
@@ -903,16 +898,8 @@ autoloading of subtitle files for use while playing video.")
           qtdeclarative
           qtwayland))
    (arguments
-     (list
-      #:qtbase qtbase
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'wrap-program
-            (lambda _
-              (wrap-program (string-append #$output "/bin/kamoso")
-                `("GST_PLUGIN_SYSTEM_PATH" ":" suffix
-                  (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))))))
+     (list #:qtbase qtbase
+           #:tests? #f))
    (home-page "https://apps.kde.org/kamoso/")
    (synopsis "Take pictures and videos out of your webcam")
    (description "Kamoso is a simple and friendly program to use your
@@ -1259,27 +1246,14 @@ APIs.  It can also play videos from PeerTube sources.")
                  "0iaandlbv2v4a6wsdxk19ynj77axd3kc72nw28bvbsfb0kqc0mai"))))
      (build-system qt-build-system)
      (arguments
-       (list
-        #:qtbase qtbase
-        #:tests? #f ;no tests
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'install 'wrap-program
-              (lambda _
-                (wrap-program (string-append #$output "/bin/rattlesnake")
-                  `("GST_PLUGIN_SYSTEM_PATH" ":" suffix
-                    (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))))))
+       (list #:qtbase qtbase
+             #:tests? #f)) ;no tests
      (native-inputs
       (list extra-cmake-modules))
      (inputs
-       (list gst-plugins-base
-             gst-plugins-good
-             gstreamer
-             kirigami
-             kirigami-addons
-             qtdeclarative
-             qtmultimedia
-             qtwayland))
+       (list kirigami qtdeclarative qtmultimedia qtwayland))
+      (propagated-inputs
+       (list gstreamer gst-plugins-base gst-plugins-good))
      (home-page "https://invent.kde.org/multimedia/rattlesnake")
      (synopsis "Metronome")
      (description "Rattlesnake is a metronome app.")
@@ -485,23 +485,11 @@ to camera devices supported by @code{libgphoto2} using
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kate-" version ".tar.xz"))
       (sha256
-        (base32 "0ah6cy92yir68z25460ccl48i5nrfqswpzil9a7l69h3qxspsk88"))
-       (modules '((guix build utils)))
-       ;; Unbundle SingleApplication.
-       (snippet
-        '(begin
-           (delete-file-recursively "3rdparty/SingleApplication")
-           (with-directory-excursion "apps/kate"
-             (substitute* "CMakeLists.txt"
-               ((".*3rdparty.*") "")
-               ((" -DQAPPLICATION_CLASS=FreeStandingSingleApplication") ""))
-             (substitute* "main.cpp"
-               (("(#include )\"SingleApplication\\/SingleApplication\"" _ keep)
-                (string-append keep "<SingleApplication>"))))))))
+        (base32 "0ah6cy92yir68z25460ccl48i5nrfqswpzil9a7l69h3qxspsk88"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools xorg-server-for-tests))
-    ;; TODO: Unbundle rapidjson.
+    ;; TODO: Unbundle rapidjson and SingleApplication.
    (inputs
     (list breeze-icons ;; default icon set
           karchive
@@ -527,20 +515,11 @@ to camera devices supported by @code{libgphoto2} using
           libxkbcommon
           plasma-activities
           qtsvg
-           qtwayland
-           single-application))
+           qtwayland))
    (arguments
     (list #:qtbase qtbase
           #:phases
           #~(modify-phases %standard-phases
-               (add-after 'unpack 'link-single-application
-                 (lambda _
-                   (substitute* "apps/kate/CMakeLists.txt"
-                     (("target_link_libraries\\(kate-bin PRIVATE kateprivate"
-                       all)
-                      (string-append all " "
-                                     #$(this-package-input "single-application")
-                                     "/lib/libSingleApplication.a")))))
               (add-after 'unpack 'patch-tests
                 (lambda* (#:key inputs #:allow-other-keys)
                   ;; This test requires a 'bin' diretory under '/usr'.
@@ -24,7 +24,6 @@
  #:use-module (guix packages)
  #:use-module (gnu packages golang-build)
  #:use-module (gnu packages golang-check)
-  #:use-module (gnu packages golang-crypto)
  #:use-module (gnu packages golang-web)
  #:use-module (gnu packages golang-xyz)
  #:use-module (gnu packages prometheus))
@@ -34,313 +33,6 @@
 ;;; Libraries:
 ;;;

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

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

 ;;;
 ;;; Executables:
@@ -219,14 +219,14 @@ resolution, asynchronous file system operations, and threading primitives.")
  (package
    (inherit libuv)
    (name "libuv")
-    (version "1.44.2")
+    (version "1.43.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://dist.libuv.org/dist/v" version
                                  "/libuv-v" version ".tar.gz"))
              (sha256
               (base32
-                "1d1wy1061cf2mfygr2j6jbm0da2mhsf0l9yq4rjkqrsmijbdrz6c"))))
+                "194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh"))))
    (properties '((hidden? . #t)))))

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

 ;; Update this id with every update to its release date.
 ;; It's used for cache validation and therefore can lead to strange bugs.
 ;; ex: date '+%Y%m%d%H%M%S'
 ;; or: (format-time-string "%Y%m%d%H%M%S")
-(define %librewolf-build-id "20260428201413")
+(define %librewolf-build-id "20260421153818")

 (define-public librewolf
  (package
    (name "librewolf")
-    (version "150.0.1-1")
+    (version "150.0-1")
    (source
     (make-librewolf-source
      #:version version
-      #:firefox-hash "1v3fbwvd0khm3xwsgwcp6wpwmkz0v6fyk37hxj0mqkwjimqgmkra"
-      #:librewolf-hash "0294lsiyvfh93id04xki4bhs8d84vmysqviivxiif0xfzqv65qzp"
+      #:firefox-hash "151rxzl80dm8jsxl6fwzgbirwq4zpms5adwwnbjcwdd1r3s3vr7v"
+      #:librewolf-hash "0iw9v3zc1fxc93yyhldqarxaypgmbndh2ylsy330kcbpb6p1gnmr"
      #:l10n firefox-l10n))
    (build-system gnu-build-system)
    (arguments
@@ -12982,8 +12982,8 @@ score.  When evaluated, the musical score is rendered to an image.")
  (sbcl-package->ecl-package sbcl-cmn))

 (define-public sbcl-coalton
-  (let ((commit "14ed6dc733f8c23c1a345ceb11d3f75ee47f7525")
-        (revision "6"))
+  (let ((commit "bf475c8c53e02a2e0cb29deab4d101d25743bfca")
+        (revision "5"))
    (package
      (name "sbcl-coalton")
      (version (git-version "0.0.1" revision commit))
@@ -12995,16 +12995,12 @@ score.  When evaluated, the musical score is rendered to an image.")
               (commit commit)))
         (file-name (git-file-name "cl-coalton" version))
         (sha256
-          (base32 "024n72lxi8nycy012lqy6zx19lv7jh2ngs1mf559rw8kgwh3k54c"))))
+          (base32 "0zrp2s82n2mxx7knbnbsdj64zar21nnnf8iwzrqzs4g3v6xpyz9z"))))
      (build-system asdf-build-system/sbcl)
      (native-inputs
-       (list sbcl-fiasco
-             sbcl-html-entities
-             sbcl-spinneret
-             sbcl-yason))
+       (list sbcl-fiasco))
      (inputs
       (list sbcl-alexandria
-             sbcl-computable-reals
             sbcl-concrete-syntax-tree
             sbcl-eclector
             sbcl-float-features
@@ -13560,10 +13556,10 @@ place outside with-notes.
  (sbcl-package->ecl-package sbcl-compiler-macro-notes))

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

+(define-public ecl-mcclim
+  (let ((pkg (sbcl-package->ecl-package sbcl-mcclim)))
+    (package
+      (inherit pkg)
+      (arguments
+       (substitute-keyword-arguments arguments
+         ;; Tests fail with "FUNCTION: Not a valid argument (R1
+         ;; (GENERATE-REGION))."  on ECL.
+         ((#:tests? _ #f) #f))))))
+
 (define-public sbcl-md5
  (package
    (name "sbcl-md5")
@@ -29424,7 +29430,7 @@ running into parallelism problems when having to change directory.")
 (define-public sbcl-simple-matrix
  (package
    (name "sbcl-simple-matrix")
-    (version "3.16")
+    (version "3.15")
    (source
     (origin
       (method git-fetch)
@@ -29433,7 +29439,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 "1yfh40kvpgjaq0vlm5lqnfpll9swl7gzcxnd0qlk6hshhqyc373q"))))
+        (base32 "1lpmqp1mcnzkpxi0zfsd4n85c6gr6d01hlf8yka8068kyypbhkvg"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs (list sbcl-fiveam))
    (synopsis "Matrix library for Common Lisp")
@@ -29761,7 +29767,7 @@ the Processing language and shares some of the API.")
  ;; Update together with emacs-slime.
  (package
    (name "sbcl-slime-swank")
-    (version "2.32")
+    (version "2.31")
    (source
     (origin
       (file-name (git-file-name "cl-slime-swank" version))
@@ -29770,7 +29776,7 @@ the Processing language and shares some of the API.")
             (url "https://github.com/slime/slime/")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "0s7m7j7y1p8fb6ncpxcxdrrrxp5aw67xl7wrqy8zjjvwzljbs548"))
+        (base32 "0nv99wq2vz053p0rn9953rhmyz4g40zdl01mz7z9xbklxzbsx6x7"))
       (modules '((guix build utils)))
       (snippet
        ;; The doc folder drags `gawk' into the closure.  Doc is already
@@ -32061,14 +32067,6 @@ a simple-array ensuring that the resulting array is still a simple-array.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-          ;; sbcl 2.6.4 is too smart, and figures out the test will trigger a
-          ;; division by zero at compile time and refuse to compile the file. It
-          ;; looks like the test already tries to avoid compile time checks, so
-          ;; we go a step further and EVAL parts of the expression.
-          (add-after 'unpack 'circumvent-compile-time-check
-             (lambda _
-               (substitute* "test/tests.lisp"
-                 (("\\(expt 1024 0\\)") "(eval '(expt 1024 0))"))))
          (add-after 'check 'delete-test-results
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((test-results (string-append (assoc-ref outputs "out")
@@ -109,7 +109,6 @@
  #:use-module (gnu packages pretty-print)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages sdl)
-  #:use-module (gnu packages stb)
  #:use-module (gnu packages tcl)
  #:use-module (gnu packages tex)
  #:use-module (gnu packages texinfo)
@@ -893,16 +892,13 @@ interface to the Tk widget system.")
    (arguments
     (list #:make-flags
           #~(list
-              (string-append "PREFIX=" #$output)
+              (string-append "DESTDIR=" #$output)
+              (string-append "PREFIX=")
              (string-append "CC=" #$(cc-for-target)))
           #:test-target "test"
           #:phases
           #~(modify-phases %standard-phases
               (delete 'configure))))
-    (native-search-paths
-     (list (search-path-specification
-             (variable "JANET_PATH")
-             (files (list "lib/janet")))))
    (home-page "https://janet-lang.org/")
    (synopsis "Functional, imperative and embeddable programming language")
    (description
@@ -1003,78 +999,6 @@ tool and its main uses are installing dependencies, compiling C/C++ to native
 libraries, and other management tasks for Janet projects.")
    (license license:expat)))

-(define-public janet-spork
-  (package
-    (name "janet-spork")
-    (version "1.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/janet-lang/spork")
-              (commit (string-append "v" version))))
-       (modules '((guix build utils)))
-       (snippet #~(for-each
-                   delete-file-recursively
-                   '("deps/miniz" "deps/stb")))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0c9f54wl8g7zazrqk5f6nhp9lp38pymkxmcipagrip915i8ks0v8"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)
-          (delete 'check)
-          (add-after 'unpack 'fixes
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* '("test/suite-cjanet.janet")
-                (("\\(end-jit\\)" all)
-                 (simple-format #f "(setdyn :cc ~s)\n~a"
-                   #$(cc-for-target) all)))
-              (substitute* '("src/zip.c")
-                (("\"\\.\\./deps/miniz/miniz\\.h\"") "<miniz/miniz.h>"))
-              (let ((stb (dirname (search-input-file inputs "stb_image.h"))))
-                (substitute* '("project.janet")
-                  (("\"deps/miniz/miniz\\.c\"") "")
-                  ((":headers @\\[\"deps/miniz/miniz\\.h\"\\]")
-                   ":ldflags @[\"-lminiz\"]")
-                  (("\"-Ideps/stb\"") (string-append "\"-I" stb "\""))))))
-          (replace 'build
-            (lambda _
-              (invoke "janet" "-l" "./bundle" "-e" "(build)")))
-          (replace 'install
-            (lambda _
-              (let* ((janet-path (string-append #$output "/lib/janet")))
-                (mkdir-p janet-path)
-                (setenv "JANET_PATH" janet-path))
-              (invoke "janet" "--install" ".")))
-          (add-after 'install 'fix-output
-            (lambda _
-              (let* ((inc (string-append #$output "/include/janet/spork"))
-                     (bin (string-append #$output "/lib/janet/bin"))
-                     (man (string-append #$output "/lib/janet/man")))
-                (mkdir-p inc)
-                (rename-file
-                 (string-append #$output "/lib/janet/tarray.h")
-                 (string-append inc "/tarray.h"))
-                (rename-file bin (string-append #$output "/bin"))
-                (mkdir-p (string-append #$output "/share"))
-                (rename-file man (string-append #$output "/share/man")))))
-          (add-after 'fix-output 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "janet" "-l" "./bundle" "-e" "(check)")))))))
-    (inputs (list janet miniz stb))
-    (home-page "https://github.com/janet-lang/spork")
-    (synopsis "Extended standard library for Janet")
-    (description
-     "Spork is a utility library for Janet.  It contains small modules
-that should be useful for general programming in Janet but are not included
-in the standard library.")
-    (license license:expat)))
-
 (define-public lisp-repl-core-dumper
  (package
    (name "lisp-repl-core-dumper")
@@ -229,25 +229,42 @@ provides some unique features such as CSV log format and wide string support.")
 (define-public multitail
  (package
    (name "multitail")
-    (version "7.1.5")
+    (version "6.5.2")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/folkertvanheusden/multitail")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "11kkd2rg3qc7ck5iyha0f8l5lqc1bvwypn80di0h77h7p106blvk"))))
-    (build-system cmake-build-system)
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://github.com/halturin/multitail")
+            (commit (string-append "v" version))))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32 "17hg5qpangyx4m7hp2x4h56mp6w3wsaslg1il39qcpwsffh1rihc"))))
+    (build-system gnu-build-system)
    (arguments
-     (list
-      #:tests? #f                       ;no test suite
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'patch-curses-headers
-                     (lambda _
-                       (substitute* "mt.h"
-                         (("ncursesw/") "")))))))
+     `(#:make-flags
+       (list (string-append "CC=" ,(cc-for-target))
+             (string-append "PREFIX=" (assoc-ref %outputs "out"))
+             "SYSCONFDIR=$(PREFIX)/etc")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-broken-build
+           ;; With some luck, you might be able to remove this when updating…
+           (lambda _
+             (substitute* "Makefile"
+               ((" \\*\\.txt") "")
+               ((".*CONFIG_DIR.*") "")
+               (("^install: .*" match)
+                (string-append match
+                               "\t$(INSTALL_DIR) $(DESTDIR)$(SYSCONFDIR)\n")))
+             (substitute* "version"
+               (("(VERSION=).*" _ assign)
+                (string-append assign ,version)))))
+         (add-after 'unpack 'patch-curses-headers
+           (lambda _
+             (substitute* "mt.h"
+               (("ncursesw/") ""))))
+         (delete 'configure))           ; no configure script
+       #:tests? #f)) ; no test suite (make check just runs cppcheck)
    (inputs (list ncurses))
    (home-page "https://vanheusden.com/multitail/")
    (synopsis "Monitor multiple log files")
@@ -1129,7 +1129,7 @@ Grammars (PEGs).")
 (define (make-lua-luv name lua)
  (package
    (name name)
-    (version "1.44.2-0")
+    (version "1.43.0-0")
    (source (origin
              ;; The release tarball includes the sources of libuv but does
              ;; not include the pkg-config files.
@@ -1140,7 +1140,7 @@ Grammars (PEGs).")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0jdvsznzha290gnzd66vscsdacd5dapq0scwy4zj64d9wnsv39p7"))))
+                "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                      ; there are none
@@ -1821,7 +1821,7 @@ multiple local rocks trees.")
 (define-public fennel
  (package
    (name "fennel")
-    (version "1.6.1")
+    (version "1.6.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1830,10 +1830,11 @@ multiple local rocks trees.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0n58410gmxfnmgggdw6ap12fa68z5s7f83487b2apim52a8wpd9h"))))
+                "09gky2w8z83qqv0n9vx8jqsfldni14kjr6l7y5k44lq5i30i0fsv"))))
    (build-system gnu-build-system)
    (arguments
-     (list #:make-flags #~(list (string-append "PREFIX=" #$output))
+     (list #:make-flags #~(list (string-append "PREFIX="
+                                               (assoc-ref %outputs "out")))
           #:test-target "test"
           #:phases #~(modify-phases %standard-phases
                        (delete 'configure)
@@ -57,7 +57,7 @@
 ;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Benjamin Slade <slade@lambda-y.net>
 ;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
-;;; Copyright © 2024-2026 Zheng Junjie <z572@z572.online>
+;;; Copyright © 2024, 2025 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -138,7 +138,6 @@
  #:use-module (gnu packages guile-xyz)
  #:use-module (gnu packages haskell-xyz)
  #:use-module (gnu packages icu4c)
-  #:use-module (gnu packages jemalloc)
  #:use-module (gnu packages kerberos)
  #:use-module (gnu packages language)
  #:use-module (gnu packages libbsd)
@@ -149,7 +148,6 @@
  #:use-module (gnu packages libunistring)
  #:use-module (gnu packages libunwind)
  #:use-module (gnu packages linux)
-  #:use-module (gnu packages llvm)
  #:use-module (gnu packages lsof)
  #:use-module (gnu packages lua)
  #:use-module (gnu packages m4)
@@ -160,7 +158,6 @@
  #:use-module (gnu packages networking)
  #:use-module (gnu packages onc-rpc)
  #:use-module (gnu packages openldap)
-  #:use-module (gnu packages nss)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages perl)
@@ -201,7 +198,6 @@
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
  #:use-module (gnu packages)
-  #:use-module (guix build-system cargo)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system glib-or-gtk)
@@ -1359,7 +1355,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
 (define-public mu
  (package
    (name "mu")
-    (version "1.14.1")
+    (version "1.14.0")
    (source
     (origin
       (method git-fetch)
@@ -1368,7 +1364,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0dv27pq2jmgqlzsy2gcmh7vddiwiwd55j299blb9k8g0xhkg8riz"))))
+        (base32 "1fhnnm58ndfd6hzdagrsgcdcm2qlcjlda13vyx5d9lclhxgdn0vf"))))
    (build-system meson-build-system)
    (native-inputs
     (list pkg-config
@@ -3914,112 +3910,6 @@ are supported).  @code{bit} is a CGI/SSI program that generates web pages
 on the fly.  Both programs are written in C and are very fast.")
    (license license:expat)))

-(define computed-origin-method (@@ (guix packages) computed-origin-method))
-
-(define-public stalwart
-  (package
-    (name "stalwart")
-    (version "0.16.4")
-    (source
-     (let ((upstream-source
-             (origin
-               (method git-fetch)
-               (uri (git-reference
-                      (url "https://github.com/stalwartlabs/stalwart")
-                      (commit (string-append "v" version))))
-               (file-name (git-file-name name version))
-               (sha256
-                (base32
-                 "0r3p4g09012ranm4x4crhqa3p7i1m3w7xpy182c3ii74a131f5z1")))))
-       (origin
-         (method computed-origin-method)
-         (file-name (git-file-name name version))
-         (sha256 #f)
-         (uri
-          (delay
-            (with-imported-modules '((guix build utils))
-              #~(begin
-                  (use-modules (guix build utils))
-                  (set-path-environment-variable
-                   "PATH" '("bin")
-                   (list #+python-minimal))
-                  (copy-recursively #+upstream-source "upstream-source")
-                  (with-directory-excursion "upstream-source"
-                    (for-each make-file-writable (find-files "crates" "\\.rs"))
-                    (invoke "python3" "resources/scripts/ossify.py" "crates")
-                    (substitute* "crates/main/Cargo.toml"
-                      ((", \"enterprise\"")
-                       ""))
-                    (substitute* "crates/common/Cargo.toml"
-                      (("git =.*/opentelemetry-rust\"")
-                       "version = \"0.31.0\"")))
-                  (copy-recursively "upstream-source" #$output))))))))
-    (build-system cargo-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      ;; TODO: Currently, if the test is enabled, it will attempt to link
-      ;; the foundationdb library. However, we haven't packaged it yet,
-      ;; so for now, skip tests.
-      #:tests? #f
-      #:features ''("s3" "postgres" "rocks" "sqlite")
-      #:cargo-install-paths ''("crates/main")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'setenv
-            (lambda* (#:key inputs #:allow-other-keys)
-              (setenv "LIBZ_SYS_STATIC" "0")
-              ;; jemalloc needs unbundling for tikv-jemallocator-sys
-              ;; This flag is needed when not using the bundled jemalloc.
-              ;; https://github.com/tikv/jemallocator/issues/19
-              (setenv
-               "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1")
-              (setenv "JEMALLOC_OVERRIDE"
-                      (search-input-file inputs "/lib/libjemalloc.so")))))))
-    (native-inputs (list clang pkg-config))
-    (inputs (cons* bzip2
-                   jemalloc
-                   librdkafka
-                   lz4
-                   rocksdb
-                   snappy
-                   sqlite
-                   zlib
-                   openssl
-                   `(,zstd "lib")
-                   (cargo-inputs 'stalwart)))
-    (home-page "https://stalw.art")
-    (synopsis "All in one Mail and Collaboration server")
-    (description
-     "Stalwart is an mail and collaboration server with JMAP, IMAP4, POP3, SMTP,
-CalDAV, CardDAV and WebDAV support and a wide range of modern features.")
-    (license license:agpl3)))
-
-(define-public stalwart-cli
-  (package
-    (name "stalwart-cli")
-    (version "1.0.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/stalwartlabs/cli")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1dnmv730bd4p4vhxw5m4jazbzyvwm9bf4rdsr8g84yriv51zbz6a"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:install-source? #f))
-    (native-inputs (list nss-certs-for-test))
-    (inputs (cargo-inputs 'stalwart-cli))
-    (home-page "https://stalw.art")
-    (synopsis "Stalwart Command Line Interface")
-    (description
-     "A schema-driven command line tool for administering Stalwart Mail and
-Collaboration Server over its JMAP API.")
-    (license license:agpl3)))
-
 (define-public swaks
  (package
    (name "swaks")
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Steve George	d0d906917c	gnu: ruby: Update to use 3.4 series. * gnu/packages/ruby.scm (ruby): Use Ruby-3.4 which is still in full maintenance period. Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	2288a14a60	gnu: ruby-timeout: Update to 0.6.0. * gnu/packages/ruby-xyz.scm (ruby-timeout): Update to 0.6.0. Change-Id: Ic87e5011edb627cf902a85e50ccbc7425a3c9c28	2026-04-26 12:41:27 +01:00
Aaron Covrig	da50337f6b	gnu: ruby-diffy: Update to 3.4.4. * gnu/packages/ruby-xyz.scm (ruby-diffy): Update to 3.4.4. [native-inputs]: Add ruby-rake. [arguments]<#:test-target>: Set to spec and enable tests. Change-Id: Iaaf371ca93089781ee48ff1c530f1abde09483d9 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	939ce93a12	gnu: ruby-rainbow: Update to 3.1.1. * gnu/packages/ruby-xyz.scm (ruby-rainbow): Update to 3.1.1. Change-Id: I12b411ca895894b859ce6e2e9f87043bc5ca4825 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	421df8e79b	gnu: ruby-tilt: Update to 2.7.0. * gnu/packages/ruby-xyz.scm (ruby-tilt): Update to 2.7.0. [propagated-inputs]: Remove ruby-pandoc-ruby and ruby-sassc. [native-inputs]: Remove bundler, ruby-yard, ruby-builder, ruby-erubis, and ruby-markaby. Change-Id: I2ccbc8325cb8fa32e4b110b448f61a7ad7a33d6a Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	c534e0adfd	gnu: ruby-slim: Update native-inputs. * gnu/packages/ruby-xyz.scm (ruby-slim): Update native-inputs. [native-inputs]: Add ruby-pandoc-ruby. [home-page]: Update url to https. Change-Id: I632fabcb8e785a5494ff34a5d38be5dabe2f00e7 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	3b338604b8	gnu: ruby-timecop: Update to 0.9.10. * gnu/packages/ruby-xyz.scm (ruby-timecop): Update to 0.9.10. Change-Id: Ie5d9220b3963870946c6c7ad8397d3edb5f97a6d Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	67c8d652fd	gnu: ruby-unicode-display-width: Update to 3.2.0. * gnu/packages/ruby-xyz.scm (ruby-unicode-display-width): Update to 3.2.0. [propagated-inputs]: Add ruby-unicode-emoji. Change-Id: Ida9c8fc4f005153ae1395ac9939441d7b405263d Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	3a2775a160	gnu: Add ruby-unicode-emoji. * gnu/packages/ruby-xyz.scm (ruby-unicode-emoji): New variable. Change-Id: Ia07e49d5d1e66cc2605426a03a2eff0ff9a17bee Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	5e5ff1381b	gnu: ruby-terminal-table: Update to 4.0.0. * gnu/packages/ruby-xyz.scm (ruby-terminal-table): Update to 4.0.0. [native-inputs]: Remove ruby-term-ansicolor. Change-Id: Idde31b70c3e0e8e18a99e38a7344ac339a9d24bf Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	ef165bcf5a	gnu: jekyll: Loosen dependencies. * gnu/packages/ruby-xyz.scm (jekyll): Loosen dependencies. [arguments]<#:phases>{loosen-dependencies}: New phase. Change-Id: I832d2a4d1d9b84675906bb9d6fa7e2265f911c52 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	f8f1778c69	gnu: ruby-concurrent-ruby: Update to 1.3.6. * gnu/packages/ruby-xyz.scm (ruby-concurrent-ruby): Update to 1.3.6. Change-Id: Idb3268ff21495e5d339641f970b4c281a4a18a24	2026-04-26 12:41:27 +01:00
Aaron Covrig	1e88181626	gnu: ruby-pg: Update to 1.6.3. * gnu/packages/ruby-xyz.scm (ruby-pg): Update to 1.6.3. [source]: Remove patch. Change-Id: Iadd1ae740a6e46c1f27ff194f160c16878d0a27b Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	c364afa1d6	gnu: ruby-faker: Update to 3.6.0. * gnu/packages/ruby-xyz.scm (ruby-faker): Update to 3.6.0. [description]: Add space after period. Change-Id: I2b45827ece0e9db3a7a0c7d6a69c29f5f3a6e13f Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Aaron Covrig	8dffe4713d	gnu: ruby-rubygems-tasks: Update to 0.3.0. * gnu/packages/ruby-xyz.scm (ruby-rubygems-tasks): Update to 0.3.0. Change-Id: Ib5d2191b82f28f99b5d44a663f782c25d12ed218 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:27 +01:00
Steve George	f1286d6bf1	gnu: Update ruby-method-source. * gnu/packages/ruby-xyz.scm (ruby-method-source): Update to 1.1.0. [arguments]<#:ruby>: Use ruby-3.3. Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:41:23 +01:00
gemmaro	8cb29ebe60	gnu: ruby-racc: Update to 1.8.1. * gnu/packages/ruby-xyz.scm (ruby-racc): Update to 1.8.1. [source]: Use the Git repository for tests. [arguments]<#:tests?>: Remove the disabling of tests. <#:phases>: Add the compile phase before the build phase to support the optional native extension for performance improvements. [native-inputs]: Remove Hoe and add test-unit-ruby-core as a test dependency. Change-Id: If3295179b6401db63cd5c1ab3beb77fe0579eaae	2026-04-26 12:07:48 +01:00
Yan Abu Arab	56b1a933f1	gnu: Add bashly. * gnu/packages/bash.scm (bashly): New variable. Change-Id: I242872ae6e958865fed7d4f63c590b3908ff61a0 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	19019755ad	gnu: Add ruby-tty-markdown. * gnu/packages/ruby-xyz.scm (ruby-tty-markdown): New variable. Change-Id: I6f545a7e5b0d12040a0ccfaf540331e0d3a708a9 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	57a0260359	gnu: Add ruby-strings. * gnu/packages/ruby-xyz.scm (ruby-strings): New variable. Change-Id: I72fe90e20fb7971f13717633fb8495319ad76dae Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	82b8284ce1	gnu: Add ruby-strings-ansi. * gnu/packages/ruby-xyz.scm (ruby-strings-ansi): New variable. Change-Id: I5cccefb9ecc2f6a7a446432134de8284beeb02b0 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	7c290d6667	gnu: Add ruby-unicode-utils. * gnu/packages/ruby-xyz.scm (ruby-unicode-utils): New variable. Change-Id: I9c7d65878ea3740590574fc95e6df6d363af41f5 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	46a4f15a55	gnu: Add ruby-pastel. * gnu/packages/ruby-xyz.scm (ruby-pastel): New variable. Change-Id: Id29ba0f928d96d74cb8c8a103efeaa13ca42844e Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	d407ea1404	gnu: Add ruby-tty-color. * gnu/packages/ruby-xyz.scm (ruby-tty-color): New variable. Change-Id: I1ac670580783b37278b2d8b911d55db36ce1bb82 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	3da6a0bc9d	gnu: Add ruby-tty-screen. * gnu/packages/ruby-xyz.scm (ruby-tty-screen): New variable. Change-Id: I95dbd3b246bdfaeaf405b801ecee8ea601181d53 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	44ac95c31f	gnu: Add ruby-requires. * gnu/packages/ruby-xyz.scm (ruby-requires): New variable. Change-Id: I1c7be3706228519ba0863757067fc16ec9441159 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	e734102b74	gnu: Add ruby-ostruct. * gnu/packages/ruby-xyz.scm (ruby-ostruct): New variable. Change-Id: Id3aeac1448ea8eea2dc2d18f1f9948695b45a128 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	4a041b080e	gnu: Add ruby-lp. * gnu/packages/ruby-xyz.scm (ruby-lp): New variable. Change-Id: I945c9655b15a20cf9f7eb98046688c095103191d	2026-04-26 12:07:48 +01:00
Yan Abu Arab	a3ae72cebe	gnu: Add ruby-logger. * gnu/packages/ruby-xyz.scm (ruby-logger): New variable. Change-Id: I4bf70d0454508ab26796ffaa9760b8b7bc47b412 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	4dea734cb7	gnu: Add ruby-gtx. * gnu/packages/ruby-xyz.scm (ruby-gtx): New variable. Change-Id: I299aced1e3c3bde74842ed3eb1b7715907d29f59 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	44019bf299	gnu: Add ruby-erb. * gnu/packages/ruby-xyz.scm (ruby-erb): New variable. Change-Id: Ie93d17f86117cac8a7578cd6f67f37f98c694dc9 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	3a7d19de6a	gnu: Add ruby-filewatcher. * gnu/packages/ruby-xyz.scm (ruby-filewatcher): New variable. Change-Id: I8000180150dd459892286ae2e113c11ad6bd1703 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	b03996be13	gnu: Add ruby-module-methods. * gnu/packages/ruby-xyz.scm (ruby-module-methods): New variable. Change-Id: Ie56b41d3b3e46efc1f93082229720798b0bc07ce Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	7ad161c1c8	gnu: Add ruby-completely. * gnu/packages/ruby-xyz (ruby-completely): New variable. Change-Id: I8a302bb43b9ffb4ca80ba22341f5f8c13ab7a4e1 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	4dd12d40d8	gnu: Add ruby-mister-bin. * gnu/packages/ruby-xyz (ruby-mister-bin): New variable. Change-Id: I19471c1435d2a64d1b4fa349273e5387fdaf9b16 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	ef3aec8060	gnu: Add ruby-docopt-ng. * gnu/packages/ruby-xyz (ruby-docopt-ng): New variable. Change-Id: I630bae2f85829df393e45d01679535ff1331bd41 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00
Yan Abu Arab	057e45fa94	gnu: Add ruby-colsole. * gnu/packages/ruby-xyz.scm (ruby-colsole): New variable. Closes: guix/guix#4985 Change-Id: Ic45d94aecbe190d363cf91c026233cd2c26d43f1 Signed-off-by: Steve George <steve@futurile.net>	2026-04-26 12:07:48 +01:00