gnu: kpackage: Enable all tests.

* gnu/packages/kde-frameworks.scm (kpackage)[arguments]<#:test-exclude>: Remove plasmoidpackagetest. <#:phases>: Do not replace check phase. Change-Id: I3faa1729961ccfdcaefa0979939d9e5b24d79de0
gnu: kpackage: Fix allowing external paths and symlinks.
2026-07-08 01:04:06 +02:00 · 2026-04-04 07:22:14 +05:30 · 2026-04-04 07:22:14 +05:30 · 2026-04-04 07:22:14 +05:30 · 2026-04-04 07:22:14 +05:30 · 2026-04-04 07:22:14 +05:30
317 changed files with 24762 additions and 53764 deletions
@@ -141,7 +141,6 @@
   (eval . (put 'substitute* 'scheme-indent-function 1))
   (eval . (put 'match-record 'scheme-indent-function 3))
   (eval . (put 'match-record-lambda 'scheme-indent-function 2))
-   (eval . (put 'with-fluids 'scheme-indent-function 2))

   ;; TODO: Contribute these to Emacs' scheme-mode.
   (eval . (put 'let-keywords 'scheme-indent-function 3))
@@ -68,7 +68,6 @@ guix/discovery\.scm                                @guix/core
 guix/docker\.scm                                   @guix/core
 guix/download\.scm                                 @guix/core
 guix/elf\.scm                                      @guix/core
-guix/fossil-download\.scm                          @guix/core
 guix/ftp-client\.scm                               @guix/core
 guix/gexp\.scm                                     @guix/core
 guix/git-authenticate\.scm                         @guix/core
@@ -179,7 +178,6 @@ guix/scripts/import/elpa\.scm                      @guix/emacs
 tests/import/elpa\.scm                             @guix/emacs

 gnu/packages/bootloaders\.scm                      @guix/embedded
-gnu/packages/coreboot\.scm                         @guix/embedded
 gnu/packages/firmware\.scm                         @guix/embedded

 gnu/packages/emulators\.scm                        @guix/games
@@ -241,7 +239,6 @@ tests/guix-home\.sh                                @guix/home
 tests/home-import\.scm                             @guix/home
 tests/home-services\.scm                           @guix/home

-gnu/packages/fabric-management\.scm                @guix/hpc
 gnu/packages/mpi\.scm                              @guix/hpc
 gnu/packages/oneapi\.scm                           @guix/hpc
 gnu/packages/opencl\.scm                           @guix/hpc
@@ -319,7 +316,6 @@ gnu/packages/tor-browsers\.scm                     @guix/mozilla

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

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

 * Changes in 1.5.0 (since 1.4.0)
 ** Package management
@@ -73,8 +73,8 @@ then
 	# Copy the keys so that the secret key has the right permissions (the
 	# daemon errors out when this is not the case.)
 	mkdir -p "$GUIX_CONFIGURATION_DIRECTORY"
-	cp "@abs_top_srcdir@/tests/keys/openpgp/signing-key.sec"	\
-	   "@abs_top_srcdir@/tests/keys/openpgp/signing-key.pub"	\
+	cp "@abs_top_srcdir@/tests/keys/signing-key.sec"	\
+	   "@abs_top_srcdir@/tests/keys/signing-key.pub"	\
 	   "$GUIX_CONFIGURATION_DIRECTORY"
 	chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec"
    fi
@@ -1667,9 +1667,6 @@ can be turned into a version string via @code{git-version}, for example
@code{rust-pipewire-0.8.0.fd3d8f7} and @code{rust-pubgrub-0.3.0.b70cf70}.
@end table

-When contributing Rust packages, we should have all modifications to these
-two modules, in the same commit as the package we are contributing.
-
 To avoid merge conflicts with changes from multiple branches, these two modules
 are maintained by the Rust team (@pxref{Teams}).

@@ -1699,68 +1696,6 @@ tree.
@xref{Packaging Rust Crates,,, guix-cookbook, GNU Guix Cookbook}, for
 packaging workflow.

-@subsubsection Commit messages
-
-The commit message must have a general brief mention to entry changes
-in @code{(gnu packages rust-crates)}. For changes in @code{(gnu packages
-rust-sources)}, the commit message must explicitly mention all changes to the
-packages.
-
-Here are some examples for different situations:
-
-@itemize
-
-@item
-Adding a new Rust package:
-
-@example
-gnu: Add catppuccin-whiskers.
-
-* gnu/packages/rust-apps.scm (catppuccin-whiskers): New variable.
-* gnu/packages/rust-crates.scm (lookup-cargo-inputs)
-[catppuccin-whiskers]: New entry.
-@end example
-
-@item
-Updating a simple package:
-
-@example
-gnu: watchexec: Update to 2.3.2.
-
-* gnu/packages/rust-apps.scm (watchexec): Update to 2.3.2.
-* gnu/packages/rust-crates.scm (lookup-cargo-inputs)[watchexec]:
-Update entry.
-@end example
-
-@item
-Updating a package with sources:
-
-@example
-gnu: typst: Update to 0.14.0.
-
-* gnu/packages/rust-apps.scm (typst): Update to 0.14.0.
-[arguments]<#:rust>: Use rust-1.88.
-* gnu/packages/rust-crates.scm (lookup-cargo-inputs)[typst]: Update
-entry.
-[rust-syntect-5]: Rename to rust-syntect-5.2.
-[rust-syntect-5.3]: New entry.
-* gnu/packages/rust-sources.scm (rust-hypher-0.1): Update to 0.1.6.
-(rust-syntect-5): Rename to rust-syntect-5.2.
-[inputs]: Rename cargo-inputs rust-syntect-5 to rust-syntect-5.2.
-(rust-syntect-5.3): New variable.
-@end example
-
-@end itemize
-
-@subsubsection Resolving merge conflicts in Pull Requests
-
-For Rust crates, the recommended way to solve merge conflicts is to drop all
-changes to @code{gnu/packages/rust-crates.scm}, rebase onto the desired branch
-and run the lockfile importer again, manually adding back all relevant snippets
-(if any).
-
-@xref{Common Workflow for Resolving Merge Conflicts on Existing Pull Requests,,, guix-cookbook, GNU Guix Cookbook} for
-a suggested workflow on resolving merge conflicts.

@node Elm Packages
@subsection Elm Packages
@@ -2715,7 +2650,6 @@ applications settings page}, granting read/write access to the

@cindex decision making
@cindex consensus seeking
-Every contribution to the project involves a form of decision making.
 It is expected from all contributors, and even more so from committers,
 to help build consensus and make decisions based on consensus.  By using
 consensus, we are committed to finding solutions that everyone can live
@@ -2730,26 +2664,6 @@ resolve the deadlock.  To learn what consensus decision making means and
 understand its finer details, you are encouraged to read
@url{https://www.seedsforchange.org.uk/consensus}.

-Day-to-day decision making, for instance discussions about pull requests
-(@pxref{Reviewing the Work of Others}), happens informally among
-interested parties such as contributors and members of the relevant
-teams (@pxref{Teams}).
-
-@cindex GCD, Guix Consensus Documents
-@cindex Guix Consensus Documents (GCD)
-Decisions that are expected to have an impact on most contributors
-and/or on the broader user community---e.g., changes to project-wide
-policies, to core functionality, and so on---are made following the
-@acronym{GCD, Guix Consensus Document} process.  The process provides a
-framework to formalize proposals and draw attention to them, to leave
-time for interested parties to discuss them, and to collectively accept
-or withdraw them based on input from participating team members.  It is
-defined in
-@uref{https://consensus.guix.gnu.org/gcd/001-gcd-process.html,
-GCD@tie{}001}.  Past GCDs can be seen at
-@uref{https://consensus.guix.gnu.org}, and discussions take place at
-@uref{https://codeberg.org/guix/guix-consensus-documents}.
-
@node Commit Access
@section Commit Access

@@ -146,8 +146,6 @@ Packaging Rust Crates
 * Common Workflow for Rust Packaging::
 * Cargo Workspaces and Development Snapshots::
 * Using Rust Libraries in Other Build Systems::
-* Common Workflow for Updating Existing Rust Packages::
-* Common Workflow for Resolving Merge Conflicts on Existing Pull Requests::

 System Configuration

@@ -1649,8 +1647,6 @@ $ guix shell rust rust:cargo cargo-audit cargo-license
 * Common Workflow for Rust Packaging::
 * Cargo Workspaces and Development Snapshots::
 * Using Rust Libraries in Other Build Systems::
-* Common Workflow for Updating Existing Rust Packages::
-* Common Workflow for Resolving Merge Conflicts on Existing Pull Requests::
@end menu

@node Common Workflow for Rust Packaging
@@ -1709,15 +1705,6 @@ $ cargo audit
 $ cargo license
@end example

-@quotation Note
-Before running @command{cargo generate-lockfile}, make sure you have checked
-out the correct tag for the version you are packaging. This ensures that
-@code{Cargo.toml} matches the file used in the packages's @code{source} field.
-To make sure, you can obtain the exact source with @command{./pre-inst-env guix
-build --source <package>} and only then run @command{cargo generate-lockfile} on
-that source tree.
-@end quotation
-
@command{cargo generate-lockfile} updates dependencies to compatible versions.
 Applying it to all Rust applications helps reduce a great number of Rust
 libraries we need to check later.  Although sometimes libraries may fail to
@@ -2000,316 +1987,6 @@ method, one of the most popular choices for Traditional Chinese users.")
    (license license:lgpl2.1+)))
@end lisp

-@node Common Workflow for Updating Existing Rust Packages
-@subsubsection Common Workflow for Updating Existing Rust Packages
-
-For this example, we'll update @code{niri}. The package definition looks like
-this initially:
-
-@lisp
-(define-public niri
-  (package
-   (name "niri")
-   (version "25.08")
-   (source (origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/YaLTeR/niri")
-                   (commit (string-append "v" version))))
-             (file-name (git-file-name name version))
-             (sha256
-              (base32
-               "09nsxd211mly8r1ys2lq6ia4jxgb980h1axrbgw748r0knfbbj7n"))))
-   (build-system cargo-build-system)
-...
-@end lisp
-
-We start by running the usual @command{guix refresh -u niri}.
-
-The @command{-u} flag will update in place the version and hash for the
-@code{niri} package.
-
-The package definition will then look like this:
-
-@lisp
-(define-public niri
-  (package
-   (name "niri")
-   (version "25.11")
-   (source (origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/YaLTeR/niri")
-                   (commit (string-append "v" version))))
-             (file-name (git-file-name name version))
-             (sha256
-              (base32
-               "0752qm245wc2gak0jhp0fnr0rdj3z54m2h97k3cxbjym9pcn658n"))))
-   (build-system cargo-build-system)
-...
-@end lisp
-
-This means the source field was updated successfully, thus we can now proceed to
-get the updated source with @command{guix build --source niri} as follows:
-
-@example shell
-$ cp -r $(./pre-inst-env guix build --source niri) /tmp
-$ cd /tmp/<hash>-niri-25.11-checkout/
-@end example
-
-@quotation Note
-In this specific example, the source is a git checkout, thus a directory. If the
-package source is a compressed archive, you would at this point extract it to a
-directory to proceed.
-@end quotation
-
-Now, given that we have access to the @code{Cargo.toml} file, we can now run
-the following inside the checkout:
-
-@example shell
-$ guix shell rust rust:cargo -- cargo generate-lockfile
-$ guix shell rust rust:cargo -- cargo audit
-$ guix shell rust rust:cargo -- cargo license
-@end example
-
-@quotation Note
-Sometimes the package will require a more up-to-date version of rust, that is
-not yet the default rust on guix. For these cases you can use:
-@example shell
-$ guix shell -e "(@ (gnu packages rust) rust-1.90)" \
-     -e '`(,(@ (gnu packages rust) rust-1.90) "cargo")'
-@end example
-@end quotation
-
-The first command will ensure that all cargo dependencies are up to date
-and semver compatible, while also providing some other benefits, as further
-explained in @ref{Common Workflow for Rust Packaging}.
-
-The following command will warn if there are any known vulnerabilities in the
-crates being imported. The last one will output the license information of all
-the dependent crates.
-
-If everything looks good, we can now replace the contents of the @code{niri}
-indentifier, located inside the @code{lookup-cargo-inputs} variable on the
-bottom of the @file{gnu/packages/rust-crates.scm} module, with the newer updated
-crates by running the importer on the lockfile as follows:
-
-@example shell
-$ guix import -i /path/to/gnu/packages/rust-crates.scm \
-     crate -f Cargo.lock niri
-@end example
-
-@quotation Note
-For the purpose of contributing a package to Guix (@pxref{Contributing,,,
-guix, GNU Guix Reference Manual}), there is no need to cleanup the leftover
-crates as a result of the package update.  This is tasked to the rust-team
-(@pxref{Teams,,, guix, GNU Guix Reference Manual}) to periodically run a
-convenient script in @code{etc/teams/rust} to cleanup unused crates from
-@file{gnu/packages/rust-crates.scm}.
-@end quotation
-
-We then need to check whether the importer has placed some TODOs for us,
-inside @file{gnu/packages/rust-crates.scm} (you can use @command{git diff --
-gnu/packages/rust-crates.scm} for this purpose).
-
-There are a few types of TODO messages that you might encounter during this
-step, each type requiring you to perform a different action.
-
-The first one we encounter in our example is:
-
-@lisp
-(define rust-libdisplay-info-sys-0.3.0
-  ;; TODO REVIEW: Check bundled sources.
-  (crate-source "libdisplay-info-sys" "0.3.0"
-                "07xmkc2aqcdn6d58321y87rd3gzdr4nx3ncm1mmrr7w1p1ahsn96"))
-@end lisp
-
-This specific TODO message tells us that there is a high probability of
-encountering bundled sources within a crate definition generated by the
-importer.
-
-We then check if there are any bundled sources within the
-@code{rust-libdisplay-info-sys-0.3.0} crate. Since there are none (in our
-example), we can simply remove the TODO line, and continue to the next TODO.
-
-If there were any bundled sources inside the crate, we would have to patch
-it with a snippet, in order to unbundle it. You can see some examples on
-how to unbundle inside @file{gnu/packages/rust-crates.scm} (search for the
-@code{#:snippet} keyword).
-
-@quotation Note
-If the unbundle is considered too difficult to be executed (e.g. the effort
-needed to unbundle is unreasonable), the @code{TODO REVIEW} line should be
-converted to a regular TODO comment explicitly stating the unbundle was not done
-(e.g. @code{TODO: Unbundle rust-libdisplay-info-sys.}).
-@end quotation
-
-Continuing, another TODO message we encounter in this example is the following:
-
-@lisp
-(define rust-smithay-0.7.0.d743e1a
-  ;; TODO REVIEW: Define standalone package if this is a workspace.
-  (origin
-    (method git-fetch)
-    (uri (git-reference (url "https://github.com/Smithay/smithay.git")
-                        (commit "d743e1a317fa0f01d1c4cadd96d277a1ec7b59d9")))
-    (file-name (git-file-name "rust-smithay" "0.7.0.d743e1a"))
-    (sha256 (base32 "11327mhxxf844bs0v5bw1g9bzjssnzhidsissywy6kwng16x727v"))))
-@end lisp
-
-This specific TODO message tells us that there is a high probability of the
-@code{rust-smithay-0.7.0.d743e1a} crate being a workspace.
-
-After verifying that it is indeed a workspace, we now need to make it an
-actual package in @file{gnu/packages/rust-sources.scm}, referencing it in the
-crate-source definition (see @ref{Common Workflow for Rust Packaging} for more
-details).
-
-@quotation Note
-You can verify if a crate is a workspace by cloning the crate repository (in
-this case @code{https://github.com/Smithay/smithay.git}), checking out the
-specific revision (in this case @command{git checkout d743e1a}), and looking
-for @code{[workspace]} in its main @file{Cargo.toml} file. If it does not have a
-TOML @code{[workspace]} section, then it is not a workspace.
-@end quotation
-
-After defining the separate source package for the workspace in
-@file{gnu/packages/rust-sources.scm} (see @ref{Common Workflow for Rust
-Packaging} for more details on how to do this), the crate definition for
-@code{rust-smithay-0.7.0.d743e1a} would then become the following (notice we
-also remove the TODO line):
-
-@lisp
-(define rust-smithay-0.7.0.d743e1a package:rust-smithay-0.7.0.d743e1a)
-@end lisp
-
-If @code{rust-smithay-0.7.0.d743e1a} was not a workspace, we would simply remove
-the TODO line and move on.
-
-We then try to build the package with @command{guix build niri}, and make sure
-whether it builds successfully, which it does.
-
-As a good practice, we can further check the output of the
-@code{check-for-pregenerated-files} phase to ensure there are no extraneous
-pregenerated files inside the crates. If there are any, it is important to
-snippet them out, like these:
-
-@lisp
-(define rust-winapi-x86-64-pc-windows-gnu-0.4.0
-  (crate-source "winapi-x86_64-pc-windows-gnu" "0.4.0"
-                "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"
-                #:snippet '(delete-file-recursively "lib")))
-
-(define rust-flate2-1.1.4
-  (crate-source "flate2" "1.1.4"
-                "1a8a3pk2r2dxays4ikc47ygydhpd1dcxlgqdi3r9kiiq9rb4wnnw"
-                #:snippet '(for-each delete-file-recursively '("examples" "tests"))))
-
-(define rust-flo-curves-0.3.1
-  (crate-source "flo_curves" "0.3.1"
-                "16x293dp8825jh465kgms4yyvl4960j26gh37h3skflq9zxpy8hw"
-                #:snippet '(for-each delete-file '("logo-small.png" "logo.png"))))
-
-(define rust-interception-sys-0.1.3
-  (crate-source "interception-sys" "0.1.3"
-                "1lgwbml7gzq5a5rriy708w68gx6yiw9cdg7xy2c5vsrrck7pbs5b"
-                #:snippet '(for-each delete-file (find-files "." "\\.(dll|lib)$"))))
-@end lisp
-
-@node Common Workflow for Resolving Merge Conflicts on Existing Pull Requests
-@subsubsection Common Workflow for Resolving Merge Conflicts on Existing Pull Requests
-
-Whenever a Rust package change is merged into our target branch from a different
-Pull Request, we often encounter many merge conflicts in @code{(gnu packages
-rust-crates)} when rebasing the Pull Request on top of the target branch. Since
-we should avoid modifying the rust-crates file manually (e.g. using the git
-interface to solve merge conflicts), it is recommended (and often much faster)
-to drop all changes to @code{(gnu packages rust-crates)} and run the lockfile
-importer once again, manually adding back all the manual changes.
-
-This workflow describes one of many ways to do the described procedure.
-
-In this example we'll update the @code{codeberg-cli} package, which has produced
-some merge conflicts in @file{gnu/packages/rust-crates.scm} when we tried a git
-pull rebase.
-
-Before starting, make sure we're not in a rebase environment, by aborting the
-rebase we tried previously (the one which created the merge conflicts by git
-pulling):
-
-@example
-$ git rebase --abort
-@end example
-
-@cindex git rebase --interactive
-@cindex interactive rebase
-To begin, we interactively rebase our PR branch by marking as
-@code{edit} the commit we want to edit, which is the one containing the
-@file{gnu/packages/rust-crates.scm} changes:
-
-@example
-# Change 1 to the number of relevant commits
-$ git rebase -i HEAD~1
-@end example
-
-In our example, we would mark the @code{codeberg-cli} commit like so:
-
-@example
-edit 6ef4f1ad043 # gnu: codeberg-cli: Update to 0.5.4.
-@end example
-
-After that, we'll be in rebase mode, where we can restore the changes made to
-@file{gnu/packages/rust-crates.scm}:
-
-@quotation Note
-Notice that we will lose all manual changes we have previously made to
-@file{gnu/packages/rust-crates.scm} (e.g. snippets, deleting TODO comments,
-if there were any). We'll need to manually add them back after we run the guix
-lockfile importer once again, so make sure you have them saved somewhere, for
-example in your PR link under the @code{Files changed} tab.
-@end quotation
-
-@example
-$ git restore --source=HEAD~ gnu/packages/rust-crates.scm
-@end example
-
-Having restored the file, we can stage the changes, commit, finish the rebase
-and pull rebase from the target branch:
-
-@example
-$ git add gnu/packages/rust-crates.scm
-$ git commit --amend --no-edit
-$ git rebase --continue
-$ git pull <remote> <target branch>
-@end example
-
-We then proceed to run the guix lockfile importer:
-
-@quotation Note
-Remember to checkout the correct tag you're packaging in the package repository
-checkout. Don't forget to run @code{cargo generate-lockfile} before running
-the lockfile importer, see @ref{Common Workflow for Rust Packaging} for more
-detailed steps on what to do before running the guix lockfile importer.
-@end quotation
-
-@example
-$ guix import --insert=gnu/packages/rust-crates.scm \
-      crate --lockfile=/path/to/Cargo.lock codeberg-cli
-@end example
-
-Now is the time we manually add back the snippets and remove the relevant TODOs
-we have already checked (if there are any).
-
-After running the lockfile importer and checking if there are any changes to
-manually add back, we can finally:
-
-@example
-$ git add gnu/packages/rust-crates.scm
-# Our target commit is the last one:
-$ git commit --amend --no-edit
-@end example
-
-We now have a non-conflicting tree, from which we can now update our PR with.

@c *********************************************************************
@node System Configuration
@@ -2658,11 +2658,9 @@ bootloaders.

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

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

@end deftp

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

@@ -8843,12 +8795,12 @@ dependencies than the original package.  For example, the default
 optional dependency, you can define a variant that removes that
 dependency like so:

-@findex package/inherit
@lisp
 (use-modules (gnu packages gdb))   ;for 'gdb'

 (define gdb-sans-guile
-  (package/inherit gdb
+  (package
+    (inherit gdb)
    (inputs (modify-inputs inputs
              (delete "guile")))))
@end lisp
@@ -8856,23 +8808,6 @@ dependency like so:
 In the body of the @code{inputs} field above, @code{inputs} is bound to
 the inherited value.  Thus, the @code{modify-inputs} form above removes
 the @code{"guile"} package from the @code{inputs} field of @code{gdb}.
-
-@quotation Note
-The example above uses @code{(package/inherit gdb @dots{})} instead of
-the usual @code{(package (inherit gdb) @dots{})}.  While the latter
-would work, @code{package/inherit} does extra work: if @code{gdb} has a
-@code{replacement} field (@pxref{Security Updates}),
-@code{package/inherit} propagates the @code{inputs} changes of this
-variant to the replacement.
-
-In other words, @code{package/inherit} ensures the variant gets a
-consistent @code{replacement} when the original package has one.  Thus,
-one should generally use @code{package/inherit} when creating a variant
-for the same version, but not when targeting a different version, as in
-the @code{hello} example we saw earlier, where the replacement may be
-incorrect.
-@end quotation
-
 The @code{modify-inputs} macro is a helper that can prove useful anytime
 you want to remove, add, or replace package inputs.

@@ -15551,7 +15486,7 @@ gnu/packages/qt.scm:452:13: qtbase would be upgraded from 5.15.8 to 5.15.10
@end example

@cindex partial version specification, guix refresh
-A per-package equivalent to @option{--target-version} is made available by
+A per-package equivalent to --target-version is made available by
 prefixing the version specification with the @samp{~} (tilde) character.
 For example:

@@ -16112,7 +16047,7 @@ it unchanged.
@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
-with a version string, possibly prefixed by ``v'', change the
+with @code{version} or @code{(string-append ``v'' version)}, change the
 package origin to the @code{git-fetch} method
 (@pxref{origin Reference}).  Consider this example:

@@ -16141,16 +16076,14 @@ its @code{source} field like to:
    (inherit guile-json-3)
    (name "guile-json")
    (version "4.7.3")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/aconchillo/guile-json")
-               (commit version)))
-        (file-name (git-file-name name version))
-        (sha256
-          (base32
-            "0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference (url
+                                   "https://github.com/aconchillo/guile-json")
+                                  (commit version)))
+              (file-name (git-file-name name version))
+              (sha256 (base32
+                       "0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
@end lisp

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

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

@end defvar

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


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

@defvar accountsservice-service-type
@@ -27267,28 +27170,6 @@ Package object for GVfs.
@end table
@end deftp

-@defvar kmonad-service-type
-This is the type of the service that runs
-@uref{https://github.com/kmonad/kmonad, KMonad}.  Its value is a
-@code{kmonad-configuration} object.  This service allows spawning
-@command{kmonad} configurations to manage keyboards.
-
-@deftp {Data Type} kmonad-configuration
-Configuration record for the KMonad service.
-
-@table @asis
-@item @code{kmonad} (default: @code{kmonad})
-The KMonad package to use.
-
-@item @code{keymaps}
-A list of files with KMonad configurations. One shepherd service will be
-created to control each configuration. Each configuration should target
-a distinct input device as KMonad operates on a per-input basis.
-
-@end table
-@end deftp
-@end defvar
-
@defvar colord-service-type
 This is the type of the service that runs @command{colord}, a system
 service with a D-Bus
@@ -48513,10 +48394,9 @@ A string denoting the name service (@pxref{Services in the NSS
 configuration,,, libc, The GNU C Library Reference Manual}).

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

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

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

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

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

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

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

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

@end deftp
@@ -16,7 +16,6 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@"
 ;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2025-2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2025 jgart <jgart@dismail.de>
-;;; Copyright © 2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -566,7 +565,6 @@ challenges"))
              "guix/docker.scm"
              "guix/download.scm"
              "guix/elf.scm"
-              "guix/fossil-download.scm"
              "guix/ftp-client.scm"
              "guix/gexp.scm"
              "guix/git-authenticate.scm"
@@ -691,7 +689,6 @@ ecosystem."
  (team 'embedded
        #:name "Embedded"
        #:scope (list "gnu/packages/bootloaders.scm"
-                      "gnu/packages/coreboot.scm"
                      "gnu/packages/firmware.scm")))

 (define-team games
@@ -789,8 +786,7 @@ the haskell-build-system."
  (team 'hpc
        #:name "High-performance computing team"
        #:description "High-performance computing (HPC) related packages."
-        #:scope (list "gnu/packages/fabric-management.scm"
-                      "gnu/packages/mpi.scm"
+        #:scope (list "gnu/packages/mpi.scm"
                      "gnu/packages/oneapi.scm"
                      "gnu/packages/opencl.scm"
                      "gnu/packages/parallel.scm"
@@ -945,7 +941,6 @@ importer, and the ocaml-build-system."
        #:scope
        (list "gnu/packages/ocaml.scm"
              "gnu/packages/coq.scm"
-              "gnu/packages/rocq.scm"
              "guix/build/ocaml-build-system.scm"
              "guix/build/dune-build-system.scm"
              "guix/build-system/ocaml.scm"
@@ -1218,7 +1213,6 @@ the \"texlive\" importer."
                      "gnu/tests/version-control.scm"
                      "guix/build/bzr.scm"
                      "guix/build/cvs.scm"
-                      "guix/build/fossil.scm"
                      "guix/build/git.scm"
                      "guix/build/hg.scm"
                      "guix/build/svn.scm")))
@@ -1249,11 +1243,6 @@ the \"texlive\" importer."
                       "jonsger")
  mozilla)

-(define-member (person "Denis Carikli"
-                       "GNUtoo@cyberdimension.org"
-                       "GNUtoo")
-  embedded)
-
 (define-member (person "Ludovic Courtès"
                       "ludo@gnu.org"
                       "civodul")
@@ -1,44 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-;; This manifest lists all MPI-related packages: useful for 'guix refresh',
-;; 'guix build', etc.
-
-(use-modules (guix)
-             (gnu packages fabric-management)
-             (gnu packages linux)
-             (gnu packages mpi)
-             (gnu packages parallel))
-
-;; The packages below are what constitutes the MPI stack: helper libraries,
-;; interconnect drivers, and MPI implementations.
-(packages->manifest
- (list cassini-headers
-       cxi-driver
-       hwloc
-       libcxi
-       libfabric
-       mpich
-       openmpi-5
-       openpmix
-       opensm
-       prrte
-       psm
-       psm2
-       rdma-core
-       ucx))
@@ -1,6 +1,6 @@
 #!/usr/bin/env -S gawk -f
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2025, 2026 Efraim Flashner <efraim@flashner.co.il>
+# Copyright © 2025 Efraim Flashner <efraim@flashner.co.il>
 #
 # This file is part of GNU Guix.
 #
@@ -21,22 +21,20 @@
 # ./etc/teams/rust/audit-rust-crates ./path/to/file.scm
 # Prints the output of cargo-audit to the shell.

+# Make sure we have cargo-audit in our PATH
 BEGIN {
-    "which cargo-audit" | getline cargoAudit
-    close("which cargo-audit")
-    cargoAudit = cargoAudit " audit --file -"
-
+    if (system("which cargo-audit 1> /dev/null"))
+        exit 1;
    # Parse a record at a time.
    RS = "\n\n"
+    cargoAudit = "cargo-audit audit --file -"
 }

-# Check the crate-source origin-only inputs, like in rust-crates.scm
+# Check the crate-source origin-only inputs
 /crate-source/ {
    for(i=3; i <= NF-2; i++) {
        if($i == "(crate-source") {
-            crateName = $(i+1)
-            crateVersion = $(i+2)
-            cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\n"
+            cargoLock = cargoLock "[[package]]\nname = " $(i+1) "\nversion = " $(i+2) "\n"
            next
        }
    }
@@ -46,64 +44,27 @@ BEGIN {
 /crate-uri/ {
    for(i=3; i <= NF; i++) {
        if($i == "(version")
-            crateVersion = $(i+1)
+           crateVersion = $(i+1)
        if($i == "(crate-uri")
-            crateName = $(i+1)
+           crateName = $(i+1)
    }
    gsub(/)/, "", crateVersion)
    cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\n"
-    next
 }

-# Parse the crates created from packages using 'cargo package'
-/package:rust/ {
-    pkg = $2
-    split(pkg, name_version, "-")
-    crateVersion = name_version[length(name_version)]
-    crateName = substr(pkg, 6, (length(pkg) - length(crateVersion) - 6))
-    split(crateVersion, versionDots, ".")
-    if(crateVersion && (crateVersion != "(git-version") && (length(versionDots) == 3) && crateName) {
-        cargoLock = cargoLock "[[package]]\nname = \"" crateName "\"\nversion = \"" crateVersion "\"\n"
-    } else {
-        untested++
-        #print("Unable to test " $0)
-    }
-    next
-}
+# The xxxx-cargo-input variables have a set style
+# TODO: Replace the last dash between the name and the version with a space!
+# This doesn't take into account swapping between "-" and "_" so we skip it.
+#( $2 ~ /-cargo-inputs/ ) {
+#    sub(/-cargo-inputs/, "", $2)
+#    gsub(/)/, "", $0)
+#    gsub(/rust-/, "", $0)
+#    #gensub(/([[:alpha:]])-([[:digit:]]+)/, "\\1 \\2", "g", $i)
+#    print "[[package]]\nname = \"" $2 "\"\nversion = \"1.0.0\"\ndependencies = ["
+#    for (i = 4; i <= NF; i++) {
+#        print "\"" $i "\","
+#    }
+#    print "]"
+#}

-# We make an attempt to create the crate name from the package name otherwise
-/git-reference/ {
-    for(i=3; i <= NF; i++) {
-        if($i == "(version")
-            crateVersion = $(i+1)
-        if($i == "(name")
-            crateName = $(i+1)
-        if($i == "(git-file-name") {
-            crateName = $(i+1)
-            crateVersion = $(i+2)
-        }
-    }
-    gsub(/)/, "", crateVersion)
-    gsub(/)/, "", crateName)
-    sub(/rust-/, "", crateName)
-    # The crate version MUST be major.minor.patch
-    split(crateVersion, versionParts, ".")
-    if(crateVersion && (crateVersion != "(git-version") && (length(versionParts) == 3) && crateName) {
-        cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\n"
-    } else {
-        untested++
-        #print("Unable to test " $0)
-    }
-    next
-}
-
-# Note those which we were unable to parse
-/define rust/ {
-    if($3 == "#f)")
-        next
-    print("Unable to parse " $0)
-    }
-
-{ untested++ }
-
-END { print("Number of crates untested: " untested); print cargoLock | cargoAudit }
+END { print cargoLock | cargoAudit }
@@ -26,6 +26,7 @@

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

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

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

 (define (home-niri-shepherd-service config)
  "Return a shepherd service that runs Niri, a scrollable tiling Wayland
-compositor.  The service starts Niri with appropriate environment variables
-set for a Wayland desktop session."
+compositor.  The service starts Niri in a DBus session with appropriate
+environment variables set for a Wayland desktop session."
  (list (shepherd-service
          (documentation "Run Niri scrollable tiling Wayland compositor.")
          (provision '(niri))
-          (requirement '(dbus))
          (start #~(make-forkexec-constructor
                    (list #$(file-append bash "/bin/bash") "-l"
-                          "-c" "exec niri --session")
+                          "-c" "exec dbus-run-session niri --session")
                    #:environment-variables
                    (append (list #$@(niri-configuration-environment-variables config))
                            '("DESKTOP_SESSION=niri"
@@ -68,8 +66,6 @@ set for a Wayland desktop session."
   (extensions
    (list (service-extension home-shepherd-service-type
                             home-niri-shepherd-service)
-          (service-extension home-dbus-service-type
-                             (const '()))
          (service-extension home-profile-service-type
                             (lambda (config)
                               (list dbus
@@ -56,7 +56,6 @@
 # Copyright © 2022 Alex Griffin <a@ajgrf.com>
 # Copyright © 2022 ( <paren@disroot.org>
 # Copyright © 2022, 2026 jgart <jgart@dismail.de>
-# Copyright © 2022-2023, 2025-2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 # Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
 # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
 # Copyright © 2023 Andy Tai <atai@atai.org>
@@ -217,7 +216,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/convmv.scm			\
  %D%/packages/codex.scm				\
  %D%/packages/coq.scm				\
-  %D%/packages/coreboot.scm			\
  %D%/packages/cpio.scm				\
  %D%/packages/cpp.scm 				\
  %D%/packages/cppi.scm				\
@@ -425,7 +423,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/kde-utils.scm			\
  %D%/packages/kerberos.scm			\
  %D%/packages/kodi.scm				\
-  %D%/packages/kubernetes.scm	        	\
  %D%/packages/language.scm			\
  %D%/packages/lc0.scm			\
  %D%/packages/lean.scm				\
@@ -610,7 +607,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/rocm-apps.scm			\
  %D%/packages/rocm-libs.scm			\
  %D%/packages/rocm-tools.scm			\
-  %D%/packages/rocq.scm				\
  %D%/packages/rpc.scm				\
  %D%/packages/rpm.scm				\
  %D%/packages/rrdtool.scm			\
@@ -741,8 +737,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/services/cgit.scm			\
  %D%/services/ci.scm				\
  %D%/services/configuration.scm		\
-  %D%/services/configuration/environment-variables.scm		\
-  %D%/services/configuration/utils.scm		\
  %D%/services/containers.scm   		\
  %D%/services/cuirass.scm			\
  %D%/services/cups.scm				\
@@ -1040,7 +1034,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/azr3.patch				\
  %D%/packages/patches/azr3-remove-lash.patch			\
  %D%/packages/patches/barony-fix-textures.patch		\
-  %D%/packages/patches/bam-python3-compat.patch		\
  %D%/packages/patches/bash-completion-directories.patch	\
  %D%/packages/patches/bash-linux-pgrp-pipe.patch		\
  %D%/packages/patches/basis-universal-unbundle-libs.patch	\
@@ -1131,10 +1124,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/clucene-gcc-14.patch			\
  %D%/packages/patches/clucene-pkgconfig.patch			\
  %D%/packages/patches/coda-use-system-libs.patch		\
-  %D%/packages/patches/codex-acp-0.11.1-disable-code-mode.patch \
-  %D%/packages/patches/codex-acp-0.11.1-remove-patch-sections.patch \
+  %D%/packages/patches/codex-acp-0.9.2-remove-patch-sections.patch \
+  %D%/packages/patches/codex-acp-0.9.2-replace-result-flatten.patch    \
  %D%/packages/patches/codex-0.98.0-remove-patch-sections.patch    \
-  %D%/packages/patches/rust-codex-0.117.0-remove-patch-sections.patch    \
  %D%/packages/patches/cogl-fix-double-free.patch		\
  %D%/packages/patches/collada-dom-boost.patch			\
  %D%/packages/patches/collectd-5.11.0-noinstallvar.patch	\
@@ -1177,7 +1169,6 @@ 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	\
@@ -1468,6 +1459,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/ghostscript-no-header-creationdate.patch \
  %D%/packages/patches/gimp-fix-metadata-editor.patch		\
  %D%/packages/patches/gimp-fix-tiff-load.patch			\
+  %D%/packages/patches/git-clar-path-max.patch			\
  %D%/packages/patches/git-filter-repo-generate-doc.patch	\
  %D%/packages/patches/gklib-suitesparse.patch			\
  %D%/packages/patches/glib-appinfo-watch.patch			\
@@ -1617,6 +1609,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/hurd-refcounts-assert.patch		\
  %D%/packages/patches/hurd-rumpdisk-no-hd.patch		\
  %D%/packages/patches/hurd-startup.patch			\
+  %D%/packages/patches/hwloc-1-test-btrfs.patch			\
  %D%/packages/patches/hwloc-add-with-opencl.patch		\
  %D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch	\
  %D%/packages/patches/i7z-gcc-10.patch				\
@@ -1652,12 +1645,12 @@ dist_patch_DATA =						\
  %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
  %D%/packages/patches/id3lib-UTF16-writing-bug.patch			\
  %D%/packages/patches/ilmbase-fix-tests.patch			\
-  %D%/packages/patches/inetutils-drop-test.patch                \
  %D%/packages/patches/inferno-fix-crash.patch		\
  %D%/packages/patches/iniparser-remove-fetchcontent-usage.patch		\
  %D%/packages/patches/inkscape-libxml2.patch		\
  %D%/packages/patches/instead-use-games-path.patch		\
  %D%/packages/patches/intltool-perl-compatibility.patch	\
+  %D%/packages/patches/inetutils-hurd64.patch			\
  %D%/packages/patches/insight-toolkit-fix-build.patch			\
  %D%/packages/patches/irrlicht-use-system-libs.patch		\
  %D%/packages/patches/irrlicht-link-against-needed-libs.patch	\
@@ -1689,6 +1682,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/jfsutils-gcc-compat.patch		\
  %D%/packages/patches/jfsutils-include-systypes.patch		\
  %D%/packages/patches/john-the-ripper-jumbo-with-gcc-11.patch	\
+  %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch		\
  %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch		\
  %D%/packages/patches/jsonnet-include-cstdint-for-gcc-13-builds.patch	\
  %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch	\
@@ -1713,7 +1707,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
  %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch        \
  %D%/packages/patches/libretranslate-use-flasgger.patch	\
-  %D%/packages/patches/librewolf-150.0-encoding_rs-rust-fix.patch       \
  %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch       \
  %D%/packages/patches/librewolf-compare-paths.patch		\
  %D%/packages/patches/librewolf-neuter-locale-download.patch	\
@@ -1746,7 +1739,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/kissfft-tflite-micro.patch               \
  %D%/packages/patches/kitty-fix-wayland-protocols.patch	\
  %D%/packages/patches/kmod-module-directory.patch		\
-  %D%/packages/patches/kmscon-8-runtime-keymap-switch.patch	\
+  %D%/packages/patches/kmscon-runtime-keymap-switch.patch	\
  %D%/packages/patches/knot-remove-runtime-deps.patch		\
  %D%/packages/patches/kobodeluxe-paths.patch			\
  %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
@@ -1761,7 +1754,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
  %D%/packages/patches/laby-make-install.patch			\
  %D%/packages/patches/laby-use-tmpdir-from-runtime.patch	\
-  %D%/packages/patches/ldc-i686-int128-alignment.patch 		\
  %D%/packages/patches/ldns-drill-examples.patch		\
  %D%/packages/patches/leela-zero-gtest.patch			\
  %D%/packages/patches/less-hurd-path-max.patch			\
@@ -1815,6 +1807,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch	\
  %D%/packages/patches/libquicktime-ffmpeg.patch 		\
  %D%/packages/patches/libsepol-versioned-docbook.patch		\
+  %D%/packages/patches/libskk-fix-invalid-escape.patch		\
  %D%/packages/patches/libsoup-auth-digest-fix-crash.patch      \
  %D%/packages/patches/libsoup-deadlock-in-add_listener_in_thread.patch \
  %D%/packages/patches/libsoup-fix-merge-of-ranges.patch        \
@@ -1985,7 +1978,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch	\
  %D%/packages/patches/nix-dont-build-html-doc.diff		\
  %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch	\
-  %D%/packages/patches/neovim-tree-sitter-grammar-path.patch	\
  %D%/packages/patches/network-manager-plugin-ownership.patch	\
  %D%/packages/patches/network-manager-plugin-path.patch	\
  %D%/packages/patches/newlib-getentropy.patch			\
@@ -2116,7 +2108,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-random2-getrandbits-test.patch		\
  %D%/packages/patches/python-pillow-use-zlib-1.3.patch	\
  %D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch	\
-  %D%/packages/patches/python-pynvim-fix-test-command-error.patch	\
  %D%/packages/patches/python-pypytools-python-3-fixes.patch	\
  %D%/packages/patches/python-pyreadstat-link-libiconv.patch	\
  %D%/packages/patches/python-sip-include-dirs.patch	\
@@ -2259,7 +2250,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-werkzeug-tests.patch		\
  %D%/packages/patches/qdigidoc-bundle-config-files.patch       \
  %D%/packages/patches/qdigidoc-bundle-tsl-files.patch          \
-  %D%/packages/patches/qdigidoc-fix-icon.patch                  \
  %D%/packages/patches/qemu-build-info-manual.patch		\
  %D%/packages/patches/qemu-fix-agent-paths.patch 		\
  %D%/packages/patches/qemu-fix-test-virtio-version.patch       \
@@ -2344,6 +2334,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/rapidcheck-fix-libs.patch		\
  %D%/packages/patches/ratpoison-shell.patch			\
  %D%/packages/patches/retroarch-unbundle-spirv-cross.patch	\
+  %D%/packages/patches/rct-add-missing-headers.patch		\
  %D%/packages/patches/readline-link-ncurses.patch		\
  %D%/packages/patches/renpy-python-3.11-compat.patch			\
  %D%/packages/patches/renpy-fix-integer-slots.patch			\
@@ -2353,6 +2344,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/r-sapa-lapack.patch			\
  %D%/packages/patches/ripperx-missing-file.patch		\
  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
+  %D%/packages/patches/rtags-separate-rct.patch			\
  %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch	\
  %D%/packages/patches/racket-chez-scheme-bin-sh.patch		\
  %D%/packages/patches/racket-launcher-config-dir.patch		\
@@ -2385,21 +2377,16 @@ dist_patch_DATA =						\
  %D%/packages/patches/ruby-flores-fix-deprecations.patch	\
  %D%/packages/patches/ruby-latex-decode-fix-test.patch		\
  %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
+  %D%/packages/patches/ruby-pg-fix-connect-timeout.patch	\
  %D%/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch \
  %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch	\
  %D%/packages/patches/rust-1.70-fix-rustix-build.patch	\
  %D%/packages/patches/rust-1.78-unwinding-fix.patch		\
  %D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch	\
-  %D%/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch	\
  %D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-timeout.patch	\
  %D%/packages/patches/rust-codex-0.98.0-windows-sandbox-protocol-version.patch	\
-  %D%/packages/patches/rust-codex-0.117.0-core-remove-self-dep.patch	\
-  %D%/packages/patches/rust-codex-0.120.0-core-remove-self-dep.patch	\
-  %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-ring-0.17-ring-core.patch		\
  %D%/packages/patches/rw-igraph-0.10.patch			\
  %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch	\
@@ -2530,11 +2517,10 @@ dist_patch_DATA =						\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
  %D%/packages/patches/unity-test-set-subdir-correctly.patch		\
  %D%/packages/patches/unity-test-support-int64.patch		\
-  %D%/packages/patches/ungoogled-chromium-custom-compiler.patch 	\
-  %D%/packages/patches/ungoogled-chromium-empty-parsed-rustc-args.patch	\
  %D%/packages/patches/ungoogled-chromium-extension-search-path.patch	\
  %D%/packages/patches/ungoogled-chromium-RUNPATH.patch		\
  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\
+  %D%/packages/patches/ungoogled-chromium-unbundle-icu-target.patch     \
  %D%/packages/patches/unknown-horizons-python-3.8-distro.patch	\
  %D%/packages/patches/unknown-horizons-python-3.9.patch	\
  %D%/packages/patches/unknown-horizons-python-3.10.patch	\
@@ -2635,17 +2621,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/yggdrasil-extra-config.patch	\
  %D%/packages/patches/ypsilon-Use-GNU-toolchain-as-default.patch	\
  %D%/packages/patches/zabbix-agent2-test-timezone-fix.patch	\
-  %D%/packages/patches/zed-0.225.10-add-message-notification-action.patch \
-  %D%/packages/patches/zed-0.225.10-add-guix-container-support.patch	\
-  %D%/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch	\
-  %D%/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch		\
-  %D%/packages/patches/zed-0.225.10-disable-dlopen.patch	\
-  %D%/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch	\
-  %D%/packages/patches/zed-0.225.10-fix-test-db-isolation.patch	\
-  %D%/packages/patches/zed-0.225.10-fix-workspace-race.patch	\
-  %D%/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch	\
-  %D%/packages/patches/zed-0.225.10-remove-patch-crates-io.patch	\
-  %D%/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch	\
  %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch	\
  %D%/packages/patches/zig-0.9-fix-runpath.patch		\
  %D%/packages/patches/zig-0.9-riscv-support.patch		\
@@ -1158,7 +1158,7 @@ on memory usage on GNU/Linux systems.")
 (define-public htop
  (package
    (name "htop")
-    (version "3.5.0")
+    (version "3.4.1")
    (source
     (origin
       (method git-fetch)
@@ -1166,7 +1166,7 @@ on memory usage on GNU/Linux systems.")
             (url "https://github.com/htop-dev/htop")
             (commit version)))
       (sha256
-        (base32 "1r07ri0dl9xz0jn1hc2g8q3l0q4clvnxs05yagpzsz0zigp4flj5"))
+        (base32 "058y4a4mvx9m179dyr4wi8mlm6i4ybywshadaj4cvfn9fv0r0nkx"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -1302,15 +1302,14 @@ re-executing them as necessary.")
 (define-public inetutils
  (package
    (name "inetutils")
-    (version "2.7")
+    (version "2.5")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/inetutils/inetutils-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1"))
-              (patches (search-patches "inetutils-drop-test.patch"))))
+                "0q1257ci22g2jbdiqs00mharc1lqkbibdlkhj23f3si6qjxkn17s"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1341,7 +1340,17 @@ re-executing them as necessary.")
                             "\\\""))
      ;; On some systems, 'libls.sh' may fail with an error such as:
      ;; "Failed to tell switch -a apart from -A".
-      #:parallel-tests? #f))
+      #:parallel-tests? #f
+      #:phases (if (target-hurd64?)
+                   #~(modify-phases %standard-phases
+                       (add-after 'unpack 'apply-hurd64-patch
+                         (lambda _
+                           (let ((patch
+                                  #$(local-file
+                                     (search-patch
+                                      "inetutils-hurd64.patch"))))
+                             (invoke "patch" "--force" "-p1" "-i" patch)))))
+                   #~%standard-phases)))
    (inputs
     (list coreutils
           shadow                     ;for login (used in telnetd and rlogind)
@@ -1364,7 +1373,7 @@ hostname.")
 (define-public shadow
  (package
    (name "shadow")
-    (version "4.19.0")
+    (version "4.13")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1372,7 +1381,7 @@ hostname.")
                    "download/" version "/shadow-" version ".tar.xz"))
              (sha256
               (base32
-                "0crbcfdp7ayyii33srinwd0yr27dkx9mbzglx1d0mvhr1z28xclw"))))
+                "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))
    (build-system gnu-build-system)
    (arguments
     `(;; Assume System V `setpgrp (void)', which is the default on GNU
@@ -1381,9 +1390,7 @@ hostname.")
       '(,@(if (target-hurd?)
             '()
             '("--with-libpam"))
-         "--disable-logind" ;; no systemd
-         "--without-libbsd" ;; no libbsd
-         "shadow_cv_logdir=/var/log"
+          "shadow_cv_logdir=/var/log"
          "ac_cv_func_setpgrp_void=yes")
       #:phases
       (modify-phases %standard-phases
@@ -1419,8 +1426,15 @@ hostname.")
             ;; The top-level Makefile.am wrongfully has "SUBDIRS += man"
             ;; under "if ENABLE_REGENERATE_MAN", even though prebuilt man
             ;; pages are available.  Thus, install them manually.
-             (invoke "make" "-C" "man" "install"))))))
-    (native-inputs (list pkg-config))
+             (invoke "make" "-C" "man" "install")))
+         (add-after 'install-man-pages 'remove-groups
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Remove `groups', which is already provided by Coreutils.
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (man (string-append out "/share/man")))
+               (delete-file (string-append bin "/groups"))
+               (for-each delete-file (find-files man "^groups\\."))))))))
    (inputs
     (append (if (target-hurd?)
                 '()
@@ -3142,7 +3156,7 @@ track changes in important system configuration files.")
 (define-public libcap-ng
  (package
    (name "libcap-ng")
-    (version "0.9.3")
+    (version "0.9")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3151,20 +3165,12 @@ track changes in important system configuration files.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "13iy7dddcslpmmdhybgvfcgznsvpaa4r3fp9ldlpkq592lw8yyva"))))
+                "0izrrh2kmhi6dcy5iqcccmx90nwlaqcglhc60sl8n5ds8il14pi8"))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      #:configure-flags
-      #~(list "--disable-static"
-              "--without-python")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-configure-ac
-            (lambda _
-              (substitute* "configure.ac"
-                (("linux/sock_diag.h" all)
-                 (string-append all " \\"))))))))
+     `(#:configure-flags
+       (list "--disable-static"
+             "--without-python")))
    (inputs
     (list libbpf))
    (native-inputs
@@ -3442,7 +3448,7 @@ modules and plugins that extend Ansible.")
     (list ansible
           bash-minimal
           encfs
-           fuse
+           fuse-2
           util-linux ;; for umount
           findutils
           git
@@ -7170,35 +7176,6 @@ stored in an SQL database.")
 (connects via USB OTG).")
    (license license:expat)))

-(define-public yoctofetch
-  (package
-    (name "yoctofetch")
-    (version "2.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/Phosphenius/yoctofetch.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0smkaydv74p2231gafibvqbwsy469w56hya8gz8wq0gw7m2l7zh3"))))
-    ; Support for other platforms not available per upstream:
-    ; https://codeberg.org/Phosphenius/yoctofetch#supported-platforms
-    (supported-systems '("x86_64-linux" "aarch64-linux"))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f)) ; No tests available.
-    (home-page "https://codeberg.org/Phosphenius/yoctofetch")
-    (synopsis "Fast and low footprint system fetch tool for the Linux UAPI")
-    (description
-     "This package provides a system fetch tool, similar to
-@command{neofetch}, @command{fastfetch}, etc.  It is lightweight and
-has a focus on performance.  It can be used as a greeter by starting
-it from @file{~/.bashrc} for example.")
-    (license license:agpl3+)))
-
 (define-public zzz
  (package
    (name "zzz")
@@ -1,4 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -17,20 +22,162 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-(define-public rtcqs
-  (package
-    (name "rtcqs")
-    (version "0.6.7")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/rtcqs/rtcqs")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1kc3niyaq4m8di68832pgfb1b0m54q5gm68dwlzwwilgxi61ifzc"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f ;no test suite
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-gui
-            (lambda _
-              (substitute* "pyproject.toml"
-                (("\"FreeSimpleGUI\",?")
-                 "")
-                (("rtcqs_gui = \"rtcqs\\.rtcqs_gui:main\"")
-                 ""))
-              (delete-file "src/rtcqs/rtcqs_gui.py")
-              (delete-file "src/rtcqs/rtcqs_qt_gui.py"))))))
-    (native-inputs (list python-setuptools))
-    (home-page "https://codeberg.org/rtcqs/rtcqs")
-    (synopsis "Linux audio real-time performance analyzer")
-    (description
-     "rtcqs analyzes a Linux system to detect possible bottlenecks that could
-have a negative impact on real-time audio performance.  It checks kernel
-configuration, IRQ priorities, CPU governor, swappiness, and other settings
-relevant to low-latency audio work.")
-    (license license:expat)))
-
 (define-public rtosc
  (package
    (name "rtosc")
@@ -6529,23 +6490,22 @@ on the ALSA software PCM plugin.")
 (define-public snd
  (package
    (name "snd")
-    (version "26.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://ccrma.stanford.edu/software/snd/snd-"
-                           version ".tar.gz"))
-       (sha256
-        (base32
-         "1d573mjlrn9rhl9g0a3d1rkar34q60ln8mwlbibfalpn8lsz59a0"))))
+    (version "25.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/"
+                                  "snd-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0fgxqk0byxdj6059mb9d5qic2dqjabz49j0szsrn2y3c9nz6iyq4"))))
    (build-system gnu-build-system)
    (arguments
     (list
-      #:tests? #f                       ; No tests.
-      #:out-of-source? #f               ; Required by 'install-doc'.
+      #:tests? #f                       ; no tests
+      #:out-of-source? #f               ; for the 'install-doc' phase
      #:configure-flags
-      #~(let
-            ((docdir (string-append #$output "/share/doc/snd-" #$version)))
+      #~(let ((docdir (string-append #$output "/share/doc/"
+                                     #$name "-" #$version)))
          (list "--with-alsa"
                "--with-jack"
                "--with-gmp"
@@ -6553,20 +6513,18 @@ on the ALSA software PCM plugin.")
                (string-append "--with-doc-dir=" docdir)))
      #:phases
      #~(modify-phases %standard-phases
-          (add-after 'install 'install-s7-h
+          (add-after 'install 'install-s7
            (lambda _
-              (install-file "s7.h" (string-append #$output
-                                                  "/include"))))
+              (install-file "s7.h" (string-append #$output "/include"))))
          (add-after 'install 'install-doc
            (lambda _
-              (let
-                  ((docdir (string-append #$output "/share/doc/snd-"
-                                          #$version)))
+              (let ((doc (string-append #$output "/share/doc/"
+                                        #$name "-" #$version)))
                (for-each
                 (lambda (f)
-                   (install-file f docdir))
+                   (install-file f doc))
                 (find-files "." "\\.html$"))
-                (copy-recursively "pix" (string-append docdir "/pix"))))))))
+                (copy-recursively "pix" (string-append doc "/pix"))))))))
    (native-inputs
     (list pkg-config))
    (inputs
@@ -6585,16 +6543,13 @@ on the ALSA software PCM plugin.")
           timidity++
           vorbis-tools
           wavpack))
-    (home-page "https://ccrma.stanford.edu/software/snd/snd/snd.html")
    (synopsis "Sound editor")
+    (home-page "https://ccrma.stanford.edu/software/snd/")
    (description
     "Snd is a sound editor modelled loosely after Emacs.  It can be
 customized and extended using either the s7 Scheme implementation (included in
 the Snd sources), Ruby, or Forth.")
-    (license
-     ;; INFO: pkgsrc classifies this as `esdl-license', a license not included
-     ;; in OSI or FSF lists, despite being similar to ISC.
-     (license:non-copyleft "file://COPYING"))))
+    (license (license:non-copyleft "file://COPYING"))))

 (define-public libspecbleach
  (package
@@ -8088,7 +8043,6 @@ Home Page}.")
             (commit version)
             ;; For test files.
             (recursive? #true)))
-       (file-name (git-file-name name version))
       (sha256
        (base32 "065x43hx670rjrclxi4hiqxscllb16v9s7myjvg7rd5pd3y0k7sg"))))
    (build-system pyproject-build-system)
@@ -8219,7 +8173,7 @@ and DSD streams.")
 (define-public qpwgraph
  (package
    (name "qpwgraph")
-    (version "1.0.0")
+    (version "0.9.9")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -8228,7 +8182,7 @@ and DSD streams.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0l3fflfpwkqy4iif8ifzzr3yy39ahzqdixx5g3rhj3zzbaysj73h"))))
+                "03001pvcbvr206k00751232gm50x1icf086z8c5hiakl2ym79gwl"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f))                ; no tests
@@ -547,7 +547,7 @@ remain fully idle, saving power and producing less noise.")
         "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"))))
    (build-system gnu-build-system)
    (inputs
-     (list librsync))
+     (list librsync-0.9))
    (arguments
     `(#:make-flags `("CFLAGS=-fcommon"
                      ,(string-append "PREFIX=" (assoc-ref %outputs "out"))
@@ -37,8 +37,6 @@
  #:use-module (gnu packages elf)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages readline)
-  #:use-module (gnu packages ruby-check)
-  #:use-module (gnu packages ruby-xyz)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages libffi)
@@ -55,7 +53,6 @@
  #:use-module (guix store)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system ruby)
  #:use-module (guix build-system trivial)
  #:autoload   (guix gnupg) (gnupg-verify*)
  #:autoload   (guix base32) (bytevector->nix-base32-string)
@@ -516,46 +513,6 @@ function interface (FFI) directly in your shell.  In other words, it allows
 you to call routines in shared libraries from within Bash.")
    (license license:expat)))

-(define-public bashly
-  (package
-    (name "bashly")
-    (version "1.3.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (rubygems-uri "bashly" version))
-       (sha256
-        (base32 "17msjzca5ifx8biimdjps655w51yc82d5ys9hwn749bi2f3n8mcz"))))
-    (build-system ruby-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "rspec" "-c" "spec")))))))
-    (native-inputs (list ruby-rspec))
-    (propagated-inputs (list ruby-colsole
-                             ruby-completely
-                             ruby-filewatcher
-                             ruby-gtx
-                             ruby-logger
-                             ruby-lp
-                             ruby-mister-bin
-                             ruby-ostruct
-                             ruby-requires
-                             ruby-tty-markdown))
-    (synopsis
-     "Create feature-rich Bash scrips using simple YAML configuration")
-    (description
-     "Bashly is a CLI for generating feature-rich Bash command line
-tools.  Bashly lets you focus on your specific code, without worrying about
-command line argument parsing, usage texts, error messages and other functions
-that are usually handled by a framework in other programming languages.")
-    (home-page "https://bashly.dev/")
-    (license license:expat)))
-
 (define-public blesh
  (package
    (name "blesh")
@@ -944,20 +944,7 @@ configurable through a set of options.")
      #~(list (string-append
               "CC=" #$(this-package-input "openmpi") "/bin/mpicc")
              (string-append
-               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; OSU installs its binaries to /libexec. Have a symlink in /bin to
-          ;; improve user experience.
-          (add-after 'install 'symlink-binaries-in-bin
-            (lambda _
-              (mkdir-p (string-append #$output "/bin"))
-              (for-each (lambda (file)
-                          (symlink file
-                                   (string-append #$output "/bin/"
-                                                  (basename file))))
-                        (find-files (string-append #$output
-                                                   "/libexec"))))))))
+               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))))
    (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
    (synopsis "Benchmarking suite from the MVAPICH project")
    (description
@@ -4897,29 +4897,26 @@ relying on a complex dependency tree.")
 (define-public biosoup
  (package
    (name "biosoup")
-    (version "0.11.0")
+    (version "0.10.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/rvaser/biosoup")
-             (commit version)))
+             ;; Corresponds to version 0.10.0
+             (commit "38181f09854ff42cbd9632200a2ec9fb37a4b7b6")))
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0vn1hj3h152iwahnrzghqll34qaphchi07klb3j70vgc248micbz"))))
+         "02hvyka703zagx0nvv2yx3dkc748zc8g6qbrpya7r8kfkcl7y8hw"))))
    (build-system cmake-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'enable-testing
-            (lambda _
-              (substitute* "CMakeLists.txt"
-                (("target_link_libraries\\(biosoup_test")
-                 "enable_testing()
-  add_test(NAME biosoup-test COMMAND biosoup_test)
-  target_link_libraries(biosoup_test")))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "./bin/biosoup_test")))))))
    (native-inputs
     (list googletest))
    (home-page "https://github.com/rvaser/biosoup")
@@ -4931,29 +4928,26 @@ used for storage and logging in bioinformatics tools.")
 (define-public bioparser
  (package
    (name "bioparser")
-    (version "3.1.0")
+    (version "3.0.13")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/rvaser/bioparser")
-             (commit version)))
+             ;; Corresponds to tag 3.0.13
+             (commit "13341e6e0855c6b358ffcea6dad216e1009e1287")))
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "057zb3g8qyvbkbfzgkygrf0iphz3v4icm13pchxzrafiy7zkbmrq"))))
+         "0c5p2dl8jb12ci9f427jzrmmm9cgvc1k4fxsn2ggkfsin6r1r82i"))))
    (build-system cmake-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'enable-testing
-            (lambda _
-              (substitute* "CMakeLists.txt"
-                (("target_link_libraries\\(bioparser_test")
-                 "enable_testing()
-  add_test(NAME bioparser-test COMMAND bioparser_test)
-  target_link_libraries(bioparser_test")))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "./bin/bioparser_test")))))))
    (inputs
     (list biosoup))
    (propagated-inputs
@@ -4967,6 +4961,113 @@ bioinformatics formats (FASTA/Q, MHAP/PAF/SAM), with support for zlib
 compressed files.")
    (license license:expat)))

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

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

+(define-public fsom
+  (let ((commit "a6ef318fbd347c53189384aef7f670c0e6ce89a3"))
+    (package
+      (name "fsom")
+      (version (git-version "0.0.0" "1" commit))
+      (source (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/ekg/fsom/")
+              (commit commit)))
+        (file-name (git-file-name name version))
+        (sha256
+         (base32 "0gw1lpvr812pywg9y546x0h1hhj261xwls41r6kqhddjlrcjc0pi"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ; There are no tests to run.
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure) ; There is no configure phase.
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+                 (install-file "fsom" bin)))))))
+      (native-inputs
+       (list gcc-6))
+      (home-page "https://github.com/ekg/fsom")
+      (synopsis "Manage SOM (Self-Organizing Maps) neural networks")
+      (description "A tiny C library for managing SOM (Self-Organizing Maps)
+neural networks.")
+      (license license:gpl3))))
+
 (define-public fastahack
  (package
    (name "fastahack")
@@ -41,16 +41,32 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 (define-public acr
  (package
@@ -196,8 +196,7 @@ according to the system capabilities and the user-selected options.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))
-              (patches (search-patches "bam-python3-compat.patch"))))
+                "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags `(,(string-append "CC=" ,(cc-for-target))
@@ -208,7 +207,7 @@ according to the system capabilities and the user-selected options.")
       (modify-phases %standard-phases
         (delete 'configure))))
    (native-inputs
-     (list python-minimal-wrapper))
+     `(("python" ,python-2)))
    (inputs
     (list lua))
    (home-page "https://matricks.github.io/bam/")
@@ -275,14 +274,14 @@ generate such a compilation database.")
 (define-public bmake
  (package
    (name "bmake")
-    (version "20260406")
+    (version "20260313")
    (source
     (origin
       (method url-fetch)
       (uri (string-append
             "http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz"))
       (sha256
-        (base32 "09nzd9v12n2pwxmf67056kzjnvxcpk5q2x1fs5qkrsk1ssh5yvpd"))
+        (base32 "0xgryknmv625idw37rq89mpl5rymwdb15j5w8zxwy1gf8b6z7j3n"))
       (patches (search-patches "bmake-run-check-separately.patch"))))
    (build-system gnu-build-system)
    (inputs
@@ -345,8 +344,8 @@ programs and other files depend.")
    (license license:bsd-3)))

 (define-public gn
-  (let ((commit "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a")
-        (revision "2354"))            ;as returned by `git describe`, used below
+  (let ((commit "ee5b7e32b961a9da1933e9f46a018ba6cac8ef60")
+        (revision "2277"))            ;as returned by `git describe`, used below
    (package
      (name "gn")
      (version (git-version "0.0" revision commit))
@@ -356,7 +355,7 @@ programs and other files depend.")
                (uri (git-reference (url home-page) (commit commit)))
                (sha256
                 (base32
-                  "0yz38czmbc72q1hkiv3cwxqh2i8ji2vkkvvk5ws2cjplmn2vj0x9"))
+                  "19kkvwxl66vlzlfppbq03fmi59i5g8a1yc71fsfgwqqmx4wywd6w"))
                (file-name (git-file-name name version))))
      (build-system gnu-build-system)
      (arguments
@@ -366,8 +365,7 @@ programs and other files depend.")
                   (lambda _
                     (setenv "CC" "gcc")
                     (setenv "CXX" "g++")
-                     (setenv "CXXFLAGS"
-                             "-g -O2 -Wno-error=redundant-move -Wno-error=comment")
+                     (setenv "CXXFLAGS" "-g -O2 -Wno-error=redundant-move")
                     (setenv "AR" "ar")))
                 (replace 'configure
                   (lambda _
@@ -23,7 +23,7 @@
 ;;; Copyright © 2023, 2024 David Elsing <david.elsing@posteo.net>
 ;;; Copyright @ 2022, Kitzman <kitzman@disroot.org>
 ;;; Copyright @ 2025 Dariqq <dariqq@posteo.net>
-;;; Copyright © 2025, 2026 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
@@ -1762,7 +1762,7 @@ string.h, but with a utf8* prefix instead of the str* prefix.")
 (define-public simdutf
  (package
    (name "simdutf")
-    (version "9.0.0")
+    (version "7.7.1")
    (source
     (origin
       (method git-fetch)
@@ -1771,7 +1771,7 @@ string.h, but with a utf8* prefix instead of the str* prefix.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0f5ccvqj7pfa69m9y1kxp2v1lybx6x8i9pykdqfkr7dydqbhrhx6"))))
+        (base32 "0kw4j4qqcfjaii667xa745pklj50m70nqq8cj5agj714acczbk7y"))))
    (build-system cmake-build-system)
    (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
    (synopsis "SIMD Unicode validation and transcoding")
@@ -595,11 +595,7 @@ capacity is user-selectable.")
                            version "/DVDStyler-" version ".tar.bz2"))
       (sha256
        (base32
-         "0n3mfjsazvlzk9hl23q3iz7bmxjq7b5lx0ab8nbk1jgl763k9cqb"))
-       (snippet
-        #~(begin (delete-file "src/dvdvml.c")
-                 (delete-file "src/dvdvmy.c")
-                 (delete-file "src/dvdvmy.h")))))
+         "0n3mfjsazvlzk9hl23q3iz7bmxjq7b5lx0ab8nbk1jgl763k9cqb"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
@@ -629,28 +625,27 @@ capacity is user-selectable.")
             #t)))
       #:tests? #f)) ; No tests.
    (inputs ; TODO package bundled wxvillalib
-     (list bash-minimal ; for wrap-program
-           cdrtools
-           dbus
-           dvd+rw-tools
-           dvdauthor
-           eudev
-           ffmpeg-4
-           fontconfig
-           libexif
-           libjpeg-turbo
-           wxsvg
-           wxwidgets))
+     `(("wxwidgets" ,wxwidgets)
+       ("wssvg" ,wxsvg)
+       ("bash" ,bash-minimal) ; for wrap-program
+       ("dbus" ,dbus)
+       ("cdrtools" ,cdrtools)
+       ("dvd+rw-tools" ,dvd+rw-tools)
+       ("dvdauthor" ,dvdauthor)
+       ("eudev" ,eudev)
+       ("fontconfig" ,fontconfig)
+       ("libexif" ,libexif)
+       ("libjpeg" ,libjpeg-turbo)
+       ("ffmpeg" ,ffmpeg-4)))
    (native-inputs
-     (list bison
-           docbook-xml
-           docbook-xsl
-           flex
-           gettext-minimal
-           pkg-config
-           python-minimal-wrapper
-           xmlto
-           zip))
+     `(("pkg-config" ,pkg-config)
+       ("flex" ,flex)
+       ("python" ,python-2)
+       ("xmlto" ,xmlto)
+       ("gettext" ,gettext-minimal)
+       ("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("zip" ,zip)))
    (synopsis "DVD authoring application")
    (description "DVDStyler is a DVD authoring application which allows users
 to burn video files in many formats to DVD discs, complete with individually
@@ -3131,7 +3131,7 @@ time by mocking the datetime module.")
 (define-public python-flaky
  (package
    (name "python-flaky")
-    (version "3.8.1")  ; On bump, remove some skipped tests in python-cherrypy.
+    (version "3.8.1")
    (source (origin
              (method url-fetch)
              (uri (pypi-uri "flaky" version))
@@ -3719,6 +3719,30 @@ system.  The code under test requires no modification to work with pyfakefs.")
 directories and files.")
    (license license:expat)))

+(define-public python-pytest-tornado5
+  (package
+    (name "python-pytest-tornado5")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pytest-tornado5" version))
+              (sha256
+               (base32
+                "0qb62jw2w0xr6y942yp0qxiy755bismjfpnxaxjjm05gy2pymr8d"))))
+    (build-system pyproject-build-system)
+    (arguments
+     ;; Tests require pytest < 6
+     (list #:tests? #f))
+    (propagated-inputs (list python-pytest python-tornado))
+    (native-inputs (list python-setuptools python-wheel))
+    (home-page "https://github.com/vidartf/pytest-tornado")
+    (synopsis
+     "Fixtures and markers to simplify testing of Tornado applications")
+    (description
+     "This package provides a @code{py.test} plugin supplying fixtures and
+markers to simplify testing of asynchronous tornado applications.")
+    (license license:asl2.0)))
+
 (define-public guile-proba
  (package
    (name "guile-proba")
@@ -580,7 +580,7 @@ stored with user-specified precision.")
           python-sphinx))
    (inputs
     (list fftwf
-           `(,hwloc "lib")
+           `(,hwloc-2 "lib")
           libtirpc
           lmfit
           muparser
@@ -79,13 +79,11 @@
  '("base/third_party/cityhash" ;Expat
    "base/third_party/double_conversion" ;BSD-3
    "base/third_party/icu" ;Unicode, X11-style
-    "base/third_party/nspr" ;MPL-2.0
    "base/third_party/superfasthash" ;BSD-3
    "base/third_party/symbolize" ;BSD-3
    "base/third_party/xdg_user_dirs" ;Expat
-    "buildtools/third_party/libc++" ;BSD
-    "buildtools/third_party/libc++abi" ;BSD
    "net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
+    "net/third_party/nss" ;MPL-2.0
    "net/third_party/quiche" ;BSD-3
    "net/third_party/uri_template" ;ASL2.0
    "third_party/abseil-cpp" ;ASL2.0
@@ -106,11 +104,8 @@
    "third_party/catapult" ;BSD-3
    "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
    "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
-    "third_party/catapult/third_party/beautifulsoup4-4.9.3" ;Expat
-    "third_party/catapult/third_party/html5lib-1.1" ;Expat
    "third_party/catapult/third_party/polymer" ;BSD-3
    "third_party/catapult/third_party/six" ;Expat
-    "third_party/catapult/third_party/typ" ;ASL2.0
    ;; XXX: This is a minified version of <https://d3js.org/>.
    "third_party/catapult/tracing/third_party/d3" ;BSD-3
    "third_party/catapult/tracing/third_party/gl-matrix" ;Expat
@@ -125,12 +120,19 @@
    "third_party/cld_3" ;ASL2.0
    "third_party/closure_compiler" ;ASL2.0
    "third_party/compiler-rt" ;ASL2.0
+    "third_party/compiler-rt/src/lib" ;ASL2.0
+    "third_party/compiler-rt/src/lib/builtins" ;ASL2.0
    "third_party/content_analysis_sdk" ;BSD-3
    "third_party/cpuinfo" ;BSD-2
    "third_party/crabbyavif" ;ASL2.0
+    "third_party/crabbyavif/src/sys/dav1d-sys" ;ASL2.0
+    "third_party/crabbyavif/src/sys/aom-sys" ;ASL2.0
+    "third_party/crabbyavif/src/sys/libgav1-sys" ;ASL2.0
+    "third_party/crabbyavif/src/sys/libyuv-sys" ;ASL2.0
+    "third_party/crabbyavif/src/sys/ndk-sys" ;ASL2.0
    "third_party/crashpad" ;ASL2.0
    "third_party/crashpad/crashpad/third_party/lss" ;ASL2.0
-    "third_party/crashpad/crashpad/third_party/zlib" ;Zlib
+    "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
    "third_party/crc32c" ;BSD-3
    "third_party/cros_system_api" ;BSD-3
    "third_party/dav1d" ;BSD-2
@@ -138,25 +140,19 @@
    ;; TODO: can likely be unbundled when Vulkan is updated.
    "third_party/dawn/third_party/khronos" ;ASL2.0
    "third_party/dawn/third_party/gn/webgpu-cts" ;BSD-3
-    "third_party/dawn/third_party/renderdoc" ;Expat
-    "third_party/dawn/third_party/webgpu-headers" ;BSD-3
-    "third_party/depot_tools" ;BSD-3
-    "third_party/devscripts" ;GPL2.0
    "third_party/devtools-frontend" ;BSD-3
    "third_party/devtools-frontend/src/front_end"
    "third_party/devtools-frontend/src/front_end/third_party"
    "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party\
 /additional_readme_paths.json" ;no explicit license; trivial
+    "third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0
    "third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
-    "third_party/devtools-frontend/src/front_end/third_party/csp_evaluator" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/diff" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3
-    "third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
-    "third_party/devtools-frontend/src/front_end/third_party/legacy-javascript" ;ASL-2.0
    "third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/lit" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3
@@ -168,12 +164,10 @@
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/parsel" ; Expat
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs" ; ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay" ;ASL2.0
-    "third_party/devtools-frontend/src/front_end/third_party/source-map-scopes-codec" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party\
 /vscode.web-custom-data" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/third-party-web" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
-    "third_party/devtools-frontend/src/front_end/third_party/web-vitals" ;Expat
    "third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0
    "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0

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

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

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

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

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

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

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

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

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

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

              "clang_warning_suppression_file=\"\""

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

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

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

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

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

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

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

+(define-public rtags
+  (package
+    (name "rtags")
+    (version "2.18")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Andersbakken/rtags")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (patches (search-patches "rtags-separate-rct.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Part of spliting rct with rtags.
+        ;; Substitute #include "rct/header.h" with #include <rct/header.h>.
+        '(with-directory-excursion "src"
+           (delete-file-recursively "rct")        ;remove bundled copy
+           (let ((files (find-files "." ".*\\.cpp|.*\\.h")))
+             (substitute* files
+               (("#include ?\"rct/(.*.h)\"" all header)
+                (string-append "#include <rct/" header ">")))
+             #t)))
+       (sha256
+        (base32
+         "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:build-type "RelWithDebInfo"
+       #:configure-flags
+       '("-DRTAGS_NO_ELISP_FILES=1")
+       #:tests? #f))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list bash-completion
+           clang
+           llvm
+           lua
+           rct
+           selene))
+    (home-page "https://github.com/Andersbakken/rtags")
+    (synopsis "Indexer for the C language family with Emacs integration")
+    (description
+     "RTags is a client/server application that indexes C/C++ code and keeps a
+persistent file-based database of references, declarations, definitions,
+symbolnames etc.  There’s also limited support for ObjC/ObjC++.  It allows you
+to find symbols by name (including nested class and namespace scope).  Most
+importantly we give you proper follow-symbol and find-references support.")
+    (license license:gpl3+)))
+
 (define-public colormake
  (package
    (name "colormake")
@@ -18,10 +18,10 @@

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

 (define-module (gnu packages codex)
@@ -36,41 +36,33 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages cmake)
  #:use-module (gnu packages compression)
-  #:use-module (gnu packages linux)
  #:use-module (gnu packages libunwind)
  #:use-module (gnu packages llvm)
-  #:use-module (gnu packages lsof)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
  #:use-module (gnu packages rust-sources)
  #:use-module (gnu packages sqlite)
-  #:use-module (gnu packages textutils)
-  #:use-module (gnu packages nss)
  #:use-module (gnu packages tls)
-  #:use-module (gnu packages version-control)
-  #:use-module (gnu packages virtualization))
+  #:use-module (gnu packages version-control))

 (define-public codex
  (package
    (name "codex")
-    (version (package-version rust-codex-0.120.0))
+    (version (package-version rust-codex-0.98.0))
    (source
     (origin
-       (inherit (package-source rust-codex-0.120.0))
+       (inherit (package-source rust-codex-0.98.0))
       (patches (search-patches
-                 "codex-acp-0.11.1-disable-code-mode.patch"
-                 "rust-codex-0.117.0-remove-patch-sections.patch"
-                 "rust-codex-0.120.0-connectors-cache-test-race.patch"
-                 "rust-codex-0.120.0-remove-libwebrtc.patch"
+                 "codex-0.98.0-remove-patch-sections.patch"
                 "rust-codex-0.98.0-test-shebangs.patch"
-                 "rust-codex-0.120.0-test-timeout.patch"))))
+                 "rust-codex-0.98.0-test-timeout.patch"))))
    (build-system cargo-build-system)
    (arguments
     (list
      #:install-source? #f
      #:cargo-install-paths '(list "cli" "exec" "exec-server"
-                                   "linux-sandbox" "mcp-server"
+                                   "linux-sandbox" "mcp-server" "network-proxy"
                                   "app-server" "tui")
      ;; schema_fixtures_match_generated (upstream fixture is stale:
      ;; FileChange::Update in codex-protocol gained old_content,
@@ -79,55 +71,72 @@
      #:cargo-test-flags '(list "--workspace"
                                "--exclude" "codex-app-server-protocol"
                                "--"
-                                ;;; BEGIN Landlock returns NotEnforced
-                                ;;; in the build container; the sandbox
-                                ;;; binary panics instead of cleanly
-                                ;;; denying filesystem access.
-                                ;; Sandbox denial and escalation tests.
+                                ;; These tests exercise sandbox denial and
+                                ;; escalation, which requires Landlock to
+                                ;; cleanly deny filesystem access.  Inside the
+                                ;; build container Landlock returns NotEnforced
+                                ;; and the sandbox binary panics instead.
+                                ;; Disabling Landlock would not help either,
+                                ;; since these tests need a working sandbox to
+                                ;; have anything to deny and escalate.
                                "--skip" "sandbox_denied_shell_returns_original_output"
-                                ;; Sandbox denial and escalation tests.
                                "--skip" "shell_escalated_permissions_rejected_then_ok"
-                                ;; Sandbox denial and escalation tests.
                                "--skip" "unified_exec_runs_under_sandbox"
-                                ;; codex-exec: spawn_command_under_linux_sandbox
-                                ;; panics with LandlockRestrict (exit 101).
+                                ;; These tests (in codex-exec) directly call
+                                ;; spawn_command_under_linux_sandbox to verify
+                                ;; that python and bash work correctly inside
+                                ;; the Landlock sandbox.  The sandbox binary
+                                ;; (codex-exec) panics with LandlockRestrict
+                                ;; (exit code 101) before the inner command
+                                ;; even starts.
                                "--skip" "python_getpwuid_works_under_sandbox"
-                                ;; Same as above.
                                "--skip" "python_multiprocessing_lock_works_under_sandbox"
-                                ;; Same as above.
                                "--skip" "sandbox_distinguishes_command_and_policy_cwds"
-                                ;; linux-sandbox: process_exec_tool_call
-                                ;; invokes Landlock; same panic.
+                                ;; These linux-sandbox tests directly invoke
+                                ;; the Landlock sandbox via
+                                ;; process_exec_tool_call; same root cause.
                                "--skip" "test_writable_root"
-                                ;; Same as above.
                                "--skip" "test_timeout"
-                                ;; Same as above.
                                "--skip" "test_root_read"
-                                ;; Same as above.
                                "--skip" "test_dev_null_write"
-                                ;; Same as above.
                                "--skip" "test_no_new_privs_is_enabled"
-                                ;; One scenario runs through Landlock
-                                ;; which panics; cargo --skip cannot
-                                ;; target individual scenarios.
+                                ;; This test iterates many approval scenarios;
+                                ;; one of them
+                                ;; (danger_full_access_on_request_allows_network)
+                                ;; runs a command through the Landlock sandbox
+                                ;; binary, which panics with LandlockRestrict
+                                ;; inside the build container.  Cargo --skip
+                                ;; cannot target individual scenarios, so we
+                                ;; skip the entire matrix.
                                "--skip" "approval_matrix_covers_all_modes"
-                                ;; Landlock panic triggers escalation-retry
-                                ;; which interferes with the approval cache.
+                                ;; This test verifies session-level patch
+                                ;; approval caching: approve once, skip
+                                ;; future prompts for the same file.  When
+                                ;; Landlock is unavailable (as in the Guix
+                                ;; build container) the sandbox binary panics,
+                                ;; triggering the escalation-retry path, which
+                                ;; interferes with the approval cache and
+                                ;; causes a spurious re-prompt on the second
+                                ;; patch.
                                "--skip" "approving_apply_patch_for_session_skips_future_prompts_for_same_file"
                                ;; These tests expect to interrupt a
                                ;; long-running 'sleep 60' and receive
-                                ;; TurnAborted.  What happens:
+                                ;; TurnAborted.  Default test config is
+                                ;; OnRequest + ReadOnly.  What happens:
                                ;;
                                ;; 1. ReadOnly wraps the command with
                                ;;    codex-linux-sandbox (Landlock-based).
-                                ;; 2. Landlock is unavailable, so the
-                                ;;    sandbox binary exits instantly.
+                                ;; 2. Landlock is unavailable in the Guix
+                                ;;    build container, so the sandbox
+                                ;;    binary exits instantly (~1 ms).
                                ;; 3. Orchestrator gets SandboxErr::Denied.
                                ;;    wants_no_sandbox_approval(OnRequest)
-                                ;;    returns false, so no escalation --
-                                ;;    denial returned directly.
+                                ;;    returns false (sandboxing.rs:222),
+                                ;;    so no escalation -- denial returned
+                                ;;    directly.
                                ;; 4. ToolEmitter::finish sends the error
-                                ;;    to the mock model.
+                                ;;    to the mock model as
+                                ;;    function_call_output.
                                ;; 5. Second mock SSE response fires,
                                ;;    turn finishes with TurnComplete.
                                ;; 6. Op::Interrupt arrives 100 ms later,
@@ -141,213 +150,74 @@
                                ;; has only one mock response (so the turn
                                ;; cannot complete first).
                                "--skip" "interrupt_persists_turn_aborted_marker_in_next_request"
-                                ;; Same causal chain as above.
                                "--skip" "interrupt_tool_records_history_entries"
-                                ;; WorkspaceWrite sandbox policy wraps
-                                ;; commands with codex-linux-sandbox;
-                                ;; Landlock panics, command never runs,
-                                ;; exit_code is None instead of Some(0).
-                                "--skip" "request_permissions_grants_apply_to_later_exec_command_calls"
-                                ;; Same root cause.
-                                "--skip" "request_permissions_grants_apply_to_later_shell_command_calls"
-                                ;; Same root cause.
-                                "--skip" "partial_request_permissions_grants_do_not_preapprove_new_permissions"
-                                ;;; END Landlock
-                                ;;; BEGIN mcp_process.rs initialize
-                                ;;; assertion expects "version":"0.0.0"
-                                ;;; but the server returns "0.120.0".
+                                ;; Upstream bug: test hardcodes "0.0.0" in the
+                                ;; expected user-agent string but the workspace
+                                ;; version is "0.98.0".
+                                "--skip" "get_user_agent_returns_current_codex_user_agent"
+                                ;; Same upstream bug: mcp-server tests
+                                ;; check the initialize response which
+                                ;; includes "version": "0.0.0" but the
+                                ;; server returns "0.98.0".
                                "--skip" "test_codex_tool_passes_base_instructions"
                                "--skip" "test_shell_command_approval_triggers_elicitation"
                                "--skip" "test_patch_approval_triggers_elicitation"
-                                ;;; END version mismatch
-                                ;;; BEGIN Test isolation bug:
-                                ;;; unique_temp_dir() in
-                                ;;; state/src/runtime.rs names dirs
-                                ;;; using nanosecond timestamps, so
-                                ;;; parallel tests can collide.  The
-                                ;;; SQLite migration runs CREATE TABLE
-                                ;;; threads (without IF NOT EXISTS),
-                                ;;; so the second init panics with
-                                ;;; "table threads already exists".
+                                ;; These codex-exec-server tests need
+                                ;; "dotslash", a Meta tool that lazily
+                                ;; downloads pre-built binaries from a
+                                ;; JSON manifest.  The test helper
+                                ;; create_transport runs
+                                ;; `dotslash -- fetch <path>` to obtain a
+                                ;; custom bash binary described in
+                                ;; exec-server/tests/suite/bash.
+                                ;; dotslash is not available in the build
+                                ;; container.
+                                "--skip" "list_tools"
+                                "--skip" "accept_elicitation_for_prompt_rule"
+                                ;;; Test isolation bug: each test in
+                                ;;; state/src/runtime.rs calls
+                                ;;; unique_temp_dir() to get its own
+                                ;;; temporary directory (and thus its
+                                ;;; own SQLite database).  That function
+                                ;;; names directories using the current
+                                ;;; nanosecond timestamp, so when tests
+                                ;;; run in parallel several can receive
+                                ;;; the same name and open the same
+                                ;;; database.  The initial SQLite
+                                ;;; migration runs CREATE TABLE threads
+                                ;;; (without IF NOT EXISTS), so any init
+                                ;;; after the first panics with "table
+                                ;;; threads already exists".  Any of
+                                ;;; these tests
+                                ;;; can be the victim.
                                "--skip" "init_removes_legacy_state_db_files"
                                "--skip" "upsert_and_get_thread_memory"
                                "--skip" "get_last_n_thread_memories_for_cwd_matches_exactly"
                                "--skip" "upsert_thread_memory_errors_for_unknown_thread"
                                "--skip" "get_last_n_thread_memories_for_cwd_zero_returns_empty"
                                "--skip" "get_last_n_thread_memories_for_cwd_does_not_prefix_match"
-                                "--skip" "deleting_thread_cascades_thread_memory"
-                                ;;; END SQLite test isolation
-                                ;; The test spawns 'sh' after
-                                ;; env_clear() with an empty env map;
-                                ;; glibc execvp uses confstr(_CS_PATH)
-                                ;; ("/bin:/usr/bin") when PATH is
-                                ;; unset, but /bin/sh does not exist
-                                ;; in the build container.
-                                "--skip" "cancellation_expiration_keeps_process_alive_until_terminated"
-                                ;; Proxy baseline_policy returns 403
-                                ;; "not_allowed_local" for example.com;
-                                ;; test expects 200.
-                                "--skip" "managed_network_proxy_decider_survives_full_access_start"
-                                ;;; BEGIN bash_snapshot_script() uses
-                                ;;; "compgen -e" to list exports but
-                                ;;; bash-minimal lacks programmable
-                                ;;; completion; export section is empty.
-                                ;; stdout.contains("VALID_NAME") fails.
-                                "--skip" "bash_snapshot_filters_invalid_exports"
-                                ;; stdout.contains("MULTILINE_CERT") fails.
-                                "--skip" "bash_snapshot_preserves_multiline_exports"
-                                ;; snapshot.contains("PATH") fails.
-                                "--skip" "linux_bash_snapshot_includes_sections"
-                                ;;; END compgen
-                                ;; substitute* patches PAGER to store
-                                ;; path of cat; test expects bare "cat".
-                                "--skip" "unified_exec_env_injects_defaults"
-                                ;;; BEGIN V8 disabled (codex-code-mode
-                                ;;; default-features = false).
-                                "--skip" "suite::code_mode::"
-                                "--skip" "suite::js_repl::"
-                                "--skip" "suite::view_image::js_repl_"
-                                ;;; END V8 disabled
-                                ;;; BEGIN same compgen root cause:
-                                ;;; assert_posix_snapshot_sections
-                                ;;; asserts snapshot.contains("PATH").
-                                "--skip" "linux_shell_command_uses_shell_snapshot"
-                                "--skip" "linux_unified_exec_uses_shell_snapshot"
-                                "--skip" "shell_command_snapshot_still_intercepts_apply_patch"
-                                ;;; END compgen / shell snapshot
-                                ;;; BEGIN These sandbox tests set
-                                ;;; exclude_slash_tmp: true which makes
-                                ;;; bwrap exclude /tmp from its mount
-                                ;;; namespace.  Since Guix builds under
-                                ;;; /tmp, the codex-linux-sandbox binary
-                                ;;; becomes invisible to bwrap even though
-                                ;;; the test adds the helper dir as a
-                                ;;; filesystem carve-out -- the parent /tmp
-                                ;;; bind-mount is absent so the carve-out
-                                ;;; has nothing to carve out of.
-                                "--skip" "sandbox_reenables_writable_subpaths_under_unreadable_parents"
-                                "--skip" "managed_proxy_mode_routes_through_bridge_and_blocks_direct_egress"
-                                ;;; END exclude_slash_tmp
-                                ;; Expects 3 TerminalInteraction events
-                                ;; across timed poll windows; under CPU
-                                ;; contention events merge into 2.
-                                "--skip" "unified_exec_terminal_interaction_captures_delayed_output"
-                                ;;; BEGIN assert_parallel_duration
-                                ;;; requires < 1600 ms for parallel ops.
-                                ;; Two 300 ms test_sync_tool calls.
-                                "--skip" "read_file_tools_run_in_parallel"
-                                ;; Two "sleep 0.25" shell commands.
-                                "--skip" "shell_tools_run_in_parallel"
-                                ;; One test_sync_tool + one shell sleep.
-                                "--skip" "mixed_parallel_tools_run_in_parallel"
-                                ;;; END assert_parallel_duration
-                                ;; Asserts elapsed >= 4500 ms and
-                                ;; < 5800 ms for a 5 s timeout; under
-                                ;; contention elapsed drifts past 5800.
-                                "--skip" "remote_models_request_times_out_after_5s"
-                                ;; Queued inter-agent mail must be
-                                ;; injected between the reasoning/
-                                ;; commentary item and the gate release;
-                                ;; under contention the gate fires before
-                                ;; the mail is processed, so the snapshot
-                                ;; shows the stale function_call instead
-                                ;; of the expected mail message.
-                                "--skip" "queued_inter_agent_mail_triggers_follow_up_after_commentary_message_item"
-                                ;; Same root cause: snapshot mismatch at
-                                ;; pending_input.rs assert_two_responses_
-                                ;; input_snapshot; expects mail at position
-                                ;; 04 but gets function_call/shell instead.
-                                "--skip" "queued_inter_agent_mail_triggers_follow_up_after_reasoning_item"
-                                ;;; BEGIN DNS for hostnames like
-                                ;;; example.com fails in the build
-                                ;;; sandbox.  host_resolves_to_non_
-                                ;;; public_ip() in runtime.rs treats
-                                ;;; failed DNS as non-public and
-                                ;;; returns NotAllowedLocal, so tests
-                                ;;; expecting Allowed or Decider get
-                                ;;; Deny/BaselinePolicy instead.
-                                "--skip" "host_blocked_requires_allowlist_match"
-                                "--skip" "add_allowed_domain_removes_matching_deny_entry"
-                                "--skip" "host_blocked_subdomain_wildcards_exclude_apex"
-                                "--skip" "host_blocked_global_wildcard_allowlist_allows_public_hosts_except_denylist"
-                                "--skip" "evaluate_host_policy_emits_domain_event_for_decider_ask"
-                                "--skip" "evaluate_host_policy_emits_domain_event_for_decider_allow_override"
-                                "--skip" "http_connect_accept_blocks_in_limited_mode"
-                                "--skip" "http_connect_accept_allows_allowlisted_host_in_full_mode"
-                                "--skip" "mitm_policy_blocks_disallowed_method_and_records_telemetry"
-                                ;;; END DNS failure / NotAllowedLocal
-                                ;;; BEGIN Flaky: wiremock mock expects
-                                ;;; 1 POST to /codex/safety/arc but
-                                ;;; receives 0.  Passes in some builds,
-                                ;;; fails in others with identical code
-                                ;;; and env.  The identical custom_
-                                ;;; variant always passes; only the
-                                ;;; CODEX_APPS_MCP_SERVER_NAME variant
-                                ;;; flakes, suggesting a timing race
-                                ;;; in the async POST under contention.
-                                "--skip" "approve_mode_blocks_when_arc_returns_interrupt_for_model"
-                                "--skip" "approve_mode_blocks_when_arc_returns_interrupt_without_annotations"
-                                ;;; END ARC monitor flake
-                                ;;; BEGIN nss-certs sets SSL_CERT_FILE
-                                ;;; which makes build_reqwest_client load
-                                ;;; 171 CA certs via add_root_certificate.
-                                ;;; This changes the reqwest TLS backend
-                                ;;; configuration; the ARC safety POST to
-                                ;;; the localhost mock server never arrives
-                                ;;; (wiremock expects 1 request, gets 0).
-                                "--skip" "approve_mode_blocks_when_arc_returns_interrupt_for_model"
-                                "--skip" "approve_mode_blocks_when_arc_returns_interrupt_without_annotations"
-                                ;;; END nss-certs / ARC monitor
-                                ;; Upstream bug: JsonRpcConnection has
-                                ;; no websocket keepalive or read timeout.
-                                ;; When the exec-server is killed, the
-                                ;; client's reader task blocks on
-                                ;; websocket_reader.next() forever because
-                                ;; TCP doesn't detect the dead peer without
-                                ;; a write or keepalive probe.  Previously
-                                ;; masked because empty env made "sleep 10"
-                                ;; fail instantly; with PATH the process
-                                ;; lives long enough to hit the deadlock.
-                                "--skip" "remote_exec_process_reports_transport_disconnect"
-                                ;; 500 ms timeout on MCP list response
-                                ;; (mcp_server_status.rs timeout at
-                                ;; Duration::from_millis(500)).  With
-                                ;; nss-certs TLS now works, so the
-                                ;; startup plugin sync HTTP requests
-                                ;; (chatgpt.com, api.github.com) wait
-                                ;; for TCP timeout instead of failing
-                                ;; instantly at TLS, eating the budget.
-                                "--skip" "mcp_server_status_list_tools_and_auth_only_skips_slow_inventory_calls")
+                                "--skip" "deleting_thread_cascades_thread_memory")
      #:cargo-package-crates
      ''(;;; Tier 0: No internal deps.
-         "codex-ansi-escape"
         "codex-async-utils"
-         "codex-backend-openapi-models"
         "codex-client"
         "codex-execpolicy"
         "codex-file-search"
-         "codex-git-utils"
+         "codex-git"
         "codex-keyring-store"
-         "codex-process-hardening"
         "codex-utils-absolute-path"
         "codex-utils-cache"
         "codex-utils-cargo-bin"
-         "codex-utils-elapsed"
-         "codex-utils-fuzzy-match"
         "codex-utils-home-dir"
         "codex-utils-json-to-toml"
-         "codex-utils-path"
-         "codex-utils-plugins"
         "codex-utils-pty"
         "codex-utils-readiness"
-         "codex-utils-rustls-provider"
-         "codex-utils-sleep-inhibitor"
-         "codex-utils-stream-parser"
         "codex-utils-string"
-         "codex-utils-template"
-         ;;; Tier 1.
+         "codex-backend-openapi-models"
+         "codex-process-hardening"
+         "codex-ansi-escape"
+         ;;; Tier 1: Depends on tier 0.
         "codex-utils-image"
-         "codex-utils-output-truncation"
         "codex-apply-patch"
         "codex-protocol"
         "codex-windows-sandbox"
@@ -356,60 +226,35 @@
         "codex-secrets"
         "codex-execpolicy-legacy"
         "codex-debug-client"
-         "codex-analytics"
-         "codex-rollout"
-         "codex-terminal-detection"
-         "codex-utils-approval-presets"
-         "codex-utils-cli"
         ;;; Tier 2.
         "codex-app-server-protocol"
         "codex-rmcp-client"
         "codex-otel"
         "codex-state"
-         "codex-features"
-         "codex-config"
-         "codex-hooks"
-         "codex-instructions"
-         "codex-code-mode"
-         "codex-feedback"
-         "codex-skills"
         "codex-core"
-         "codex-utils-sandbox-summary"
         "codex-linux-sandbox"
-         "codex-sandboxing"
-         "codex-connectors"
-         "codex-core-skills"
+         "codex-feedback"
         ;;; Tier 3.
         "codex-arg0"
         "codex-lmstudio"
         "codex-login"
         "codex-ollama"
-         "codex-utils-oss"
+         "codex-common"
         "codex-mcp-server"
         "codex-backend-client"
         "codex-responses-api-proxy"
-         "codex-shell-command"
-         "codex-shell-escalation"
-         "codex-plugin"
-         "codex-model-provider-info"
-         "codex-models-manager"
         ;;; Tier 4.
         "codex-cloud-requirements"
         "codex-exec"
         "codex-exec-server"
-         "codex-network-proxy"
         "codex-stdio-to-uds"
+         "codex-network-proxy"
         "codex-chatgpt"
         "codex-cloud-tasks-client"
-         "codex-cloud-tasks-mock-client"
-         "codex-tools"
-         "codex-mcp"
-         "codex-collaboration-mode-templates"
         ;;; Tier 5.
         "codex-app-server"
         "codex-app-server-test-client"
         "codex-tui"
-         "codex-response-debug-context"
         ;;; Tier 6.
         "codex-cloud-tasks"
         ;; The main executable.
@@ -425,7 +270,7 @@
              ;; Update them to match the actual package version.
              (let ((snap-files (find-files "." "\\.snap$")))
                (substitute* snap-files
-                  (("\\(v0\\.0\\.0\\)   ") "(v0.120.0) ")))))
+                  (("\\(v0\\.0\\.0\\) ") "(v0.98.0)")))))
          (add-after 'chdir-to-workspace 'patch-git-deps-to-vendor
            (lambda _
              ;; Replace git dependencies with version references so cargo
@@ -434,34 +279,23 @@
                (("nucleo = \\{ git = [^}]+\\}")
                 "nucleo = \"0.5.0\"")
                (("runfiles = \\{ git = [^}]+\\}")
-                 "runfiles = \"0.1.0\""))
-              ;; Remove workspace members that have unbuildable deps
-              ;; (libwebrtc requires git fetch, v8-poc requires V8).
-              (substitute* "Cargo.toml"
-                (("\"v8-poc\",") "")
-                (("\"code-mode\",") ""))
-              ;; Disable V8 runtime in codex-code-mode: remove path
-              ;; so cargo resolves it from the vendor (where it has
-              ;; optional = true on v8) and disable default features.
-              (substitute* "Cargo.toml"
-                (("codex-code-mode = \\{ path = \"code-mode\" \\}")
-                 "codex-code-mode = { version = \"0.120.0\", default-features = false }"))))
-          (add-after 'patch-git-deps-to-vendor 'add-version-to-workspace-deps
+                 "runfiles = \"0.1.0\""))))
+          (add-after 'chdir-to-workspace 'add-version-to-workspace-deps
            (lambda _
              ;; cargo package requires all dependencies to have versions.
              ;; cargo package requires all dependencies to have versions.
-              ;; Add version = "0.120.0" to internal path dependencies.
+              ;; Add version = "0.98.0" to internal path dependencies.
              (let ((cargo-files (find-files "." "^Cargo\\.toml$")))
                (substitute* cargo-files
                  ;; Handle inline deps: name = { path = "..." }
                  (("(codex-[a-z0-9-]+) = \\{ path = " all name)
-                   (string-append name " = { version = \"0.120.0\", path = "))
+                   (string-append name " = { version = \"0.98.0\", path = "))
                  ;; Handle inline deps with package: name = { package = "...", path = "..." }
                  (("(codex-[a-z0-9-]+) = \\{ package = " all name)
-                   (string-append name " = { version = \"0.120.0\", package = "))
+                   (string-append name " = { version = \"0.98.0\", package = "))
                  ;; Handle section deps: [dependencies.X] with path = "..."
                  (("^(path = \"\\.\\./[^\"]*\")" all path-line)
-                   (string-append path-line "\nversion = \"0.120.0\""))))))
+                   (string-append path-line "\nversion = \"0.98.0\""))))))
          (add-after 'chdir-to-workspace 'patch-hardcoded-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((bash-bin (string-append
@@ -491,14 +325,6 @@
                   (string-append "\"" bash-bin "/bash "))
                  (("\"/bin/sh ")
                   (string-append "\"" bash-bin "/sh "))
-                  ;; Single-quoted paths in test assertion strings,
-                  ;; e.g. "exec '/bin/bash' -c ...".  Must match the
-                  ;; double-quoted substitutions above so both sides
-                  ;; of assert_eq!/contains use the store path.
-                  (("'/bin/bash'")
-                   (string-append "'" bash-bin "/bash'"))
-                  (("'/bin/sh'")
-                   (string-append "'" bash-bin "/sh'"))
                  ;; coreutils.
                  (("\"/bin/(cat|cp|date|echo|head|ls|rm|sleep|true|touch)\"" all cmd)
                   (string-append "\"" coreutils-bin "/" cmd "\""))
@@ -513,120 +339,28 @@
                   (string-append "\"" git-bin "/git\""))
                  (("\"/usr/bin/sed\"")
                   (string-append "\"" sed-bin "/sed\"")))
-                ;; Bare Command::new("git") and Command::new("ls")
-                ;; in codex source files that exec internally.
-                (substitute* (find-files "git-utils" "\\.rs$")
-                  (("Command::new\\(\"git\"\\)")
-                   (string-append "Command::new(\"" git-bin "/git\")")))
-                (substitute* "tui/src/get_git_diff.rs"
-                  (("Command::new\\(\"git\"\\)")
-                   (string-append "Command::new(\"" git-bin "/git\")")))
-                (substitute* "core/src/turn_diff_tracker.rs"
-                  (("Command::new\\(\"git\"\\)")
-                   (string-append "Command::new(\"" git-bin "/git\")")))
-                (substitute* "cloud-tasks/src/env_detect.rs"
-                  (("Command::new\\(\"git\"\\)")
-                   (string-append "Command::new(\"" git-bin "/git\")")))
-                (substitute* "core/src/plugins/startup_sync.rs"
-                  (("\"git\",")
-                   (string-append "\"" git-bin "/git\",")))
-                (substitute* "file-search/src/lib.rs"
-                  (("Command::new\\(\"ls\"\\)")
-                   (string-append "Command::new(\"" coreutils-bin "/ls\")")))
-                ;; Neutralize pager with absolute path to cat.
-                (substitute* "core/src/unified_exec/process_manager.rs"
-                  (("\"PAGER\", \"cat\"")
-                   (string-append "\"PAGER\", \"" coreutils-bin "/cat\""))
-                  (("\"GIT_PAGER\", \"cat\"")
-                   (string-append "\"GIT_PAGER\", \"" coreutils-bin "/cat\""))
-                  (("\"GH_PAGER\", \"cat\"")
-                   (string-append "\"GH_PAGER\", \"" coreutils-bin "/cat\"")))
-                ;; Bare /bin/sleep inside a format! string
-                ;; (no surrounding double quotes, so the main
-                ;; pattern does not match).
-                (substitute*
-                  "shell-escalation/src/unix/escalate_server.rs"
-                  (("/bin/sleep")
-                   (string-append coreutils-bin "/sleep")))
                ;; @SHELL@ placeholder from test-shebangs patch
                (substitute*
                  (list "rmcp-client/src/program_resolver.rs"
                        "tui/src/external_editor.rs")
                  (("@SHELL@")
                   (string-append bash-bin "/sh")))
-                ;; Shebangs inside raw string literals (r#"..."#)
-                ;; that are written to scripts at runtime.  The
-                ;; main "/bin/sh" patterns only match double-quoted
-                ;; occurrences; these shebangs have no surrounding
-                ;; double quotes.
+                ;; shebang in test-only file
                (substitute*
-                  (list "core/src/plugins/startup_sync_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"
-                        "login/src/auth/auth_tests.rs"
-                        "models-manager/src/manager_tests.rs"
-                        "sandboxing/src/bwrap_tests.rs")
+                  "core/tests/suite/user_notification.rs"
                  (("#!/bin/bash")
-                   (string-append "#!" bash-bin "/bash"))
-                  (("#!/bin/sh")
-                   (string-append "#!" bash-bin "/sh")))
-                ;; Test helpers pass env: Default::default() to the
-                ;; spawn code which calls env_clear(), leaving
-                ;; processes with no PATH.  Inject the build-time
-                ;; PATH so tests find coreutils, bash, etc.
-                (substitute* (find-files "." "\\.rs$")
-                  (("env: Default::default\\(\\)")
-                   (string-append
-                    "env: std::env::var(\"PATH\")"
-                    ".into_iter()"
-                    ".map(|p| (\"PATH\".to_string(), p))"
-                    ".collect()")))
-                ;; Test-only absolute path; bare name works via PATH.
-                (substitute* "exec-server/tests/exec_process.rs"
-                  (("\"/usr/bin/python3\"")
-                   "\"python3\""))
-                ;; Same empty-env issue but in JSON literals
-                ;; (serde_json::json! macro).
-                (substitute* "exec-server/tests/process.rs"
-                  (("\"env\": \\{\\}")
-                   (string-append
-                    "\"env\": {\"PATH\": \""
-                    (getenv "PATH")
-                    "\"}"))))))
-          (add-before 'build 'set-bubblewrap-source
-            (lambda* (#:key inputs #:allow-other-keys)
-              (setenv "CODEX_BWRAP_SOURCE_DIR"
-                      (string-append
-                       (assoc-ref inputs "bubblewrap-source")
-                       "/"))))
-          (add-before 'build 'create-node-version-file
-            (lambda _
-              (call-with-output-file "guix-vendor/node-version.txt"
-                (lambda (port)
-                  (display "22.22.0" port)))))
+                   (string-append "#!" bash-bin "/bash"))))))
          (add-before 'check 'set-home
            (lambda _
-              ;; HOME must not be a prefix of /tmp, otherwise
-              ;; the TUI's path shortener replaces /tmp/... with
-              ;; ~/... and 30 snapshot tests fail.
-              (setenv "HOME" "/tmp/guix-home")
-              (mkdir-p "/tmp/guix-home")
+              (setenv "HOME" "/tmp")
              (setenv "USER" "nixbld"))))))
-    (native-inputs `(("bubblewrap" ,bubblewrap) ;tests need bwrap on PATH
-                     ("clang" ,clang)
-                     ("cmake-minimal" ,cmake-minimal)
-                     ("libunwind" ,libunwind)
-                     ("lsof" ,lsof)            ;app-server tests
-                     ("nss-certs-for-test" ,nss-certs-for-test) ;OTLP gRPC TLS
-                     ("perl" ,perl)
-                     ("procps" ,procps)         ;tests use ps
-                     ("python-minimal" ,python-minimal)
-                     ("pkg-config" ,pkg-config)
-                     ("bubblewrap-source" ,(package-source bubblewrap))))
+    (native-inputs (list clang              ;bindgen uses libclang to parse BoringSSL's C headers
+                         cmake-minimal    ;BoringSSL is compiled from C source
+                         libunwind        ;BoringSSL tests verify stack unwinding in assembly
+                         perl python-minimal ;for tests
+                         pkg-config))
    (inputs (cons* bash-minimal coreutils git-minimal sed
-                   libcap oniguruma openssl sqlite zlib `(,zstd "lib")
+                   openssl sqlite `(,zstd "lib")
                   (cargo-inputs 'codex)))
    (home-page "https://github.com/openai/codex")
    (synopsis "AI-assisted coding CLI and TUI")
@@ -634,15 +368,13 @@
     "Codex is an AI-powered coding assistant that runs in the terminal.
 It provides an interactive TUI for conversations with AI models, with
 support for shell command execution, file editing, and code generation.
-Configure providers via @file{~/.codex/config.toml}.
-
-codex-code-mode's V8 Javascript executor is disabled.")
+Configure providers via @file{~/.codex/config.toml}.")
    (license license:asl2.0)))

 (define-public codex-acp
  (package
    (name "codex-acp")
-    (version "0.11.1")
+    (version "0.9.2")
    (source
     (origin
       (method git-fetch)
@@ -651,8 +383,9 @@ codex-code-mode's V8 Javascript executor is disabled.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1rlgkbvrbdl5jhf49sjn2mifn2rq6z0vwf0gard23y1bz6sr3wmr"))
-       (patches (search-patches "codex-acp-0.11.1-remove-patch-sections.patch"))))
+        (base32 "190sq6s6jfz8dkj1y8305r7x6ln86qqr2j1bnfjci7f1x2wyzmsj"))
+       (patches (search-patches "codex-acp-0.9.2-remove-patch-sections.patch"
+                                "codex-acp-0.9.2-replace-result-flatten.patch"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -660,43 +393,13 @@ codex-code-mode's V8 Javascript executor is disabled.")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-codex-deps
-            (lambda* (#:key inputs #:allow-other-keys)
+            (lambda _
              ;; Rewrite git dependencies to use vendored sources from rust-codex
              (substitute* "Cargo.toml"
-                (("git = \"https://github.com/openai/codex\", tag = \"rust-v0.117.0\"")
-                 "version = \"0.117.0\""))
-              ;; Disable V8 runtime in codex-code-mode (transitive dep).
-              (let ((port (open-file "Cargo.toml" "a")))
-                (display "
-[dependencies.codex-code-mode]
-version = \"0.117.0\"
-default-features = false
-" port)
-                (close-port port))
-              ;; Point codex-linux-sandbox at system bubblewrap source.
-              (setenv "CODEX_BWRAP_SOURCE_DIR"
-                      (string-append
-                       (assoc-ref inputs "bubblewrap-source")
-                       "/"))))
-          (add-before 'check 'set-home
-            (lambda _
-              (setenv "HOME" "/tmp")
-              (setenv "USER" "nixbld")))
-          (add-before 'build 'create-node-version-file
-            (lambda _
-              ;; codex-core's js_repl uses include_str! to read
-              ;; node-version.txt four directories up from its source;
-              ;; create it where the vendored crate expects it.
-              (call-with-output-file "guix-vendor/node-version.txt"
-                (lambda (port)
-                  (display "22.22.0" port))))))))
-    (native-inputs
-     `(("cmake-minimal" ,cmake-minimal)
-       ("clang" ,clang)
-       ("pkg-config" ,pkg-config)
-       ("bubblewrap-source" ,(package-source bubblewrap))))
-    (inputs (cons* libcap openssl sqlite zlib `(,zstd "lib")
-                   (cargo-inputs 'codex-acp)))
+                (("git = \"https://github.com/zed-industries/codex\", branch = \"acp\"")
+                 "version = \"0.0.0\"")))))))
+    (native-inputs (list pkg-config))
+    (inputs (cons* openssl sqlite `(,zstd "lib") (cargo-inputs 'codex-acp)))
    (home-page "https://github.com/zed-industries/codex-acp")
    (synopsis "ACP-compatible agent bridging Zed Codex with ACP clients")
    (description
@@ -150,7 +150,7 @@ as created by Podman, CRI-O and containerd.")))
 (define-public crun
  (package
    (name "crun")
-    (version "1.26")
+    (version "1.25.1")
    (source
     (origin
       (method url-fetch)
@@ -160,7 +160,7 @@ as created by Podman, CRI-O and containerd.")))
             "/crun-" version ".tar.gz"))
       (sha256
        (base32
-         "1hdwk5dpsz9danxiyfli07b7sqid6hr34qmhs5qjl2dcc00is89j"))))
+         "02kksvnja234k8mpq5j7yms8npbpvh8iz3k03h21lwcqzqsb88rx"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -714,7 +714,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
 (define-public podman
  (package
    (name "podman")
-    (version "5.8.2")
+    (version "5.8.1")
    (outputs '("out" "docker"))
    (properties
     `((output-synopsis "docker" "docker alias for podman")
@@ -727,7 +727,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
             (url "https://github.com/containers/podman")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "12bmzbfyjsf0mwnam38cw9ib54wj1znh5b7lxzdyll9cvvkhqisr"))
+        (base32 "1wdsdc0nj4m1v8mn95dhavi87ad0adqmld70da59gvp2abff5f0f"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -1,226 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
-;;; Copyright © 2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages coreboot)
-  #:use-module (gnu packages bison)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages flex)
-  #:use-module (gnu packages pciutils)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix build-system cargo)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system go)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system qt)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (srfi srfi-26))
-
-(define %coreboot-version "26.03")
-
-(define %coreboot-origin
-  (origin
-    (method git-fetch)
-    (uri (git-reference
-           (url "https://review.coreboot.org/coreboot")
-           (commit %coreboot-version)))
-    (file-name (git-file-name "coreboot" %coreboot-version))
-    (sha256
-     (base32
-      "0436rr0vibh35phvkxrc939njvrmnfq9xw87y1b0nlllglvq07kk"))))
-
-(define-public bincfg
-  (package
-    (name "bincfg")
-    (version %coreboot-version)
-    (source %coreboot-origin)
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; no test suite
-      #:make-flags
-      #~(list
-         (string-append "CC=" #$(cc-for-target)))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure) ; no configure script
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/bincfg")))
-          (add-after 'build 'build-binaries
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (for-each
-               (lambda (target result)
-                 (apply invoke "make" (string-append "gen-" target) make-flags)
-                 (rename-file result
-                              (string-append target ".bin")))
-               (list
-                ;; generate GbE for X200
-                "gbe-ich9m"
-                ;; generate GbE for X220/x230
-                "gbe-82579LM"
-                ;; generate IFD for X200
-                "ifd-x200")
-               (list
-                "flashregion_3_gbe.bin"
-                "flashregion_3_gbe.bin"
-                "flashregion_0_fd.bin"))))
-          ;; The Makefile has no install target.
-          (replace 'install
-            (lambda _
-              (let ((bin (string-append #$output "/bin"))
-                    (lib (string-append #$output "/lib/bincfg"))
-                    (data (string-append #$output "/share/bincfg")))
-                ;; Install the program
-                (install-file "bincfg" bin)
-                ;; And its data
-                (for-each
-                 (lambda (path)
-                   (install-file path data))
-                 (append (find-files "." ".*\\.set")
-                         (find-files "." ".*\\.spec")))
-                ;; And the files generated with the data
-                (for-each
-                 (lambda (path)
-                   (install-file path lib))
-                 (find-files "." ".*\\.bin"))))))))
-    (native-inputs (list bison flex))
-    (home-page "https://coreboot.org")
-    (synopsis "Encoder/decoder for binary formats described in text files")
-    (description "
-The bincfg program comes with specifications files for the following binary
-formats:
-@itemize
-@item Various DDR3 and DDR4 SPD
-@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
-@item Configuration data for the Intel Gigabit Ethernet controller present in
-      the Intel ICH9-M chipset.
-@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
-@item Configuration data for the ITE IT8718F SuperIO
-@end itemize
-It also comes with example files generated by bincfg.")
-    (license license:gpl3+)))
-
-(define-public ifdtool
-  (package
-    (name "ifdtool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/ifdtool")))
-          (delete 'configure))           ; no configure script
-      #:tests? #f))                    ; no test suite
-    (home-page "https://doc.coreboot.org/util/ifdtool/")
-    (synopsis "Intel Firmware Descriptor dumper")
-    (description "This package provides @command{ifdtool}, a program to
-dump Intel Firmware Descriptor data of an image file.")
-    (license license:gpl2)))
-
-(define-public intelmetool
-  (package
-    (name "intelmetool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f                       ;no test suite
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/intelmetool")))
-          (delete 'configure) ;no configure script
-          (delete 'check))))
-    (inputs (list pciutils zlib))
-    (home-page
-     "https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
-    (synopsis "Intel Management Engine tools")
-    (description "This package provides tools for working with Intel
-Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
-@code{sudo rmmod mei} before using this tool.  Also pass
-@code{iomem=relaxed} to the Linux kernel command line.")
-    (license license:gpl2)
-
-    ;; This is obviously an Intel thing, plus it requires <cpuid.h>.
-    (supported-systems '("x86_64-linux" "i686-linux"))))
-
-(define-public nvramtool
-  (package
-    (name "nvramtool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; no test suite
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/nvramtool")))
-          (delete 'configure)))) ; no configure script
-    (home-page "https://coreboot.org")
-    (synopsis "Command line tool that can edit Coreboot settings")
-    (description "@command{nvramtool} can see and/or modify Coreboot settings
-like the serial port speed, log level, etc.  It requires Coreboot to be compiled
-with CONFIG_USE_OPTION_TABLE and some options require the iomem=relaxed kernel
-command line to work.  Features:
-@itemize
-@item If Coreboot was compiled without CONFIG_STATIC_OPTION_TABLE, it can change
-      its settings, which are applied after a reboot.
-@item It can modify Coreboot images  default settings with
-      @command{nvramtool -C coreboot.rom [...]}.
-@item It has various options related to the file format used to store these
-      settings.
-@item It can also read/write the CMOS memory where the Coreboot settings can be
-      located.
-@end itemize")
-    ;; Some files are "GPL-2.0-only or BSD-3-Clause", other are GPL-2.0-only
-    ;; and anyway there is. There is also a license declaration in
-    ;; cli/nvramtool.8 that applies to "This program" which uses the GPLv2.
-    (license license:gpl2)))
@@ -44,7 +44,7 @@
 ;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Sergio Pastor Pérez <sergio.pastorperez@gmail.com>
-;;; Copyright © 2025, 2026 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Romain Garbage <romain.garbage@inria.fr>
 ;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
@@ -683,6 +683,38 @@ computer program to introspect and modify an object at runtime.  It is also
 the name of the library itself, which is written in C++.")
    (license license:expat)))

+(define-public rct
+  (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a")
+         (revision "2"))
+    (package
+      (name "rct")
+      (version (git-version "0.0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/Andersbakken/rct")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1m2931jacka27ghnpgf1z1plkkr64z0pga4r4zdrfpp2d7xnrdvb"))
+                (patches (search-patches "rct-add-missing-headers.patch"))
+                (file-name (git-file-name name version))))
+      (build-system cmake-build-system)
+      (arguments
+       '(#:configure-flags
+         '("-DWITH_TESTS=ON"            ; To run the test suite
+           "-DRCT_RTTI_ENABLED=ON")))
+      (native-inputs
+       (list cppunit pkg-config))
+      (inputs
+       (list openssl zlib))
+      (home-page "https://github.com/Andersbakken/rct")
+      (synopsis "C++ library providing Qt-like APIs on top of the STL")
+      (description "Rct is a set of C++ tools that provide nicer (more Qt-like)
+ APIs on top of Standard Template Library (@dfn{STL}) classes.")
+      (license (list license:expat        ; cJSON
+                     license:bsd-4)))))   ; everything else (LICENSE.txt)
+
 (define-public plutovg
  (package
    (name "plutovg")
@@ -3360,7 +3392,7 @@ which can evaluate Jsonnet files and expressions.")))
 (define-public simdjson
  (package
    (name "simdjson")
-    (version "4.6.3")
+    (version "3.13.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3369,7 +3401,7 @@ which can evaluate Jsonnet files and expressions.")))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0729mxnc2wjb94gr4znwlzfmgw5w2v9kd8glvn3vnjhkdnd87zry"))))
+                "005yli56nrkvlyx9g9cq8dczk42r9a18l162i2s5k81lj3y7mcrp"))))
    (build-system cmake-build-system)
    (arguments
     '(#:tests? #f                      ; tests require downloading dependencies
@@ -3608,7 +3640,7 @@ std::wstring, etc).")
 (define-public fast-float
  (package
    (name "fast-float")
-    (version "8.2.5")
+    (version "8.0.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3617,7 +3649,7 @@ std::wstring, etc).")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1l13nsl4sgq71m7aifrmmmfyl14vp48vqdh7pb50hxqq6f8bq2b5"))))
+                "19x1yklf641yrpad6lk4cq3jmird10d5ig8hicm3p9lxh92k78cl"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -3628,10 +3660,12 @@ std::wstring, etc).")
          (add-after 'unpack 'patch-cmake-tests
            (lambda* (#:key inputs native-inputs #:allow-other-keys)
              (substitute* "tests/CMakeLists.txt"
-                (("FetchContent_MakeAvailable\\(supplemental_test_files.*")
+                (("FetchContent_GetProperties\\(supplemental_test_files.*")
+                 "")
+                (("if\\(NOT supplemental_test_files_POPULATED.*")
                 (string-append
                  "set(supplemental_test_files_BINARY_DIR "
-                  #$fast-float-test-files ")\n"))))))))
+                  #$fast-float-test-files ")\nif(0)\n"))))))))
    (native-inputs (list doctest fast-float-test-files))
    (home-page "https://github.com/fastfloat/fast_float")
    (synopsis "Floating point number parser for C++")
@@ -135,10 +135,20 @@
                                        (search-patches
                                         "ath9k-htc-firmware-binutils.patch")))
                 ((target-mingw? target)
-                  (package-with-extra-patches binutils
-                                              (search-patches
-                                               "binutils-cross-windres.patch"
-                                               "binutils-mingw-w64-deterministic.patch")))
+                  (package-with-extra-patches
+                   (package-with-extra-configure-variable
+                    ;; mingw binutils does not work correctly when configured
+                    ;; with `--enable-compressed-debug-sections`. An error
+                    ;; like the following will occur whenever you try to link:
+                    ;;
+                    ;;   x86_64-w64-mingw32-ld: final link failed: bad value
+                    ;;
+                    ;; TODO: This seems like a deeper problem that warrants
+                    ;; deeper investigation.
+                    binutils "--enable-compressed-debug-sections" "no")
+                   (search-patches
+                    "binutils-cross-windres.patch"
+                    "binutils-mingw-w64-deterministic.patch")))
                 (else binutils))
           target)))

@@ -276,17 +276,18 @@ Ed448-Goldilocks and Curve448, using the Decaf encoding.")
 (define-public libsodium
  (package
    (name "libsodium")
-    (version "1.0.22")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/jedisct1/libsodium")
-              (commit (string-append version "-RELEASE"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "05lqdn6nzldsia5mv5a9xfvc5k0kybh9snwv7qsb135gva4bpjwk"))))
+    (version "1.0.18")
+    (source (origin
+            (method url-fetch)
+            (uri (list (string-append
+                        "https://download.libsodium.org/libsodium/"
+                        "releases/libsodium-" version ".tar.gz")
+                       (string-append
+                        "https://download.libsodium.org/libsodium/"
+                        "releases/old/libsodium-" version ".tar.gz")))
+            (sha256
+             (base32
+              "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"))))
    (build-system gnu-build-system)
    (synopsis "Portable NaCl-based crypto library")
    (description
@@ -69,8 +69,6 @@
 ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
 ;;; Copyright © 2025 bdunahu <bdunahu@operationnull.com>
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
-;;; Copyright © 2026 Peter Polidoro <peter@polidoro.io>
-;;; Copyright © 2026 Josep Bigorra <jjbigorra@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -127,7 +125,6 @@
  #:use-module (gnu packages gperf)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages guile)
-  #:use-module (gnu packages guile-xyz)
  #:use-module (gnu packages icu4c)
  #:use-module (gnu packages jemalloc)
  #:use-module (gnu packages language)
@@ -200,7 +197,6 @@
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
-  #:use-module (guix build-system guile)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system pyproject)
@@ -1549,17 +1545,17 @@ and high-availability (HA).")
    (license license:gpl2)))                  ;'COPYING' says "version 2" only

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

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

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

 (define-public postgresql postgresql-14)

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

-(define-public sqliteodbc
-  (package
-    (name "sqliteodbc")
-    (version "0.99991")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://www.ch-werner.de/sqliteodbc/"
-                                  name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0p4avhqxnd2l49g3vpzwrmdi8wxyqzy0vswalaagmqfdsfwav52d"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f                      ; no check target
-      #:configure-flags
-      #~(list "--disable-static"
-              (string-append "--with-sqlite3=" #$(this-package-input "sqlite"))
-              (string-append "--with-odbc=" #$(this-package-input "unixodbc")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'create-lib-directory
-            (lambda _
-              (mkdir-p (string-append #$output "/lib"))))
-          (add-after 'install 'remove-extra-sqlite-extensions
-            (lambda _
-              ;; Keep this package focused on the ODBC driver itself.
-              (for-each delete-file
-                        (find-files (string-append #$output "/lib")
-                                    "^libsqlite3_mod_.*\\.(la|so)$"))))
-          (add-after 'install 'install-odbcinst.ini
-            (lambda _
-              (let ((dir (string-append #$output "/share/sqliteodbc")))
-                (mkdir-p dir)
-                (call-with-output-file (string-append dir "/odbcinst.ini")
-                  (lambda (port)
-                    (display
-                     (string-append
-                      "[SQLite3]\n"
-                      "Description = SQLite3 ODBC Driver\n"
-                      "Driver      = " #$output "/lib/libsqlite3odbc.so\n"
-                      "Setup       = " #$output "/lib/libsqlite3odbc.so\n"
-                      "Threading   = 2\n")
-                     port)))))))))
-    (native-search-paths
-     (list (search-path-specification
-            (variable "ODBCSYSINI")
-            (files '("share/sqliteodbc"))
-            (separator #f))))
-    (inputs (list sqlite unixodbc))
-    (home-page "http://www.ch-werner.de/sqliteodbc/")
-    (synopsis "ODBC driver for SQLite")
-    (description
-     "SQLiteODBC provides an ODBC driver for SQLite 3 databases.  It installs
-the shared library and a driver registration file so applications using
-unixODBC can resolve the @code{SQLite3} driver name from a Guix profile.")
-    (license license:tcl/tk)))
-
 (define-public nanodbc
  (package
    (name "nanodbc")
@@ -5049,54 +4953,6 @@ postgresql = postgresql://nixbld@/yoyo_test~%")))
 files or Python scripts that define a list of migration steps.")
    (license license:asl2.0)))

-(define-public mutastructura
-  (package
-    (name "mutastructura")
-    (version "0.6.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/jjba23/mutastructura")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "08vzlc5imavqf3bdzgbh70c7z44xjhf05gr7i2g5ksl49lv39gzh"))))
-    (build-system guile-build-system)
-    (arguments
-     (list
-      #:source-directory "src"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'install-program-files
-            (lambda _
-              (let* ((bin (string-append #$output "/bin"))
-                     (share (string-append #$output "/share")))
-                (copy-recursively "resources"
-                                  (string-append share "/resources"))
-                (install-file "scripts/mutastructura" bin)
-                (install-file "scripts/log.bash"
-                              (string-append share "/scripts/"))
-                (chmod (string-append bin "/mutastructura") #o755)))))))
-    (native-inputs (list guile-3.0))
-    (propagated-inputs (list guile-dbi
-                             guile-dbd-mysql
-                             guile-dbd-sqlite3
-                             guile-dbd-postgresql
-                             guile-gcrypt))
-    (inputs (list guile-3.0 bash-minimal))
-    (home-page "https://codeberg.org/jjba23/mutastructura")
-    (synopsis "Relational database schema migrations powered by Guile Scheme")
-    (description
-     "Mutastructura provides a familiar, declarative and transactional
-approach to managing database states. It exposes a user-friendly 
-@acronym{CLI, command-line interface} and has support for PostgreSQL, MySQL, and SQLite.
-It also exposes library functions and can be imported and used directly from other Guile code.
-
-Features include executing migrations transactionally and computing SHA256
-checksums to track schema evolution in a @code{migrations_history} table.")
-    (license license:agpl3+)))
-
 (define-public python-mysqlclient
  (package
    (name "python-mysqlclient")
@@ -20,6 +20,18 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

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

@@ -79,7 +79,7 @@
 (define-public diffoscope
  (package
    (name "diffoscope")
-    (version "317")
+    (version "315")
    (source
     (origin
       (method git-fetch)
@@ -88,7 +88,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "13r96c49wrpx0xa8bbkki832w58gjdgqb4khjsaawk5mb5yv4c39"))))
+        (base32 "1q2q60hw36d1capqdrg6gp2220dg87bmxgmk52m7yml4xw13zi2p"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -31,7 +31,7 @@
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2024-2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
-;;; Copyright © 2025, 2026 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2025 Grigory Shepelev <shegeley@gmail.com>
 ;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>

@@ -94,8 +94,6 @@
  #:use-module (gnu packages gnome)
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages golang-build)
-  #:use-module (gnu packages golang-check)
-  #:use-module (gnu packages golang-compression)
  #:use-module (gnu packages golang-xyz)
  #:use-module (gnu packages graphics)
  #:use-module (gnu packages gtk)
@@ -422,49 +420,6 @@ tables, and it understands a variety of different formats.")
 similarity.")
    (license license:gpl3+)))

-(define-public gdu
-  (package
-    (name "gdu")
-    (version "5.35.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/dundee/gdu")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "051xf3wncdiavjwyl9djmni5vd2dqjgn6drkw2nm21c9l0rjfv6d"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:import-path "github.com/dundee/gdu/v5/cmd/gdu"
-      #:unpack-path "github.com/dundee/gdu/v5"))
-    (native-inputs
-     (list go-github-com-dgraph-io-badger-v4
-           go-github-com-fatih-color
-           go-github-com-gdamore-tcell-v2
-           go-github-com-h2non-filetype
-           go-github-com-maruel-natural
-           go-github-com-mattn-go-isatty
-           go-github-com-pkg-errors
-           go-github-com-rivo-tview
-           go-github-com-sirupsen-logrus
-           go-github-com-spf13-cobra
-           go-github-com-stretchr-testify
-           go-github-com-ulikunitz-xz
-           go-golang-org-x-sys
-           go-golang-org-x-text
-           go-gopkg-in-yaml-v3
-           go-modernc-org-sqlite))
-    (home-page "https://github.com/dundee/gdu")
-    (synopsis "Disk usage analyzer")
-    (description "Gdu is a disk usage analyzer written in Go.  It is intended
-primarily for SSD disks where it can fully utilize parallel processing, but it
-also works on HDDs.")
-    (license license:expat)))
-
 (define-public gpart
  ;; The latest (0.3) release is from 2015 and is missing a crash fix.
  (let ((commit "ec03350a01ad69708b5a3e2d47b8e002b0eba6c9")
@@ -1276,7 +1231,7 @@ passphrases.")
 (define-public ndctl
  (package
    (name "ndctl")
-    (version "84")
+    (version "78")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1285,7 +1240,7 @@ passphrases.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0jal7w4mk5l5j0qfays27kya8n1h2qwkncl0s317rfxp56bkjp6y"))))
+                "0rhmxjajxxslsikixlf9cdg5vcn42h7zzqkqj5p5pshxch368kn0"))))
    (build-system meson-build-system)
    (arguments
     ;; The test suite runs but SKIPs all tests: do not consider this tested!
@@ -549,7 +549,6 @@ when coding custom template tags.")
       (uri (git-reference
             (url "https://github.com/jazzband/django-taggit")
             (commit version)))
-       (file-name (git-file-name name version))
       (sha256
        (base32
         "1i8an3wcl7nygl5f565jcpyhyws9gabawazggxpf6m3vklxn3cj0"))))
@@ -75,8 +75,7 @@
       (uri (string-append "https://github.com/ldc-developers/ldc/releases"
                           "/download/v" version "/ldc-" version "-src.tar.gz"))
       (sha256
-        (base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))
-       (patches (search-patches "ldc-i686-int128-alignment.patch"))))
+        (base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))))
    (build-system cmake-build-system)
    (arguments
     `(#:disallowed-references (,tzdata-for-tests)
@@ -108,7 +107,9 @@
           (lambda _
             (invoke "cmake" "--install" "."))))))
    (inputs
-     `(("zlib" ,zlib)))
+     `(("libconfig" ,libconfig)
+       ("libedit" ,libedit)
+       ("zlib" ,zlib)))
    (native-inputs
     `(("lld-wrapper" ,(make-lld-wrapper lld-17 #:lld-as-ld? #t))
       ("llvm" ,llvm-17)
@@ -685,7 +686,6 @@ needed.")
                 (lambda* (#:key tests? #:allow-other-keys)
                   (when tests?
                     (invoke "bin/rdmd" "rdmd_test.d" "bin/rdmd"
-                             "-m" (if #$(target-64bit?) "64" "32")
                             "--rdmd-default-compiler" "ldmd2"))))
               (replace 'install
                 (lambda* (#:key outputs #:allow-other-keys)
@@ -1,13 +1,12 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2015-2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2016 Nikita <nikita@n0.is>
 ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2016, 2019-2021 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
 ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
@@ -22,11 +21,9 @@
 ;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
-;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
-;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -49,12 +46,12 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages check)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages databases)
-  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages freedesktop)
@@ -68,7 +65,6 @@
  #:use-module (gnu packages libidn)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages lua)
-  #:use-module (gnu packages m4)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages nettle)
  #:use-module (gnu packages networking)
@@ -77,8 +73,6 @@
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages protobuf)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages ragel)
  #:use-module (gnu packages serialization)
@@ -90,175 +84,17 @@
  #:use-module (gnu packages web)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix download)
  #:use-module (guix gexp)
-  #:use-module (guix git-download)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
-  #:use-module (guix utils))
-
-(define-public adns
-  (package
-    (name "adns")
-    (version "1.6.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
-              (commit (string-append "adns-" version))))
-       (sha256
-        (base32
-         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      ;; INFO: Tests expect real name resolution to work.
-      #:tests? #f
-      #:configure-flags
-      #~(list
-         ;; Make sure the programs under bin/ find libadns.so.
-         (string-append "LDFLAGS=-Wl,-rpath -Wl,"
-                        #$output:out
-                        "/lib"))))
-    (native-inputs
-     (list m4))
-    (home-page "https://www.gnu.org/software/adns/")
-    (synopsis "Asynchronous DNS client library and utilities")
-    (description
-     "GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
-Name System} resolution functionality.  The library is asynchronous, allowing
-several concurrent calls.  The package also includes several command-line
-utilities for use in scripts.")
-    (license license:gpl3+)))
-
-(define-public c-ares
-  (package
-    (name "c-ares")
-    (version "1.34.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/c-ares/c-ares/releases/download/v"
-             version "/" name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'filter-live-tests
-            (lambda _
-              ;; Filter tests that require internet access.
-              (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
-          #$@(if (system-hurd?)
-                 #~((add-after 'unpack 'skip-tests
-                      (lambda _
-                        (substitute* "test/ares-test-main.cc"
-                          (("(^| )main *\\(.*" all)
-                           (string-append all "  exit (77);\n")))))
-                    (add-after 'filter-live-tests 'filter-hurd-tests
-                      (lambda _
-                        (setenv "GTEST_FILTER"
-                                (string-append
-                                 (getenv "GTEST_FILTER")
-                                 ":.*Basic/2"
-                                 ":.*CancelImmediate/2"
-                                 ":.*CancelImmediateGetHostByAddr/2"
-                                 ":.*CancelLater/1"
-                                 ":.*FamilyUnspecified/2"
-                                 ":.*FamilyV6/2"
-                                 ":.*GetAddrInfoParallelLookups/1"
-                                 ":.*GetHostByAddrDestroy/2"
-                                 ":.*GetHostByNameCNAMENoData/2"
-                                 ":.*GetHostByNameDestroyAbsolute/2"
-                                 ":.*GetHostByNameDestroyRelative/2"
-                                 ":.*GetHostByNameParallelLookups/1"
-                                 ":.*HostAlias/2"
-                                 ":.*HostAliasMissing/2"
-                                 ":.*HostAliasMissingFile/2"
-                                 ":.*NotImplResponse/2"
-                                 ":.*RefusedResponse/2"
-                                 ":.*Resend/1"
-                                 ":.*RetryWithoutEDNS/2"
-                                 ":.*SearchDomains/2"
-                                 ":.*SearchDomainsBare/2"
-                                 ":.*SearchDomainsServFailOnAAAA/2"
-                                 ":.*SearchDomainsWithResentReply/1"
-                                 ":.*SearchHighNdots/2"
-                                 ":.*SearchNoDataThenFail/2"
-                                 ":.*SearchNoDataThenNoDataBare/2"
-                                 ":.*SearchNoDataThenSuccess/2"
-                                 ":.*ServFailResponse/2"
-                                 ":.*SimpleQuery/2"
-                                 ":.*SockCallback/2"
-                                 ":.*SockConfigureCallback/2"
-                                 ":.*SortListV4/2"
-                                 ":.*SortListV6/2"
-                                 ":.*ThirdServer/2"
-                                 ":.*TruncationRetry/1"
-                                 ":.*UnspecifiedFamilyCname6A4/2"
-                                 ":.*UnspecifiedFamilyV4/2"
-                                 ":.*UnspecifiedFamilyV6/2")))))
-                 #~()))))
-    (native-inputs
-     (list pkg-config))
-    (home-page "https://c-ares.haxx.se/")
-    (synopsis "C library for asynchronous DNS requests")
-    (description
-     "C-ares is a C library that performs DNS requests and name resolution
-asynchronously.  It is intended for applications which need to perform DNS
-queries without blocking, or need to perform multiple DNS queries in parallel.
-The primary examples of such applications are servers which communicate with
-multiple clients and programs with graphical user interfaces.")
-    (license (license:x11-style "https://c-ares.haxx.se/license.html"))))
-
-(define-public c-ares-for-node-lts
-  (hidden-package c-ares))
-
-(define-public c-ares-for-node-bootstrap
-  (hidden-package
-   (package
-     (inherit c-ares)
-     (version "1.18.1")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-              "https://c-ares.haxx.se/download/c-ares-" version
-              ".tar.gz"))
-        (sha256
-         (base32
-          "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
-
-;; INFO: gRPC requires a c-ares built with CMake in order to get the .cmake
-;; modules.  We can not build c-ares itself with CMake because that would
-;; introduce a circular dependency through nghttp2.
-;;
-;; TODO: It would be nice if we could extract the modules somehow and make
-;; them work with the "normal" c-ares package instead of building a whole new
-;; library.
-(define-public c-ares/cmake
-  (hidden-package
-   (package
-     (inherit c-ares)
-     (build-system cmake-build-system)
-     (arguments
-      (list
-       ;; INFO: Tests require name resolution (the normal variant runs no
-       ;; tests).
-       #:tests? #f)))))
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson))

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

-(define-public ddclient
-  (package
-    (name "ddclient")
-    (version "4.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ddclient/ddclient")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0sz4f7qx4yjg6q6ybhzilb7f0kshz46c54y3i4hq2nww2bhkc8a4"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'bootstrap 'patch-ddclient.in-shebang
-            (lambda _
-              ;; This is run in the bootstrap phase, so patch before
-              (patch-shebang "ddclient.in")))
-          (add-after 'install 'wrap-program
-            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-program (string-append #$output "/bin/ddclient")
-                `("PERL5LIB" ":" prefix
-                  ,(map (lambda (input-name)
-                          (string-append (assoc-ref inputs input-name)
-                                         "/lib/perl5/site_perl"))
-                        '("perl-json")))))))))
-    (native-inputs
-     (list autoconf
-           automake
-           perl-http-daemon
-           perl-plack
-           perl-test-mockmodule
-           perl-test-tcp
-           perl-test-warnings))
-    (inputs
-     (list curl
-           perl
-           perl-json
-           bash-minimal))
-    (home-page "https://github.com/ddclient/ddclient")
-    (synopsis "Dynamic DNS update client")
-    (description
-     "ddclient is used to update dynamic DNS entries for accounts on many
-dynamic DNS services.  It supports a wide range of routers and protocols,
-including Cloudflare, Namecheap, DynDNS, FreeDNS, Google Domains, and many
-more.")
-    (license license:gpl2+)))
-
 (define-public ldns
  (package
    (name "ldns")
@@ -554,39 +338,6 @@ and BOOTP/TFTP for network booting of diskless machines.")
    ;; Source files only say GPL2 and GPL3 are allowed.
    (license (list license:gpl2 license:gpl3))))

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

@@ -4,7 +4,7 @@
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2018-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
 ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -385,7 +385,7 @@ not have any other specialized device.")
 (define-public openboard
  (package
    (name "openboard")
-    (version "1.7.7")
+    (version "1.7.3")
    (source
     (origin
       (method git-fetch)
@@ -394,7 +394,7 @@ not have any other specialized device.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1i27h84p77pl1chw791fjs3vyzsjvsqc9ky2mbw7g8xpzxz1nd9j"))))
+        (base32 "1098pys5p82sx97xrhw54vlkn6jly0rhq8b09grmmx2h4mcpj2i2"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -240,8 +240,8 @@ are also taken from the original.")
      (license license:gpl3+))))

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

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

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

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

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

 (define-public sby-gui
-  (let ((commit "0a89301bf347c9f42932186e49ba2c0014ff3661")
-        (revision "1"))
+  (let ((commit "6c977084c17c4842c504829c6d455a07d67e119c")
+        (revision "0"))
    (package
      (name "sby-gui")
      (version (git-version "0" revision commit))
@@ -4304,13 +4303,10 @@ front-end program for Yosys-based formal hardware verification flows.")
                (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "1zp2c7zqclsfvl5xhb8zlc1dclp2s36w2nd0x80fazsxp7ksw5gr"))))
+          (base32 "137x3s5mwbzlcv2p6671ijvbafzwhxpvszzfi9wifq0wcli6cxxg"))))
      (build-system qt-build-system)
      (arguments
-       (list
-        #:qtbase qtbase                 ;for Qt 6
-        #:tests? #f))                   ;no tests
-      (native-inputs (list python-minimal-wrapper))
+       (list #:tests? #f))               ;no tests
      (propagated-inputs (list sby))
      (home-page "https://github.com/YosysHQ/sby-gui/")
      (synopsis "Graphical user interface for code{sby}")
@@ -4665,7 +4661,7 @@ parallel computing platforms.  It also supports serial execution.")
 (define-public yosys
  (package
    (name "yosys")
-    (version "0.64")
+    (version "0.63")
    (source
     (origin
       (method git-fetch)
@@ -4673,7 +4669,7 @@ parallel computing platforms.  It also supports serial execution.")
              (url "https://github.com/YosysHQ/yosys")
              (commit (string-append "v" version))))
       (sha256
-        (base32 "13gw5msk1kv05jkb330nybvx2s0ixm6l6mdpyapnqmv3lkhby1mj"))
+        (base32 "1iaafzsc0pbd61m5hh12nzr2z4rn4n7i68l6ij9vli4m5zsxw39k"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (outputs '("out" "doc"))
@@ -4786,12 +4782,12 @@ parallel computing platforms.  It also supports serial execution.")
              (git-reference
                (url "https://github.com/povik/yosys-slang")
                ;; No tags, nor releases.
-                (commit "4e53d772996184b07e9bfe784060f96e6cb0a267")
+                (commit "d82b0b163a725fc1a401fbb6b465cd862517ec1f")
                (recursive? #t)))  ;requires slang and fmt
             (file-name "yosys-slang")
             (sha256
              (base32
-               "1jjr1b6xd1sr9fkyfyl4y2wkzl51m7g10bw97mnw81v2mzssrs2q")))))
+               "07h4qssphggd4mbn376vldqwzj1i16y1ix455xzr4lgx6s2q9ryg")))))
    ;; Optional dependencies increase considerably package closure.
    ;; - gtkwave: required only for vcd2fst binary, used by ‘sim’ command.
    ;; - graphviz, xdot: used by ‘show’ command to display schematics.
@@ -290,7 +290,7 @@ based upon the Common Locale Data Repository (CLDR).")
  (package
    (inherit elixir-ex-cldr-minimal)
    (name "elixir-ex-cldr")
-    (version "2.47.2")
+    (version "2.43.2")
    (source
     (origin
       ;; The hex.pm package ships only the en locale.
@@ -300,7 +300,7 @@ based upon the Common Locale Data Repository (CLDR).")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1rivy61aq0c9zfklm4bpvvkj7lzjgy316rwxl8qz92xqp6xa292y"))))
+        (base32 "1wgwp74ya0gkvd5pk4qv9s38p85r5yw370y4wv7jywy3hrbrj9f5"))))
    (arguments
     (list
      #:phases
@@ -303,17 +303,7 @@ purposes.  Its goal is to be as close as possible to
     (list
      #:test-flags
      ;; These tests require network access to badssl.com.
-      #~(list "--exclude" "network")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'make-reproducible
-            (lambda _
-              ;; Buffer size has been increased in OTP 28+. For more info see:
-              ;; https://github.com/erlang/otp/issues/9722#issuecomment-2808683303
-              (substitute* "test/httpoison_test.exs"
-                (("stream/20") "stream/100")
-                (("<= expected_length") "<= expected_length * 1.1")
-                ((">= max_length") ">= max_length * 0.9")))))))
+      #~(list "--exclude" "network")))
    (native-inputs
     (list erlang-cowboy
           elixir-earmark
@@ -164,8 +164,7 @@ Mix.CLI.main()"
                       '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
                   programs))))))))
    (outputs '("out" "src"))
-    (inputs (list bash-minimal erlang rebar3))
-    (native-inputs (list git-minimal))
+    (inputs (list bash-minimal erlang rebar3 git))
    (native-search-paths
     (list (search-path-specification
            (variable "GUIX_ELIXIR_LIBS")
@@ -644,6 +644,32 @@ editor (console only)")
    (description "This Emacs build implements graphical UI purely in terms
 of GTK.")))

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

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

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

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

 (define-public cc-tool
  (package
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@worcester.edu>
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017-2024, 2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
@@ -3247,14 +3247,14 @@ that compiles to WebAssembly.")
 (define-public scummvm
  (package
    (name "scummvm")
-    (version "2026.2.0")
+    (version "2.9.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
                           "/scummvm-" version ".tar.xz"))
       (sha256
-        (base32 "1wv0z9c4dnjywgla9zhbkgnzahj829ybvcx9jw67hdmagnbys42f"))))
+        (base32 "1qspqawdazsxisxm1lxzgi0i4gx54qd10xyk3nmmirwxz9mg70ka"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -3452,7 +3452,7 @@ This is a part of the TiLP project.")
 (define-public mame
  (package
    (name "mame")
-    (version "0.287")
+    (version "0.252")
    (source
     (origin
       (method git-fetch)
@@ -3461,16 +3461,16 @@ This is a part of the TiLP project.")
             (commit (apply string-append "mame" (string-split version #\.)))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1p9v71gvaqiyj6sa1b0wkdksa9wnr6yr2a43ckycljjfas5s36kq"))
+        (base32 "07qhcm1v47sy2wj30nx3cbhvcbgki0cl83gabr0miiw60fhgyn6j"))
       (modules '((guix build utils)))
       (snippet
        ;; Remove bundled libraries.
        '(begin
           (with-directory-excursion "3rdparty"
             (for-each delete-file-recursively
-                       '("asio" "expat" "glm" "flac" "libjpeg" "lua"
-                         "portaudio" "portmidi" "pugixml" "rapidjson"
-                         "sqlite3" "utf8proc" "zlib")))))))
+                       '("asio" "expat" "glm" "libflac" "libjpeg" "lua"
+                         "portaudio" "portmidi" "pugixml" "rapidjson" "SDL2"
+                         "SDL2-override" "sqlite3" "utf8proc" "zlib")))))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -3604,9 +3604,7 @@ This is a part of the TiLP project.")
           libjpeg-turbo
           libxi
           libxinerama
-           ;; MAME requires Lua compiled as C++ to work correctly.
-           ;; See https://www.mamedev.org/?p=523
-           lua-5.4-for-c++
+           lua
           portaudio
           portmidi
           pugixml
@@ -50,7 +50,6 @@
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Daniel Khodabakhsh <d@niel.khodabakh.sh>
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
-;;; Copyright © 2026 Brent Wedderburn <mb@bean.za.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -254,21 +253,13 @@ their devices.")
          (replace 'build (assoc-ref gnu:%standard-phases 'build))
          (replace 'check (assoc-ref gnu:%standard-phases 'check))
          (replace 'install
-            (lambda _
-              (let* ((bin (string-append #$output "/bin"))
-                     (share (string-append #$output "/share"))
-                     (apps (string-append share "/applications"))
-                     (icons (string-append share "/icons/hicolor/128x128/apps")))
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((bin   (string-append #$output "/bin"))
+                    (share (string-append #$output "/share/librecad")))
                (mkdir-p bin)
                (install-file "unix/librecad" bin)
                (mkdir-p share)
-                (copy-recursively "unix/resources"
-                                  (string-append share "/librecad"))
-                (mkdir-p apps)
-                (install-file "desktop/librecad.desktop" apps)
-                (mkdir-p icons)
-                (copy-file "librecad/res/main/librecad.png"
-                           (string-append icons "/librecad.png"))))))))
+                (copy-recursively "unix/resources" share)))))))
    (inputs
     (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
    (native-inputs
@@ -2730,7 +2721,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
 (define-public freecad
  (package
    (name "freecad")
-    (version "1.1.1")
+    (version "1.1.0")
    (source
     (origin
       (method git-fetch)
@@ -2740,7 +2731,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
             (recursive? #t)))          ;needed for the AddonManager
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05dx7ifx33705mxb0vc82j0mzzkazakgadfgq5bws30qrxp49xgg"))
+        (base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
       (snippet
        #~(begin
            (use-modules (guix build utils))
@@ -50,7 +50,7 @@
 (define-public erlang
  (package
    (name "erlang")
-    (version "28.4.3")
+    (version "27.3.4.6")
    (source (origin
              (method git-fetch)
              ;; The tarball from http://erlang.org/download contains many
@@ -62,7 +62,7 @@
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1dsdmp2rccc0rhzy2w8r4amxmc6nr9hbi053j2s0bg9db30b48rc"))
+                "0dhz2c7w28ss0ypj7jh88pfs3kc8hbwiiq91in1j2miy5sn4cp3x"))
              (patches (search-patches "erlang-man-path.patch"))))
    (build-system gnu-build-system)
    (native-inputs
@@ -75,7 +75,7 @@
                               "/OTP-" version "/otp_doc_man_" version ".tar.gz"))
           (sha256
            (base32
-             "1g17wzv8j12g9272yvv55nj4wqs09hxkv3i0vnp7d6gcs24bmphi"))))))
+             "1j1fcli7ma9vi4qyv67lq7yiznhpnfvcmh57bn8qxvha6ky2pngm"))))))
    (inputs
     (list ncurses openssl wxwidgets))
    (propagated-inputs
@@ -186,7 +186,7 @@ testing InfiniBand networks.")
 (define-public ucx
  (package
    (name "ucx")
-    (version "1.20.0")
+    (version "1.19.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -196,7 +196,7 @@ testing InfiniBand networks.")
              (patches (search-patches "ucx-tcp-iface-ioctl.patch"))
              (sha256
               (base32
-                "12w1mxacml1w8zvl1hpn786cs77y056b9hxv7q1kq482bgc2si0v"))
+                "12j9200iyg6d0yr84r25hcpq8qqzfaa08klbhvgrqpflpfcljz4z"))
              (snippet
               ;; As seen in commit b0a275a5492125a13020cd095fe9934e0b5e7c6a.
               #~(begin (use-modules (guix build utils))
@@ -220,7 +220,6 @@ testing InfiniBand networks.")
                           "--disable-assertions"
                           "--disable-params-check"

-                           "--enable-mt"
                           (string-append "--with-verbs="
                                          #$(this-package-input "rdma-core"))

@@ -34,7 +34,6 @@
  #:use-module (gnu packages anthy)
  #:use-module (gnu packages boost)
  #:use-module (gnu packages compression)
-  #:use-module (gnu packages cpp)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages dictionaries)
@@ -96,7 +95,7 @@ client.")
 (define-public fcitx5
  (package
    (name "fcitx5")
-    (version "5.1.19")
+    (version "5.1.16")
    (source
     (origin
       (method url-fetch)
@@ -104,14 +103,9 @@ client.")
             "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
             version "_dict.tar.zst"))
       (sha256
-        (base32 "1ngsadqdrwy99w63dmk493gg56j7r991v6pq1nwkx6apib9ykpc0"))
-       (snippet
-        #~(begin
-            (use-modules (guix build utils))
-            (delete-file-recursively "third_party")))))
+        (base32 "0lwp90wjrkiws121rqn9kzdz6p1ncsk18dkmbv0zi37yqx2mv180"))))
    (arguments
-     (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF"
-                                     "-DUSE_SYSTEM_YOGA=ON")))
+     (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF")))
    (build-system cmake-build-system)
    (inputs
     (list cairo
@@ -124,12 +118,12 @@ client.")
           gettext-minimal
           glib
           iso-codes/pinned
+           json-c
           libevent
           libuv
           libxcb
           libxkbcommon
           libxkbfile
-           nlohmann-json
           pango
           `(,util-linux "lib")         ;For libuuid.
           wayland
@@ -138,8 +132,7 @@ client.")
           xcb-util
           xcb-util-keysyms
           xcb-util-wm
-           xkeyboard-config
-           yoga))
+           xkeyboard-config))
    (native-inputs
     (list extra-cmake-modules
           zstd
@@ -148,11 +141,6 @@ client.")
     (list (search-path-specification
            (variable "FCITX_ADDON_DIRS")
            (files '("lib/fcitx5")))
-           (search-path-specification
-            (variable "GUIX_GTK2_IM_MODULE_FILE")
-            (file-type 'regular)
-            (separator #f)
-            (files '("lib/gtk-2.0/2.10.0/immodules-gtk2.cache")))
           (search-path-specification
            (variable "GUIX_GTK3_IM_MODULE_FILE")
            (file-type 'regular)
@@ -166,7 +154,7 @@ client.")
 (define-public fcitx5-lua
  (package
    (name "fcitx5-lua")
-    (version "5.0.16")
+    (version "5.0.15")
    (source
     (origin
       (method url-fetch)
@@ -174,7 +162,7 @@ client.")
             "https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
             version ".tar.zst"))
       (sha256
-        (base32 "1zjiyadhqq8hijjv09khyj2shaw3ri4jgmb1ql67w9366wd0ykj2"))))
+        (base32 "1yp5z97m8n7fwvxps1gn8pflg69j3yawgabz36bpd4wl43zkgchg"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -183,7 +171,7 @@ client.")
    (inputs
     (list fcitx5 lua gettext-minimal))
    (native-inputs
-     (list extra-cmake-modules pkg-config))
+     (list extra-cmake-modules))
    (home-page "https://github.com/fcitx/fcitx5-lua")
    (synopsis "Lua support for Fcitx 5")
    (description "Fcitx5-lua allows writing Fcitx5 extension in Lua.")
@@ -192,14 +180,14 @@ client.")
 (define-public libime
  (package
    (name "libime")
-    (version "1.1.14")
+    (version "1.1.12")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
                           version "_dict.tar.zst"))
       (sha256
-        (base32 "17r54fd6whvcxn389k4ah9mj1fc61zgama5nhiv1ilx40n1hnnpv"))))
+        (base32 "02n6xbbxfckzx5sqrclnh4cvqlnj9c5rpys07kd8r8m51paqzigq"))))
    (build-system cmake-build-system)
    (inputs
     (list fcitx5 boost (list zstd "lib")))
@@ -214,7 +202,7 @@ editors.")
 (define-public fcitx5-gtk
  (package
    (name "fcitx5-gtk")
-    (version "5.1.6")
+    (version "5.1.4")
    (source
     (origin
       (method url-fetch)
@@ -222,7 +210,7 @@ editors.")
                           "/fcitx5-gtk/fcitx5-gtk-"
                           version ".tar.zst"))
       (sha256
-        (base32 "0qj5gjdnrxcyz6a455b4379iwnzazw5a6c6dyk6wz0d2bgainc75"))))
+        (base32 "0lwl17mbfm3pxpd3y7h4sxf77npr16hyzygrc7a6v26bx6ycbkqx"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -336,7 +324,7 @@ IM module for GTK+3 applications.
 (define-public fcitx5-qt
  (package
    (name "fcitx5-qt")
-    (version "5.1.13")
+    (version "5.1.11")
    (source
     (origin
       (method url-fetch)
@@ -344,7 +332,7 @@ IM module for GTK+3 applications.
                           "/fcitx5-qt/fcitx5-qt-"
                           version ".tar.zst"))
       (sha256
-        (base32 "1yawhwnycrqp1flik3hc2vskvsyjfm6rkcdhsqnawix22r2n1wl0"))))
+        (base32 "0mc396zfafs34jraj9fdk0wyzvdzg4xi605rhrd492xcpf25b59v"))))
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags
@@ -375,7 +363,7 @@ for Qt based application.")
 (define-public fcitx5-anthy
  (package
    (name "fcitx5-anthy")
-    (version "5.1.10")
+    (version "5.1.8")
    (source
     (origin
       (method url-fetch)
@@ -383,7 +371,7 @@ for Qt based application.")
                           "/fcitx5-anthy/fcitx5-anthy-"
                           version ".tar.zst"))
       (sha256
-        (base32 "11h7b687xj2k1hp7dqj6wh5y6i55cm8m5pqbi5vbflgg0cy5v1mp"))))
+        (base32 "1kv930nxz6q8ijb319fnnkzdyigbi36f2cwijnv4sy3rd0nykxrv"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f)) ;; no tests
@@ -399,7 +387,7 @@ the Anthy input method.")
 (define-public fcitx5-skk
  (package
    (name "fcitx5-skk")
-    (version "5.1.10")
+    (version "5.1.8")
    (source
     (origin
       (method git-fetch)
@@ -408,14 +396,14 @@ the Anthy input method.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1fjiyx6dyiqxlypr1k4024lnc077xsnx4qwrwx9hj3yjdni5f2p0"))))
+        (base32 "11h6y7rv6yppp7iy8csy7r2pi2mlnjgl8h4h8ghfwab1gm7v32fn"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f      ; no tests
           #:configure-flags
-           #~(list (string-append "-DSKK_PATH="
+           #~(list (string-append "-DSKK_DEFAULT_PATH="
                                  #$(this-package-input "skk-jisyo")
-                                  "/share/skk"))))
+                                  "/share/skk/SKK-JISYO.L"))))
    (native-inputs
     (list extra-cmake-modules gobject-introspection
           pkg-config gettext-minimal))
@@ -435,14 +423,14 @@ backend.")
 (define-public fcitx5-unikey
  (package
    (name "fcitx5-unikey")
-    (version "5.1.10")
+    (version "5.1.8")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/fcitx/fcitx5-unikey")
                    (commit version)))
              (sha256
-               (base32 "1ddg5648r8jbdr8khawfhl26020snvrlgjwppw5rlh4iw3a4m143"))
+               (base32 "1nai5v6r367iwj8yxg4flv41my57l88l9vy0id9wr3hvrvls9v31"))
              (file-name (git-file-name name version))))
    (build-system qt-build-system)
    (arguments
@@ -462,14 +450,14 @@ backend.")
 (define-public fcitx5-chewing
  (package
    (name "fcitx5-chewing")
-    (version "5.1.11")
+    (version "5.1.9")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/fcitx/fcitx5-chewing")
                    (commit version)))
              (sha256
-               (base32 "1x4a4vcb7vg9dx0f2bjrb2v6dcr8cwxnm8gdd47fkxqn890rgrnc"))
+               (base32 "1mgpxvmxfbqy8gymdsdmspgknh0pc751dm5rsrvdvfbd5lsa6pn6"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -491,7 +479,7 @@ backend.")
 (define-public fcitx5-chinese-addons
  (package
    (name "fcitx5-chinese-addons")
-    (version "5.1.12")
+    (version "5.1.10")
    (source
     (origin
       (method url-fetch)
@@ -499,7 +487,7 @@ backend.")
                           "/fcitx5-chinese-addons/fcitx5-chinese-addons-"
                           version "_dict.tar.zst"))
       (sha256
-        (base32 "09kk8r6pcxjhivwv4z5cdv2pqy0ry8ngnfbrcmwagzyq2jq9p2cr"))))
+        (base32 "11gnywigqys3gndb175nxk10k1ld3xvwd6kggqnxs95imc2004dd"))))
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags
@@ -552,7 +540,7 @@ including input methods previous bundled inside Fcitx 4:
 (define-public fcitx5-configtool
  (package
    (name "fcitx5-configtool")
-    (version "5.1.13")
+    (version "5.1.11")
    (source
     (origin
       (method url-fetch)
@@ -560,7 +548,7 @@ including input methods previous bundled inside Fcitx 4:
             "https://download.fcitx-im.org/fcitx5"
             "/fcitx5-configtool/fcitx5-configtool-" version ".tar.zst"))
       (sha256
-        (base32 "1sr8ri68qbkgvnj9pr5yw680zq506h26ymfmyz7ihw5ri14a6klr"))))
+        (base32 "1c5pw6p33z7lyk16jr1w72snazdc4q83ywn0gsk68qgmmfql5qr1"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -673,7 +661,7 @@ for Fcitx 5 with following color variants:
 (define-public fcitx5-rime
  (package
    (name "fcitx5-rime")
-    (version "5.1.13")
+    (version "5.1.12")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://download.fcitx-im.org/fcitx5"
@@ -681,7 +669,7 @@ for Fcitx 5 with following color variants:
                                  ".tar.zst"))
              (sha256
               (base32
-                "03wcdgdhkvw5341vjv3idyksykm65y0873vkcrsi16dsp8w0h7i8"))))
+                "1blqfk8zpzd5v2r7gwjy12jbnsh26pcvad8q4mmhlg5j10yppg03"))))
    (build-system cmake-build-system)
    (arguments
     '(#:tests? #f ;no tests
@@ -712,7 +700,7 @@ output.")
 (define-public fcitx5-hangul
  (package
    (name "fcitx5-hangul")
-    (version "5.1.9")
+    (version "5.1.7")
    (source
     (origin
       (method git-fetch)
@@ -721,7 +709,7 @@ output.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0ja5faara4xz8waccpa5gbi3prh02hh3gpf915czhbkihffby6ng"))))
+        (base32 "02lkbwg25jr4hazjyxcy69midfsmxc0ksbdrfwbmqcfa3kz5d9gb"))))
    (build-system cmake-build-system)
    (native-inputs (list extra-cmake-modules pkg-config gettext-minimal))
    (inputs (list fcitx5 libhangul))
@@ -762,7 +762,7 @@ from a mounted file system.")
  ;; completions by running a native bcachefs binary at build time.
  (package
    (name "bcachefs-tools-minimal")
-    (version "1.37.4")
+    (version "1.35.1")
    (source
     (origin
       (method git-fetch)
@@ -771,7 +771,7 @@ from a mounted file system.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "17041jphzbg0ppxlc1acr3d73zyn02spjvi5my30wak8xh9n6nan"))))
+        (base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -969,13 +969,20 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
 (define-public bcachefs-linux-module
  (package
    (name "bcachefs-linux-module")
-    (version (package-version bcachefs-tools-minimal))
-    (source (package-source bcachefs-tools-minimal))
+    (version "1.35.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://evilpiepirate.org/git/bcachefs-tools.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
    (build-system linux-module-build-system)
    (arguments
     (list
-      #:make-flags #~(list "BCACHEFS_DKMS=1")
-      #:tests? #f                       ;no 'check' target
+      #:tests? #f ;no 'check' target
      #:source-directory "build/src/fs/bcachefs"
      #:phases
      #~(modify-phases %standard-phases
@@ -984,14 +991,18 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
              (with-output-to-file ".version"
                (lambda ()
                  (display #$version)))))
-          (add-before 'configure 'prepare-build-directory
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (apply invoke "make" "install_dkms"
-                     (string-append "DESTDIR="
-                                    (getcwd) "/")
-                     "DKMSDIR=build/"
-                     make-flags))))))
-    (home-page (package-home-page bcachefs-tools-minimal))
+          (add-after 'unpack 'patch-source
+            (lambda _
+              (substitute* "Makefile"
+                ;; Remove unnecessary dependencies
+                (("^.*PKG_CONFIG.*$")
+                 ""))))
+          (add-before 'configure 'prepare-build-dir
+            (lambda _
+              (invoke "make" "install_dkms"
+                      (string-append "DESTDIR="
+                                     (getcwd) "/") "DKMSDIR=build/"))))))
+    (home-page (package-home-page bcachefs-tools-minimal/static))
    (synopsis "Bcachefs Linux kernel module")
    (description
     "This package provides the Linux kernel module for Bcachefs.
@@ -2202,7 +2213,7 @@ while working with large number of files.")
 (define-public squashfuse
  (package
    (name "squashfuse")
-    (version "0.6.1")
+    (version "0.1.105")
    (source
     (origin
       (method git-fetch)
@@ -2211,7 +2222,7 @@ while working with large number of files.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "16ds2xlk6hb5cggi6di8s0aalir3mrx7rk24rw5daad1xw4dbq0y"))))
+        (base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2249,8 +2260,7 @@ memory-efficient.")
                 (install-file "fuseprivate.h"
                               (string-append #$output
                                              "/include/squashfuse/")))))))))
-    (inputs (list `(,fuse "out")
-                  `(,fuse "static")
+    (inputs (list fuse-for-appimage
                  `(,zstd "lib")
                  `(,zstd "static")
                  `(,zlib "out")
@@ -165,7 +165,7 @@
  ;; <https://bitcoincore.org/en/lifecycle/#schedule>.
  (package
    (name "bitcoin-core")
-    (version "31.0")
+    (version "30.2")
    (source (origin
              (method url-fetch)
              (uri
@@ -173,7 +173,7 @@
                              version "/bitcoin-" version ".tar.gz"))
              (sha256
               (base32
-                "1qxkcyq8nwq6sw4qi660z8n8356mqdsf4jvpq5ndkvrsx9gfz80b"))))
+                "1jw4djh22v0nih0n7irdbknfbqavlc4l3b8176b5qgc88a60pl3g"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -197,7 +197,9 @@
                    "python3" "./test/functional/test_runner.py" "--timeout-factor=2"
                    (string-append "--jobs=" (number->string (parallel-job-count)))))))))
    (native-inputs
-     (list pkg-config
+     (list bash ; provides the sh command for system_tests
+           coreutils ; provides the cat, echo and false commands for system_tests
+           pkg-config
           python ; for the tests
           python-pyzmq ; for the tests
           qttools))
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2016, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
@@ -84,6 +84,7 @@
  #:use-module (gnu packages linux)
  #:use-module (gnu packages mtools)
  #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages pciutils)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
@@ -523,6 +524,162 @@ Loke and Heimdall communicate via the custom Samsung-developed protocol typicall
 referred to as the \"Odin 3 protocol\".")
    (license license:expat)))

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

+(define-public font-cozette
+  (package
+    (name "font-cozette")
+    (version "1.13.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/slavfox/Cozette")
+                     (commit (string-append "v." version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "178i812n4sfsvid7jhnm683jlxqmrv4ck6qbb4nwyllhwg3gyq60"))))
+    (build-system font-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'dont-depend-on-git
+           (lambda _
+             (substitute* "build.py"
+               ;; Merely importing this module requires a git repository.
+               ;; We don't use get_changelog, so just disable the import.
+               (("from cozette_builder\\.changeloggen import get_changelog")
+                ""))))
+         (add-before 'install 'build
+           (lambda _
+             (invoke "python3" "build.py" "fonts"))))))
+    (native-inputs
+     (list fontforge
+           python
+           python-crayons
+           python-fonttools
+           python-numpy
+           python-pillow))
+    (home-page "https://github.com/slavfox/Cozette")
+    (synopsis "Bitmap programming font")
+    (description "Cozette is a 6x13px (bounding box) bitmap font based on Dina
+and heavily inspired by Creep.")
+    (license license:expat)))
+
 (define-public font-montserrat
  (package
    (name "font-montserrat")
@@ -5519,39 +5559,6 @@ technical and idiosyncratic feel—perfect for headers and pull-quotes.  Made to
 work well together with Mona Sans.")
    (license license:silofl1.1)))

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

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

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

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

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

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

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

 (define-public steam-devices-udev-rules
  ;; Last release from 2019-04-10
-  (let ((commit "7dde9ecb3c386363ecd9bd0a3b77e4756d200704")
-        (revision "2"))
+  (let ((commit "13443480a64fe8f10676606bd57da6de89f8ccb1")
+        (revision "1"))
    (package
      (name "steam-devices-udev-rules")
      (version (git-version "1.0.0.61" revision commit))
@@ -13511,7 +13391,7 @@ rules to solve permissions issues.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "0w0xkgi9fpvdbpl57f8fy2nwy2icm6iag39b8ifpkijlxgclx1p3"))))
+                  "0i086gmnk93q76sw1laa9br6b7zj2r6nrrw7d64y4q9wcrlxw2bi"))))
      (build-system copy-build-system)
      (arguments
       '(#:install-plan '(("./" "lib/udev/rules.d"
@@ -2936,7 +2936,7 @@ to the OSM opening hours specification.")
 (define-public josm
  (package
    (name "josm")
-    (version "19555")
+    (version "19539")
    (source (origin
              (method svn-fetch)
              (uri (svn-reference
@@ -2945,7 +2945,7 @@ to the OSM opening hours specification.")
                     (recursive? #f)))
              (sha256
               (base32
-                "0kpshdj8kf9ag7h1qqrh9jqc6c9iv8v369mk60a8g7cbzf0xpblw"))
+                "05kslpvdwl4fldjzl6m2kmqvbmjv5yvipfavg01l30ywhw2c7v7v"))
              (file-name (string-append name "-" version "-checkout"))
              (modules '((guix build utils)))
            (snippet
@@ -398,8 +398,7 @@ that is extensible via a plugin system.")
                        ;; environment, as it could cause Gimp to crash (see
                        ;; bug#77921).
                        `("GI_TYPELIB_PATH" prefix
-                          (,(getenv "GI_TYPELIB_PATH")
-                           ,(string-append #$output "/lib/girepository-1.0")))
+                          (,(getenv "GI_TYPELIB_PATH")))
                        `("GUIX_PYTHONPATH" prefix
                          (,(getenv "GUIX_PYTHONPATH")))
                        `("GDK_PIXBUF_MODULE_FILE" =
@@ -1,4 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16,8 +19,47 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gkrellm)
-  #:use-module (gnu packages monitoring)
-  #:use-module (guix deprecation))
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xorg))

-(define-deprecated/public-alias gkrellm
-  (@ (guix packages monitoring) gkrellm))
+(define-public gkrellm
+  (package
+    (name "gkrellm")
+    (version "2.3.11")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://gkrellm.srcbox.net/releases/gkrellm-"
+                          version ".tar.bz2"))
+      (sha256
+       (base32 "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gettext" ,gettext-minimal)
+       ("gtk+" ,gtk+-2)
+       ("libice" ,libice)
+       ("libsm" ,libsm)))
+    (native-inputs
+     (list pkg-config))
+    (arguments
+     `(#:tests? #f                      ; there is no check target
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))           ; no configure script
+       #:make-flags
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "INSTALLROOT=" out)
+               "CC=gcc"))))
+    (home-page "http://gkrellm.srcbox.net/")
+    (synopsis "System monitors")
+    (description
+     "GKrellM is a single process stack of system monitors which supports
+applying themes to match its appearance to your window manager, Gtk, or any
+other theme.")
+    (license license:gpl3+)))
@@ -39,7 +39,6 @@
  #:use-module (gnu packages bash)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
-  #:use-module (gnu packages ebook)
  #:use-module (gnu packages enchant)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
@@ -682,7 +681,7 @@ and a high score table.")
 (define-public komikku
  (package
    (name "komikku")
-    (version "50.1.0")
+    (version "1.99.0")
    (source
     (origin
       (method git-fetch)
@@ -692,7 +691,7 @@ and a high score table.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
+         "1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -741,10 +740,8 @@ and a high score table.")
           python-cloudscraper
           python-colorthief
           python-dateparser
-           python-ebooklib
           python-emoji
           python-keyring
-           python-jxlpy
           python-lxml
           python-magic
           python-natsort
@@ -780,7 +777,7 @@ developed with the aim of being used with the Librem 5 phone.")
 (define-public komikku-servers
  (package
    (name "komikku-servers")
-    (version "50.1.0")
+    (version "1.99.0")
    (source
     (origin
       (method git-fetch)
@@ -790,7 +787,7 @@ developed with the aim of being used with the Librem 5 phone.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
+         "1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
    (build-system copy-build-system)
    (arguments
     (list
@@ -1335,74 +1335,6 @@ animation of closing windowed applications.")
 GNOME Shell, including the top panel, dash and overview.")
    (license license:gpl3)))

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

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

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

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

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

-         (gnuzilla-commit "02125f31250c0240ee2ab1aa629ce66d4ffb9f30")
+         (gnuzilla-commit "10a8be3fcf725ed01ffb7279ec27c2fba55dd2d2")
         (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
-              "1hgx286gp0j46pklzzh5kvsnari1j3s0bff384m505m942k6l4hf"))))
+              "076s3zpq0cj24a2pjarb57k1xv9z45xazps8rgypzw8yc4pxi9rj"))))

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

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

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

 ;;; To regenerate, see the `format-locales' helper defined above.
@@ -1543,7 +1383,7 @@ preferences/advanced-scripts.dtd"
               ;; Extract the base Icecat tarball, renaming its top-level
               ;; directory.
               (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",")
-                       "-xf" #$icecat-140.9.1-source)
+                       "-xf" #$icecat-source)
               (chdir #$name)

               ;; Merge the Thunderdbird localization data.
@@ -181,7 +181,7 @@ collections like from @code{container/tree}.
     "This package provides a library for calling C functions from Go without
 Cgo.

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

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

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

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

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

-(define-public go-gopkg-in-h2non-gock-v1
-  (package/inherit go-github-com-h2non-gock
-    (name "go-gopkg-in-h2non-gock-v1")
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:import-path _) "gopkg.in/h2non/gock.v1")))))
-
 (define-public go-gopkg-in-go-playground-assert-v1
  (package
    (inherit go-github-com-go-playground-assert-v2)
@@ -31,7 +31,6 @@
 ;;; Copyright © 2025 Arthur Rodrigues <arthurhdrodrigues@proton.me>
 ;;; Copyright © 2025 Patrick Norton <patrick.147.norton@gmail.com>
 ;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
-;;; Copyright © 2026 Evgeny Pisemsky <mail@pisemsky.site>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1230,36 +1229,6 @@ MetroHash}, a high quality, high performance hash algorithm.")
     "This package provides a hashing function.")
    (license license:expat)))

-(define-public go-github-com-digitorus-pkcs7
-  (package
-    (name "go-github-com-digitorus-pkcs7")
-    (version "0.0.0-20250730155240-ffadbf3f398c")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/digitorus/pkcs7")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0snamp6fbg5vir0lsw5wzvyagrdd832lw6k7cnvcahcgp8l084zc"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/digitorus/pkcs7"))
-    (native-inputs
-     (list openssl))
-    (home-page "https://github.com/digitorus/pkcs7")
-    (synopsis "PKCS#7 implementation for Go")
-    (description
-     "This package implements parsing and generation of some
-PKCS#7/Cryptographic Message
-Syntax (@url{https://www.rfc-editor.org/rfc/rfc2315},
-@url{https://www.rfc-editor.org/rfc/rfc5652, RFC 2315}, RFC 5652) structures
-for Go applications.  It's an alternative fork of deprecated
-@url{https://github.com/mozilla-services/pkcs7}.")
-    (license license:expat)))
-
 (define-public go-github-com-dvsekhvalnov-jose2go
  (package
    (name "go-github-com-dvsekhvalnov-jose2go")
@@ -1445,43 +1414,6 @@ providing bidirectional mapping values to their names, plus enum convenience
 for values.")
    (license license:bsd-3)))

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

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

@@ -2874,7 +2777,7 @@ package.")
 (define-public go-github-com-refraction-networking-utls
  (package
    (name "go-github-com-refraction-networking-utls")
-    (version "1.8.2")
+    (version "1.6.0")
    (source
     (origin
       (method git-fetch)
@@ -2883,7 +2786,7 @@ package.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "03kgwxdm2lg28fn2w5q7ql2szsiwj2xjdf477h1g3a4a9y9j6zk0"))))
+        (base32 "1iywar5vqsml4b177k2nkcxmjm8mw92g3p112yjsrpmikiwpwpyw"))))
    (build-system go-build-system)
    (arguments
     `(#:import-path "github.com/refraction-networking/utls"
@@ -3641,39 +3544,6 @@ algorithm described in @url{https://rfc-editor.org/rfc/rfc2898.html,RFC 2898}
 and @url{https://rfc-editor.org/rfc/rfc8018.html,RFC 8018}.")
    (license license:asl2.0)))

-(define-public go-github-com-xtls-reality
-  (package
-    (name "go-github-com-xtls-reality")
-    (version "0.0.0-20260322125925-9234c772ba8f")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/xtls/reality")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1wncy5aph6nmq4814xjhj6b5p1wm2fyrqn83dw0xlyxvq2z6iqfs"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/xtls/reality"))
-    (propagated-inputs
-     (list go-github-com-cloudflare-circl
-           go-github-com-juju-ratelimit
-           go-github-com-pires-go-proxyproto
-           go-github-com-refraction-networking-utls
-           go-golang-org-x-crypto
-           go-golang-org-x-sys))
-    (home-page "https://github.com/xtls/reality")
-    (synopsis "Implementation of REALITY protocol")
-    (description
-     "This package provides an implementation of REALITY protocol, which is
-intented to eliminate the detectable TLS fingerprint on the server side, while
-still maintain the secrecy.  It achieves full real TLS that is
-undistingwishable with the specified SNI to the middleman.")
-    (license (list license:bsd-3 license:mpl2.0))))
-
 (define-public go-github-com-youmark-pkcs8
  (package
    (name "go-github-com-youmark-pkcs8")
@@ -3850,123 +3720,6 @@ is an extremely fast non-cryptographic hash algorithm.")
@url{https://en.wikipedia.org/wiki/RC2, RC2} Cipher in Golang.")
    (license license:asl2.0)))

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

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

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

+(define-public go-1.23
+  (package
+    (inherit go-1.22)
+    (name "go")
+    (version "1.23.12")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/golang/go")
+             (commit (string-append "go" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0nxcp8wikn93zxipm829dyyagwys13yhf452ai357wzbdzqihm7x"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments go-1.22)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (replace 'disable-more-tests
+              (lambda _
+                #$@(cond
+                     ((target-aarch64?)
+                      ;; https://go-review.googlesource.com/c/go/+/151303
+                      ;; This test is known buggy on aarch64 and is enabled and
+                      ;; disabled upstream with some regularity.
+                      #~((substitute* "src/plugin/plugin_test.go"
+                           (("package plugin_test")
+                            (string-append "// +build !linux linux,!arm64\n\n"
+                                           "package plugin_test")))))
+                     ((target-arm32?)
+                      ;; This test fails when run on aarch64-linux.
+                      #~((substitute* "src/cmd/link/internal/ld/elf_test.go"
+                           (("TestElfBindNow.*" all)
+                            (string-append
+                              all
+                              "        if runtime.GOARCH == \"arm\" {\n"
+                              "                t.Skipf(\"skipping; flaky on armhf\")\n"
+                              "        }\n")))))
+                     (else (list #t)))))))))
+    (properties
+     `((compiler-cpu-architectures
+         ("aarch64" ,@%go-1.23-arm64-micro-architectures)
+         ("armhf" ,@%go-1.17-arm-micro-architectures)
+         ("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)
+         ("x86_64" ,@%go-1.18-x86_64-micro-architectures))))
+    (native-inputs
+     ;; setarch was added to the tsan test suite in 1.23.12
+     `(("go" ,util-linux)
+       ,@(package-native-inputs go-1.22)))))
+
 (define-public go-1.24
  (package
    (inherit go-1.22)
@@ -1189,6 +1239,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
 (define-public go-std-1.20 (make-go-std go-1.20))
 (define-public go-std-1.21 (make-go-std go-1.21))
 (define-public go-std-1.22 (make-go-std go-1.22))
+(define-public go-std-1.23 (make-go-std go-1.23))
 (define-public go-std-1.24 (make-go-std go-1.24))
 (define-public go-std-1.25 (make-go-std go-1.25))
 (define-public go-std-1.26 (make-go-std go-1.26))
@@ -129,7 +129,7 @@
           libxv
           mesa
           sdl
-           v4l-utils))
+           v4l-utils-minimal))
    (synopsis "1394-Based Digital Camera Control Library")
    (description "LibDC1394 is a library that provides functionality to control
 any camera that conforms to the 1394-Based Digital Camera Specification written
@@ -721,7 +721,7 @@ for the GStreamer multimedia library.")
           speex
           taglib
           twolame
-           v4l-utils
+           v4l-utils-minimal
           wavpack
           zlib))
    (propagated-inputs
@@ -942,7 +942,7 @@ model to base your own plug-in on, here it is.")
            tinyalsa
            transcode
            usrsctp
-            v4l-utils
+            v4l-utils-minimal
            vo-aacenc
            vo-amrwbenc
            vulkan-headers
@@ -517,19 +517,22 @@ functions which were removed.")
                "0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
    (build-system waf-build-system)
    (arguments
-     (list
-      #:tests? #f ; no check target
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'set-flags
-            (lambda _
-              ;; Allow 'bin/ganv_bench' to find libganv-1.so.
-              (setenv "LDFLAGS"
-                      (string-append "-Wl,-rpath=" #$output "/lib")))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'set-flags
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Allow 'bin/ganv_bench' to find libganv-1.so.
+             (setenv "LDFLAGS"
+                     (string-append "-Wl,-rpath="
+                                    (assoc-ref outputs "out") "/lib"))
+             #t)))
+       #:tests? #f)) ; no check target
+    (inputs
+     `(("gtk" ,gtk+-2)
+       ("gtkmm" ,gtkmm-2)))
    (native-inputs
     (list `(,glib "bin") ; for glib-genmarshal, etc.
           pkg-config))
-    (inputs (list gtk+-2 gtkmm-2))
    (home-page "https://drobilla.net/software/ganv/")
    (synopsis "GTK+ widget for interactive graph-like environments")
    (description
@@ -1457,9 +1460,10 @@ exceptions, macros, and a dynamic programming environment.")
    (inherit guile-cairo)
    (name "guile2.2-cairo")
    (inputs
-     (modify-inputs inputs
-       (delete "guile" "guile-lib")
-       (append guile-2.2 guile2.2-lib)))))
+     `(("guile" ,guile-2.2)
+       ("guile-lib" ,guile2.2-lib)
+       ,@(fold alist-delete (package-inputs guile-cairo)
+               '("guile" "guile-lib"))))))

 (define-public guile-cairo-next
  ;; A commit with cairo-pointer->context, missing from guile-cairo@1.11.2
@@ -1575,10 +1579,11 @@ images onto Cairo surfaces.")
    (inherit guile-rsvg)
    (name "guile2.2-rsvg")
    (inputs
-     (modify-inputs inputs
-       (delete "guile" "guile-lib")
-       (append guile-2.2 guile2.2-lib)))
-    (propagated-inputs (list guile2.2-cairo))))
+     `(("guile" ,guile-2.2)
+       ("guile-lib" ,guile2.2-lib)
+       ,@(fold alist-delete (package-inputs guile-rsvg)
+               '("guile" "guile-lib"))))
+    (propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))

 (define-public guile-present
  (package
@@ -1644,7 +1649,9 @@ documents.")
    (name "guile2.2-present")
    (inputs (list guile-2.2))
    (propagated-inputs
-     (list guile2.2-lib guile2.2-cairo guile2.2-rsvg))))
+     `(("guile-lib" ,guile2.2-lib)
+       ("guile-cairo" ,guile2.2-cairo)
+       ("guile-rsvg" ,guile2.2-rsvg)))))

 ;;;
 ;;; C++ bindings.
@@ -2176,9 +2183,11 @@ and routines to assist in editing internationalized text.")
    (license license:lgpl2.1+)))

 (define-public girara
+  ;; TODO: Move propagated inputs to inputs after core-updates is merged (as
+  ;; of 2024-03)
  (package
    (name "girara")
-    (version "2026.02.04")
+    (version "0.4.5")
    (source
     (origin
       (method git-fetch)
@@ -2187,10 +2196,35 @@ and routines to assist in editing internationalized text.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "04adir5a8g2hqgv4vzpg52i2524abpcrqf3fcffrbwp8syan0df1"))))
+        (base32 "04igidbihgq5k7fh0jd5n26w00qlb47riky6q7qlp5k314d6cd2y"))))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'start-xserver
+            ;; Tests require a running X server.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((xorg-server (assoc-ref inputs "xorg-server"))
+                    (display ":1"))
+                (setenv "DISPLAY" display)
+
+                ;; On busy machines, tests may take longer than
+                ;; the default of four seconds.
+                (setenv "CK_DEFAULT_TIMEOUT" "20")
+
+                ;; Don't fail due to missing '/etc/machine-id'.
+                (setenv "DBUS_FATAL_WARNINGS" "0")
+                (zero? (system (string-append xorg-server "/bin/Xvfb "
+                                              display " &")))))))))
+    (native-inputs
+     (list pkg-config
+           check
+           gettext-minimal
+           `(,glib "bin")
+           xorg-server-for-tests))
+    ;; Listed in 'Requires.private' of 'girara.pc'.
+    (propagated-inputs (list gtk+ json-glib))
    (build-system meson-build-system)
-    (native-inputs (list pkg-config))
-    (inputs (list glib))
    (home-page "https://pwmt.org/projects/girara/")
    (synopsis "Library for minimalistic gtk+3 user interfaces")
    (description "Girara is a library that implements a user interface that
@@ -60,7 +60,6 @@
 ;;; Copyright © 2025 Andy Tai <atai@atai.org>
 ;;; Copyright © 2025 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2026 Matt Wette <matt.wette@gmail.com>
-;;; Copyright © 2026 Dzianis Jackievič <mail@miesta.by>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1168,7 +1167,7 @@ is not available for Guile 2.0.")
  (package
    (inherit guile-fibers-1.3)
    (name "guile-fibers")
-    (version "1.4.3")
+    (version "1.4.2")
    (source
     (origin (inherit (package-source guile-fibers-1.3))
             (file-name (git-file-name name version))
@@ -1177,7 +1176,7 @@ is not available for Guile 2.0.")
                    (commit (string-append "v" version))))
             (sha256
              (base32
-               "1q0a9y0cc8rld1z7mcj61fkldhd0kn9n4yq25izxslbgg4g5h9j6"))
+               "0qh0czz5qvk5mmrc8x2gmvl5psdfd22q2rhzj4jrpan6k3d55bl8"))
             (patches '())))
    (arguments
     (if (target-aarch64?)
@@ -1257,8 +1256,30 @@ is not available for Guile 2.0.")
     (modify-inputs native-inputs
       (replace "guile" guile-2.2)))))

-;; Deprecated on 2026-04-23
-(define-deprecated-package guile-fibers-next guile-fibers)
+(define-public guile-fibers-next
+  (let ((commit "297359f0ad655378bcc3ff0d4e96101965ef39b4")
+        (revision "0"))
+    (package
+      (inherit guile-fibers)
+      (name "guile-fibers-next")
+      (version (git-version "1.4.2"
+                            revision
+                            commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://codeberg.org/guile/fibers.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0qh0czz5qvk5mmrc8x2gmvl5psdfd22q2rhzj4jrpan6k3d55bl8"))))
+      (inputs
+       (modify-inputs inputs
+         (replace "guile" guile-next)))
+      (native-inputs
+       (modify-inputs native-inputs
+         (replace "guile" guile-next))))))

 (define-public guile-kracht
  (package
@@ -1516,7 +1537,7 @@ order to provide IDE functionality for Guile Scheme.")
 (define-public guile-ares-rs
  (package
    (name "guile-ares-rs")
-    (version "0.9.7")
+    (version "0.9.6")
    (source
     (origin
       (method git-fetch)
@@ -1526,42 +1547,35 @@ order to provide IDE functionality for Guile Scheme.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1xbznh5zjswfydgqg53g50ya7zm0hidin74g2glk849l9j45szw3"))))
+         "1vkww3vc0lsh5f8yh6fnh402rx3rsm0ss69rdkmplhzp4c7c4z1d"))))
    (build-system guile-build-system)
    (arguments
     (list
      #:source-directory "src/guile"
      #:phases
      #~(modify-phases %standard-phases
-          (add-after 'build 'install-scripts
+          (add-after 'build 'install-script
            (lambda _
-              (define bin (string-append #$output "/bin"))
-              (define site (string-append #$output "/share/guile/site/3.0"))
-              (define ccache
-                (string-append #$output "/lib/guile/3.0/site-ccache"))
-
-              (define (install-script name)
-                (let ((oldpath
-                       (string-append site "/ares/scripts/" name ".scm"))
-                      (newpath
-                       (string-append bin "/" name)))
-                  (symlink oldpath newpath)
-                  (wrap-program newpath
-                    `("GUILE_LOAD_PATH" ":" =
-                      ,(list "$GUILE_LOAD_PATH"
-                             site
-                             (getenv "GUILE_LOAD_PATH")))
-                    `("GUILE_LOAD_COMPILED_PATH" ":" =
-                      ,(list "$GUILE_LOAD_COMPILED_PATH"
-                             ccache
-                             (getenv "GUILE_LOAD_COMPILED_PATH"))))
-                  ;; Not needed since the wrapper followed the symlink.
-                  (delete-file (string-append bin "/." name "-real"))))
-
-              (mkdir bin)
-              (for-each install-script '("ares-nrepl" "ares-suitbl")))))))
-    (inputs (list bash-minimal guile-3.0-latest))
-    (propagated-inputs (list guile-fibers))
+              (let* ((bin (string-append #$output "/bin"))
+                     (oldpath (string-append
+                               #$output
+                               ;; This file will be named ares-nrepl.scm for
+                               ;; the next version.
+                               "/share/guile/site/3.0/ares/scripts/ares.scm"))
+                     (newpath (string-append bin "/ares-nrepl")))
+                (mkdir bin)
+                (symlink oldpath newpath)
+                (wrap-program newpath
+                  `("GUILE_LOAD_PATH" ":" =
+                    ,(list (string-append #$output "/share/guile/site/3.0")
+                           (getenv "GUILE_LOAD_PATH")))
+                  `("GUILE_LOAD_COMPILED_PATH" ":" =
+                    ,(list (string-append #$output "/lib/guile/3.0/site-ccache")
+                           (getenv "GUILE_LOAD_COMPILED_PATH"))))
+                ;; Not needed since the wrapper followed the symlink.
+                (delete-file (string-append bin "/.ares-nrepl-real"))))))))
+    (inputs (list bash-minimal guile-3.0))
+    (propagated-inputs (list guile-fibers guile-custom-ports))
    (home-page "https://git.sr.ht/~abcdw/guile-ares-rs")
    (synopsis "Asynchronous Reliable Extensible Sleek RPC Server for Guile")
    (description "Asynchronous Reliable Extensible Sleek RPC Server for
@@ -5693,32 +5707,27 @@ perform geometrical transforms on JPEG images.")
      (license license:gpl3+))))

 (define-public guile-jtd
-  ;; There are a few unreleased commits that include niceties such as warning
-  ;; that the debug VM must be used; use the latest commit until the next
-  ;; release comes.
-  (let ((commit "425f86ae954d6445aaedacfd4ecd50aa0022e59d")
-        (revision "0"))
-    (package
-      (name "guile-jtd")
-      (version (git-version "220323a" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/mwette/guile-jtd")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1l8fyqhvksarvpbr903i3ss3432jzvyvhgcqa15j922ngqh4ds6f"))))
-      (build-system guile-build-system)
-      (native-inputs (list guile-3.0))
-      (home-page "https://github.com/mwette/guile-jtd")
-      (synopsis "Python's @code{pdb.set_trace()} but for Guile")
-      (description
-       "The @code{(jtd)} module for Guile provides a procedure
+  (package
+    (name "guile-jtd")
+    (version "220323a")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/mwette/guile-jtd")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1l8fyqhvksarvpbr903i3ss3432jzvyvhgcqa15j922ngqh4ds6f"))))
+    (build-system guile-build-system)
+    (native-inputs (list guile-3.0))
+    (home-page "https://github.com/mwette/guile-jtd")
+    (synopsis "Python's @code{pdb.set_trace()} but for Guile")
+    (description
+     "The @code{(jtd)} module for Guile provides a procedure
@code{jump-to-debugger} for escaping to the Guile REPL for the purpose of
 debugging code.")
-      (license license:lgpl2.1+))))
+    (license license:lgpl2.1+)))

 (define-public guile-png
  (package
@@ -5778,43 +5787,6 @@ reading and writing PNG data, as well as some graphic primitives and basic image
 processing filters.")
    (license license:gpl3+)))

-(define-public guile-pnm
-  (package
-    (name "guile-pnm")
-    (version "0.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/artyom-poptsov/guile-pnm")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "06kgp1gh8hdj1j6w7i981prx93wfjpayrnjlydlzs7l5j04l4m3a"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~(list "GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
-    (native-inputs (list autoconf
-                         automake
-                         pkg-config
-                         texinfo
-                         ;; needed when cross-compiling.
-                         guile-3.0
-                         guile-lib
-                         guile-smc))
-    (inputs (list guile-3.0 guile-lib))
-    (propagated-inputs (list guile-smc))
-    (home-page "https://github.com/artyom-poptsov/guile-pnm")
-    (synopsis "NetBPM (PNM) library for GNU Guile")
-    (description
-     "@code{guile-pnm} is a GNU Guile library for working with the
-@url{https://en.wikipedia.org/wiki/Netpbm, NetPBM} format (also known as PNM),
-including portable bitmap (PBM), portable graymap (PGM) and portable
-pixel (PPM) variants.")
-    (license license:gpl3+)))
-
 (define-public guile-cv
  (package
    (name "guile-cv")
@@ -6390,88 +6362,6 @@ as signed sessions, multipart message support, etc.")
    (propagated-inputs
     (list guile2.2-irregex guile2.2-gcrypt))))

-(define-public guile-compose
-  (package
-    (name "guile-compose")
-    (version "0.1.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/jadzi/guile-compose.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1g68gczs96nrb0vf1hv4n07zsp2516gpiwq1wwlhcq4rzynhf12h"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~'("GUILE_AUTO_COMPILE=0")))
-    (inputs (list guile-3.0))
-    (native-inputs (list autoconf-2.72 automake pkg-config guile-3.0 texinfo))
-    (synopsis "Procedure composition utilities for Guile Scheme")
-    (description
-     "This tiny package provides some procedures and macros to extend
-Guile Scheme procedure composition facilities.  For example, there is
-a @code{compose-top}, a reverse-order analog to native @code{compose}
-procedure.  The @code{compose-cont} is a macro, utilizing some power of
-continuations to build really flexible flows.
-
-This library is intended to stay basic and small, so it has no any
-external dependencies and can be a good base for other packages, like e.g.
-@code{guile-web-middleware}.")
-    (license (list license:lgpl3+))
-    (home-page "https://jadzi.codeberg.page/guile-compose")))
-
-(define-public guile-web-middleware
-  (package
-    (name "guile-web-middleware")
-    (version "0.11.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/jadzi/guile-web-middleware.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "01wb8v0lszphdv08ly4aqv59qm5h8yw2fgm025vkn61djspsq4j9"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~'("GUILE_AUTO_COMPILE=0")))
-    (inputs (list guile-3.0))
-    (propagated-inputs (list guile-compose))
-    (native-inputs (list autoconf-2.72 automake pkg-config guile-3.0 texinfo))
-    (synopsis "Web application middleware composition for Guile Scheme")
-    (description
-     "This package provides means to compose a web application by
-chaining procedures, a.k.a. middlewares.  By those means, composed
-procedures form a standard request handler for any Guile's web server
-implementation.
-
-Each middleware has its own limited responsibility in request
-processing.  Also, middlewares are simple Scheme procedures, so they
-can be easily tested and shared among web applications.
-
-Out of the box, this package provides several procedures for commonly
-required tasks.  Among them:
-
-@itemize
-@item Error handling with customizable page contents.
-@item Request filtering.
-@item Request logging.
-@item Serving static files, file URL generation.
-@item Request routing, handling parameters, route URL generation.
-@item Middleware nesting, composing whole apps.
-@end itemize
-
-This package relies on @code{guile-compose} package as its only dependency.")
-    (license (list license:lgpl3+))
-    (home-page "https://jadzi.codeberg.page/guile-web-middleware")))
-
 (define-public guile-web-driver-ng
  (package
    (name "guile-web-driver-ng")
@@ -7700,7 +7590,7 @@ with a FSM is being built (for example, from a Makefile.)")
 (define-public guile-ini
  (package
    (name "guile-ini")
-    (version "1.0.0")
+    (version "0.5.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -7709,7 +7599,7 @@ with a FSM is being built (for example, from a Makefile.)")
              (file-name (string-append name "-" version))
              (sha256
               (base32
-                "12mfch7dznx67r5zw88pp4ma3pw6akif7kdr0kak1gvawgfy277y"))))
+                "0mz7mpcf6q1z9j9ydz1ngr4hglci3ghmharv1isx9wgby3l2dcf5"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
@@ -7764,11 +7654,11 @@ is an attempt to combine both into something useful.")
      (license license:asl2.0))))

 (define-public guile-knots
-  (let ((commit "f767eca066495e6582e89ba1b91907c0c5657878")
-        (revision "34"))
+  (let ((commit "cb5ec50b341f603e9d129152b45e47cf008ea126")
+        (revision "31"))
    (package
    (name "guile-knots")
-    (version (git-version "0.1" revision commit))
+    (version (git-version "0" revision commit))
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -7776,7 +7666,7 @@ is an attempt to combine both into something useful.")
                    (commit commit)))
              (sha256
               (base32
-                "18fqmpyrrxy8phxxm5b7d1qhhvc3rsrs243xiinkj2hn2ca1cqi8"))
+                "08gcbyw7kvhk568a30kimhn37m9mygpxhswb294n1141ddmhjchh"))
              (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -7789,13 +7679,13 @@ is an attempt to combine both into something useful.")
     (list pkg-config
           autoconf
           automake
-           guile-3.0-latest
+           guile-next
           guile-lib
-           guile-fibers))
+           guile-fibers-next))
    (inputs
-     (list guile-3.0-latest))
+     (list guile-next))
    (propagated-inputs
-     (list guile-fibers))
+     (list guile-fibers-next))
    (home-page "https://cbaines.codeberg.page/guile-knots/")
    (synopsis "Patterns and functionality to use with Guile Fibers")
    (description
@@ -8011,16 +7901,14 @@ This module implements this interface by use of Guile's dynamic FFI.")
 (define-public guile-bstructs
  (package
    (name "guile-bstructs")
-    (version "0.2.0")
+    (version "0.1.0")
    (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://git.dthompson.us/guile-bstructs.git")
-               (commit (string-append "v" version))))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "18dwhcsbcjix61hy32ckjyvgmg1r9smq2krp2m1yc6sinlszh0f2"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://files.dthompson.us/releases"
+                           "/guile-bstructs/guile-bstructs-" version ".tar.gz"))
+       (sha256
+        (base32 "0f847aiyzhrlvd2jmckyqrkrvi7i9mg8rmyhbh7fs1vzykcf67wb"))))
    (build-system gnu-build-system)
    (native-inputs (list autoconf automake guile-3.0 pkg-config texinfo))
    (inputs (list guile-3.0))
@@ -8091,14 +7979,14 @@ application to open a given file or URL based on given configurations.")
 (define-public guile-goblins
  (package
    (name "guile-goblins")
-    (version "0.18.0")
+    (version "0.17.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://files.spritely.institute/releases"
                           "/guile-goblins/guile-goblins-" version ".tar.gz"))
       (sha256
-        (base32 "0gj5018wmq97ln1z7x03a13z3p35xc8762id9bl9fgkxwm01df1a"))))
+        (base32 "16jkmfspsnza2fdk5jr05a5pfh7x856gpg031i21s1yvy43l8mi0"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -653,10 +653,7 @@ GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its
 (define (guile-variant-package-name prefix)
  (lambda (name)
    "Return NAME with PREFIX instead of \"guile-\", when applicable."
-    (if (and (string-prefix? "guile-" name)
-
-             ;; Don't rename guile-bootstrap@2.0.
-             (not (string=? "guile-bootstrap" name)))
+    (if (string-prefix? "guile-" name)
        (string-append prefix "-"
                       (string-drop name
                                    (string-length "guile-")))
@@ -859,17 +856,17 @@ Guile's foreign function interface.")
 (define-public guile-bytestructures
  (package
    (name "guile-bytestructures")
-    (version "2.0.2")
+    (version "1.0.10")
    (home-page "https://github.com/TaylanUB/scheme-bytestructures")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url home-page)
-                    (commit (string-append "v" version))))
+                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1dyhf39s16q3fvps0mfb65xrlcb8rk8m5kc82ngkwhzmf1svalpc"))))
+                "14k50jln32kkxv41hvsdgjkkfj6xlv06vc1caz01qkgk1fzh72nk"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags '("GUILE_AUTO_COMPILE=0")     ;to prevent guild warnings
@@ -903,8 +900,8 @@ type system, elevating types to first-class status.")
 (define-public guile-git
  (package
    (name "guile-git")
-    (version "0.11.1")
-    (home-page "https://codeberg.org/guile-git/guile-git.git")
+    (version "0.11.0")
+    (home-page "https://gitlab.com/guile-git/guile-git.git")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -913,11 +910,11 @@ type system, elevating types to first-class status.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0xpzchnglddphi3chv53xqaz2x6rpq3l4s023w7r4mmndb6lgz0b"))))
+                "1yjyil6z4k80pjdps8v6h6lxikwxmjxvrslf2jrmq2rrfnajschz"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags '("GUILE_AUTO_COMPILE=0")       ; to prevent guild warnings
-       ;; https://codeberg.org/guile-git/guile-git/issues/20
+       ;; https://gitlab.com/guile-git/guile-git/-/issues/20
       ,@(if (target-ppc32?)
           `(#:phases
             (modify-phases %standard-phases
@@ -925,7 +922,20 @@ type system, elevating types to first-class status.")
                 (lambda _
                   (substitute* "Makefile.am"
                     ((".*tests/blob\\.scm.*") ""))))))
-           '())))
+           '())
+       ,@(if (system-hurd?)
+             (list
+              #:phases
+              #~(modify-phases %standard-phases
+                  (add-after 'unpack 'skip-tests/hurd
+                    (lambda _
+                      (substitute* "tests/proxy.scm"
+                        (("\\(test-begin.*" all)
+                         (string-append
+                          all
+                          "(when (string-ci= \"GNU\" (vector-ref (uname) 0))\n"
+                          "  (test-skip 1))\n")))))))
+             '())))
    (native-inputs
     (list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures))
    (inputs
@@ -994,7 +1004,7 @@ Guile's foreign function interface.")
       (file-name (string-append "guile-lzlib-" version ".tar.gz"))
       (sha256
        (base32
-         "1v1pfqp6hwl0rivs7swhqnfgznxlfnws9ldmn6avnhd10filfa3a"))
+         "1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7"))
       (patches (search-patches "guile-lzlib-gcc-14.patch"
                                "guile-lzlib-hurd64.patch"))))
    (build-system gnu-build-system)
@@ -112,7 +112,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system go)
  #:use-module (guix build-system guile)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
@@ -311,38 +310,6 @@ sharing.")
 (define-deprecated-package barrier
  deskflow)

-(define-public hd-idle
-  (package
-    (name "hd-idle")
-    (version "1.22")
-    (source
-     (origin
-       (method git-fetch)
-       (uri
-        (git-reference
-          (url "https://github.com/adelolmo/hd-idle")
-          (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "12nckzp00b3y91igp8jzlf6as353la6ar8gp6b646kn9gi2hrla3"))
-       (snippet
-        #~(begin
-            (use-modules (guix build utils))
-            (delete-file-recursively "vendor")))))
-    (build-system go-build-system)
-    (arguments
-     (list #:import-path "github.com/adelolmo/hd-idle"
-           #:install-source? #f))
-    (inputs
-     (list go-github-com-benmcclelland-sgio))
-    (home-page "https://github.com/adelolmo/hd-idle")
-    (synopsis "Spin down idle hard disks")
-    (description "@command{hd-idle} is a utility program for spinning down
-external disks after a period of idle time.  Since most USB hard drives do not
-support setting the idle timer via @command{hdparm}, hd-idle can be used as a
-workaround.")
-    (license license:gpl3+)))
-
 (define-public hw-probe
  (package
    (name "hw-probe")
@@ -914,7 +914,7 @@ regular) Diffie Hellman key exchanges, and many extensions.")
     (list #:extra-directories (list "openssl")
           #:configure-flags
           #~(list "--ghc-options=-optc=-Wno-incompatible-pointer-types")))
-    (inputs (list ghc-network openssl-3.0))
+    (inputs (list ghc-network openssl))
    (home-page "https://github.com/haskell-cryptography/HsOpenSSL")
    (synopsis "Partial OpenSSL binding for Haskell")
    (description
--- a/Show More
+++ b/Show More