gnu: python-virtualenv: Update to 20.35.4.

* gnu/packages/python-xyz.scm (python-virtualenv): Update to 20.35.4. [source]: Switch to git-fetch. [arguments] <test-flags>: Rework skipped tests. Change-Id: If627123d9213470b03f0535b90b1098cbde7c1ff
gnu: libftdi: Fix build on python-3.12.
2026-07-11 12:44:05 +02:00 · 2026-04-16 09:59:21 +01:00 · 2026-04-16 09:59:21 +01:00 · 2026-04-16 09:59:20 +01:00 · 2026-04-16 09:59:20 +01:00 · 2026-04-16 09:59:20 +01:00
373 changed files with 25837 additions and 89458 deletions
@@ -16,8 +16,6 @@
  ( ;; primary: "D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F"
   "01FD 85F4 1A7B 7F82 0583  06A5 935E BE07 36DC 857E"
   (name "avp"))
  ("5D54 CF25 57B2 38E8 8DC1  80A2 2D22 3241 0AB7 4043"
   (name "baleine"))
  ( ;; primary: "34FF 38BC D151 25A6 E340  A0B5 3453 2F9F AFCA 8B8E"
   "A3A4 B419 0074 087C A7DE  5698 BC45 CA67 E2F8 D007"
   (name "bavier"))
@@ -179,7 +179,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
@@ -264,7 +263,6 @@ gnu/installer(\.scm$|/)                            @guix/installer
 gnu/packages/clojure\.scm                          @guix/java
 gnu/packages/java(-.+|)\.scm$                      @guix/java
 gnu/packages/maven(-.+|)\.scm$                     @guix/java
 gnu/packages/netbeans\.scm                         @guix/java
 guix/build/ant-build-system\.scm                   @guix/java
 guix/build/clojure-build-system\.scm               @guix/java
 guix/build/clojure-utils\.scm                      @guix/java
@@ -275,7 +273,6 @@ guix/build-system/ant\.scm                         @guix/java
 guix/build-system/clojure\.scm                     @guix/java
 guix/build-system/maven\.scm                       @guix/java
 gnu/packages/javascript\.scm                       @guix/javascript
 gnu/packages/node-xyz\.scm                         @guix/javascript
 gnu/packages/node\.scm                             @guix/javascript
 guix/build-system/node\.scm                        @guix/javascript
@@ -321,7 +318,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
@@ -338,6 +334,7 @@ guix/build-system/rakudo\.scm                      @guix/perl
 guix/import/cpan\.scm                              @guix/perl
 guix/scripts/import/cpan\.scm                      @guix/perl
 gnu/packages/aux-files/python/.*\.py$              @guix/python
 gnu/packages/django\.scm                           @guix/python
 gnu/packages/jupyter\.scm                          @guix/python
 gnu/packages/python(-.+|)\.scm$                    @guix/python
@@ -457,8 +457,6 @@ AUX_FILES =						\
  gnu/packages/aux-files/findclass.php			\
  gnu/packages/aux-files/guix.vim			\
  gnu/packages/aux-files/guix-nvim.vim			\
  gnu/packages/aux-files/linux-libre/7.0-arm64.conf	\
  gnu/packages/aux-files/linux-libre/7.0-x86_64.conf	\
  gnu/packages/aux-files/linux-libre/6.19-arm64.conf	\
  gnu/packages/aux-files/linux-libre/6.19-i686.conf	\
  gnu/packages/aux-files/linux-libre/6.19-x86_64.conf	\
@@ -488,6 +486,7 @@ AUX_FILES =						\
  gnu/packages/aux-files/linux-libre/5.10-x86_64.conf	\
  gnu/packages/aux-files/ovmf/51-edk2-ovmf-2m-raw-x64-nosb.json	\
  gnu/packages/aux-files/pack-audit.c			\
  gnu/packages/aux-files/python/pytest_guix.py		\
  gnu/packages/aux-files/python/sanity-check.py		\
  gnu/packages/aux-files/python/sitecustomize.py	\
  gnu/packages/aux-files/renpy/renpy.in	\
@@ -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
@@ -3256,8 +2933,8 @@ your Linode Summary section.) Now you can run the "install guix from
@example
 sudo apt-get install gpg
-wget https://codeberg.org/efraim.gpg -qO - | gpg --import -
+wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -
-wget https://guix.gnu.org/guix-install.sh
+wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
 chmod +x guix-install.sh
 ./guix-install.sh
 guix pull
@@ -3436,7 +3113,7 @@ Now you can run the "install guix from @pxref{Binary Installation,,,
 guix, GNU Guix}" steps:
@example
-wget https://guix.gnu.org/guix-install.sh
+wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
 chmod +x guix-install.sh
 ./guix-install.sh
 guix pull
@@ -4491,7 +4168,7 @@ network.  Assuming your interface is named @samp{enp2s0}, the following
 command can be used to do so:
@example sh
-# nmcli con add type bridge-slave autoconnect yes ifname enp2s0 master br0
+# nmcli con add type bridge-slave ifname enp2s0 master br0
@end example
@quotation Important
@@ -4527,8 +4204,8 @@ bridge interface, as the default is to deny all.  Add the following to
 your list of services to do so:
@example lisp
-(extra-special-file "/etc/qemu/bridge.conf"
+(extra-special-file "/etc/qemu/host.conf"
-                    (plain-file "bridge.conf" "allow br0\n"))
+                    (plain-file "host.conf" "allow br0\n"))
@end example
@subsection Invoking QEMU with the right command line options
@@ -4546,7 +4223,7 @@ machine making use of the bridge would cause networking issues.
@example sh
 $ qemu-system-x86_64 [...] \
    -device virtio-net-pci,netdev=user0,mac=XX:XX:XX:XX:XX:XX \
-    -netdev bridge,helper=/run/privileged/bin/qemu-bridge-helper,id=user0,br=br0 \
+    -netdev bridge,id=user0,br=br0 \
    [...]
@end example
@@ -10,8 +10,8 @@
@include version.texi
@c Identifier of the OpenPGP key used to sign tarballs and such.
-@set OPENPGP-SIGNING-KEY-ID A28BF40C3E551372662D14F741AAE7DCCA3D8351
+@set OPENPGP-SIGNING-KEY-ID 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
-@set OPENPGP-SIGNING-KEY-URL https://codeberg.org/efraim.gpg
+@set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=15145
@c Base URL for downloads.
@set BASE-URL https://ftpmirror.gnu.org/gnu/guix
@@ -2658,13 +2658,12 @@ bootloaders.
 Once you are done partitioning the target hard disk drive, you have to
 create a file system on the relevant partition(s)@footnote{Currently
-Guix System can mount only ext4, btrfs, JFS, F2FS, and XFS file systems
+Guix System supports only ext4, btrfs, bcachefs, JFS, F2FS, and XFS
-at boot time.  In particular, code that reads file system UUIDs and
+file systems.  In particular, code that reads file system UUIDs and
-labels works only for these file system types.  The code for bcachefs is
+labels works only for these file system types.  For bcachefs, also add
-in place, but support for loading out-of-tree kernel modules in the
+the @code{bcachefs-linux-module} to your @code{operating-system}'s
-initrd is not.}.
+@code{initrd-modules}.}.  For the ESP, if you have one and assuming it is
-
+@file{/dev/sda1}, run:
 For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:
@example
 mkfs.fat -F32 /dev/sda1
@@ -6591,21 +6590,6 @@ directory within the container.  If this is undesirable,
 be automatically shared and will change to the user's home directory
 within the container instead.  See also @option{--user}.
@item --cwd=@var{directory}
 For containers, change to @var{directory} inside the container instead
 of the default location.  The default location is the current working
 directory when @option{--no-cwd} is not used, or the user's home
 directory when @option{--no-cwd} is used.  When @var{directory} is a
 relative file name, it is interpreted relative to the current working
 directory on the host.  Note that @option{--cwd} does not automatically
 share @var{directory}---you must ensure it is accessible via the default
 current directory sharing or explicit @option{--share}/@option{--expose}
 options.  For example:
@example
 guix shell --container --cwd=/tmp --share=/tmp coreutils
@end example
@item --writable-root
 When using @option{--container}, this option makes the root file system
 writable (it is read-only by default).
@@ -7107,17 +7091,6 @@ directory within the container.  If this is undesirable,
 be automatically shared and will change to the user's home directory
 within the container instead.  See also @option{--user}.
@item --cwd=@var{directory}
 For containers, change to @var{directory} inside the container instead
 of the default location.  The default location is the current working
 directory when @option{--no-cwd} is not used, or the user's home
 directory when @option{--no-cwd} is used.  When @var{directory} is a
 relative file name, it is interpreted relative to the current working
 directory on the host.  Note that @option{--cwd} does not automatically
 share @var{directory}---you must ensure it is accessible via the default
 current directory sharing or explicit @option{--share}/@option{--expose}
 options.
@item --expose=@var{source}[=@var{target}]
@itemx --share=@var{source}[=@var{target}]
 For containers, @option{--expose} (resp. @option{--share}) exposes the
@@ -8870,12 +8843,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
@@ -8883,23 +8856,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.
@@ -15578,7 +15534,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:
@@ -16139,7 +16095,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:
@@ -16168,16 +16124,14 @@ its @code{source} field like to:
    (inherit guile-json-3)
    (name "guile-json")
    (version "4.7.3")
-    (source
+    (source (origin
-      (origin
+              (method git-fetch)
-        (method git-fetch)
+              (uri (git-reference (url
-        (uri (git-reference
+                                   "https://github.com/aconchillo/guile-json")
-               (url "https://github.com/aconchillo/guile-json")
+                                  (commit version)))
-               (commit version)))
+              (file-name (git-file-name name version))
-        (file-name (git-file-name name version))
+              (sha256 (base32
-        (sha256
+                       "0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
          (base32
            "0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
@end lisp
@end table
@@ -19242,7 +19196,7 @@ Partitioning}, for an example.
 When using GRUB as the bootloader, the LUKS password is only requested
 once: GRUB passes the master key to the initial RAM disk automatically.
-@xref{grub-luks-root-device-key, Automatic LUKS Master Key Passing}, for
+@xref{Bootloader Configuration, Automatic LUKS Master Key Passing}, for
 details.
@end defvar
@@ -27294,28 +27248,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
@@ -45277,12 +45209,6 @@ Extra command line options for @code{guix-data-service}.
@item @code{extra-process-jobs-options} (default: @var{'()})
 Extra command line options for @code{guix-data-service-process-jobs}.
@item @code{extra-environment-variables} (default: @var{'()})
 Extra environment variables for @code{guix-data-service}.
@item @code{extra-process-jobs-environment-variables} (default: @var{'()})
 Extra environment variables for @code{guix-data-service-process-jobs}.
@item @code{git-repositories} (default: @var{#f})
 List of git-repository information to insert into the database.
@@ -48992,28 +48918,8 @@ This option in enabled by default.  In some cases involving the
 in RAM, it can be handy to disable the option by setting it to
@code{#f}.
-@item @code{extra-initrd} (default: @code{#f})
+@subsubheading Automatic LUKS Master Key Passing
 File name of an additional initrd to load during the boot.  It may or
 may not point to a file in the store, but the main use case is for
 out-of-store files containing secrets.
 For any use case not involving secrets, you should use regular initrd
 (@pxref{operating-system Reference, @code{initrd}}) instead.
 Be careful when using this option, since pointing to a file that is not
 readable by the grub while booting will cause the boot to fail and
 require a manual edit of the initrd line in the grub menu.
 Currently only supported by GRUB.
@end table
@end deftp
@anchor{grub-luks-root-device-key}
@unnumberedsubsec Automatic LUKS Master Key Passing
@cindex LUKS, root file system encryption
@cindex passphrase, for LUKS-encrypted root
 When booting from a LUKS-encrypted device using GRUB, the password is
 normally requested twice: once by GRUB to access @file{/boot}, and a
 second time by the initial RAM disk to mount the root file system.
@@ -49054,7 +48960,22 @@ No configuration is required: GRUB's @code{procfs} and @code{luks}
 modules are loaded automatically when encrypted devices are declared
 via @code{luks-device-mapping} (@pxref{Mapped Devices}).
-@unnumberedsubsec Additional Boot Entries
+@item @code{extra-initrd} (default: @code{#f})
 File name of an additional initrd to load during the boot.  It may or
 may not point to a file in the store, but the main use case is for
 out-of-store files containing secrets.
 For any use case not involving secrets, you should use regular initrd
 (@pxref{operating-system Reference, @code{initrd}}) instead.
 Be careful when using this option, since pointing to a file that is not
 readable by the grub while booting will cause the boot to fail and
 require a manual edit of the initrd line in the grub menu.
 Currently only supported by GRUB.
@end table
@end deftp
@cindex dual boot
@cindex boot menu
@@ -49183,13 +49104,9 @@ example of chainloading a different GNU/Linux system.
@end table
@end deftp
@unnumberedsubsec Themes
@cindex HDPI
@cindex HiDPI
@cindex resolution
@cindex themes, for GRUB
@cindex bootloader themes
@c FIXME: Write documentation once it's stable.
 For now only GRUB has theme support.  GRUB themes are created using
 the @code{grub-theme} form, which is not fully documented yet.
@@ -49209,7 +49126,7 @@ Return the default GRUB theme used by the operating system if no
@code{theme} field is specified in @code{bootloader-configuration}
 record.
-It comes with a fancy background image displaying the Guix
+It comes with a fancy background image displaying the GNU and Guix
 logos.
@end deffn
@@ -49584,7 +49501,7 @@ how to generate an image that uses the @code{grub-efi-bootloader}
 bootloader and boot it with QEMU:
@example
-image=$(guix system image --image-type=qcow2-gpt \
+image=$(guix system image --image-type=qcow2 \
        gnu/system/examples/lightweight-desktop.tmpl)
 cp $image /tmp/my-image.qcow2
 chmod +w /tmp/my-image.qcow2
@@ -53591,9 +53508,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.
 ;;;
@@ -691,7 +690,6 @@ ecosystem."
  (team 'embedded
        #:name "Embedded"
        #:scope (list "gnu/packages/bootloaders.scm"
                      "gnu/packages/coreboot.scm"
                      "gnu/packages/firmware.scm")))
 (define-team games
@@ -828,7 +826,6 @@ and the maven-build-system."
              (make-regexp* "^gnu/packages/java(-.+|)\\.scm$")
              ;; Match maven.scm and maven-*.scm
              (make-regexp* "^gnu/packages/maven(-.+|)\\.scm$")
              "gnu/packages/netbeans.scm"
              "guix/build/ant-build-system.scm"
              "guix/build/clojure-build-system.scm"
              "guix/build/clojure-utils.scm"
@@ -845,8 +842,7 @@ and the maven-build-system."
        #:name "JavaScript team"
        #:description
        "JavaScript/Node.js packages, the node build system."
-        #:scope (list "gnu/packages/javascript.scm"
+        #:scope (list "gnu/packages/node-xyz.scm"
                      "gnu/packages/node-xyz.scm"
                      "gnu/packages/node.scm"
                      "guix/build-system/node.scm"
                      "guix/build/node-build-system.scm"
@@ -947,7 +943,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"
@@ -977,7 +972,8 @@ perl-build-system as well as the rakudo-build-system."
        #:description
        "Python, Python packages, the \"pypi\" importer, and the python-build-system."
        #:scope
-        (list "gnu/packages/django.scm"
+        (list (make-regexp* "^gnu/packages/aux-files/python/.*\\.py$")
              "gnu/packages/django.scm"
              "gnu/packages/jupyter.scm"
              (make-regexp* "^gnu/packages/python(-.+|)\\.scm$")
              "gnu/packages/sphinx.scm"
@@ -1251,11 +1247,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")
@@ -1639,7 +1630,7 @@ the \"texlive\" importer."
 (define-member (person "Thanos Apollo"
                       "public@thanosapollo.org"
                       "thanosapollo")
-  vcs emacs)
+  vcs)
 (define-member (person "Ashish SHUKLA"
                       "ashish.is@lostca.se"
@@ -1661,11 +1652,6 @@ the \"texlive\" importer."
                       "tok")
  electronics)
 (define-member (person "gemmaro"
                       "gemmaro.dev@gmail.com"
                       "gemmaro")
  ruby)
 (define (find-team name)
  (or (hash-ref %teams (string->symbol name))
@@ -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
+    if (system("which cargo-audit 1> /dev/null"))
-    close("which cargo-audit")
+        exit 1;
    cargoAudit = cargoAudit " audit --file -"
    # 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)
+            cargoLock = cargoLock "[[package]]\nname = " $(i+1) "\nversion = " $(i+2) "\n"
            crateVersion = $(i+2)
            cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\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'
+# The xxxx-cargo-input variables have a set style
-/package:rust/ {
+# TODO: Replace the last dash between the name and the version with a space!
-    pkg = $2
+# This doesn't take into account swapping between "-" and "_" so we skip it.
-    split(pkg, name_version, "-")
+#( $2 ~ /-cargo-inputs/ ) {
-    crateVersion = name_version[length(name_version)]
+#    sub(/-cargo-inputs/, "", $2)
-    crateName = substr(pkg, 6, (length(pkg) - length(crateVersion) - 6))
+#    gsub(/)/, "", $0)
-    split(crateVersion, versionDots, ".")
+#    gsub(/rust-/, "", $0)
-    if(crateVersion && (crateVersion != "(git-version") && (length(versionDots) == 3) && crateName) {
+#    #gensub(/([[:alpha:]])-([[:digit:]]+)/, "\\1 \\2", "g", $i)
-        cargoLock = cargoLock "[[package]]\nname = \"" crateName "\"\nversion = \"" crateVersion "\"\n"
+#    print "[[package]]\nname = \"" $2 "\"\nversion = \"1.0.0\"\ndependencies = ["
-    } else {
+#    for (i = 4; i <= NF; i++) {
-        untested++
+#        print "\"" $i "\","
-        #print("Unable to test " $0)
+#    }
-    }
+#    print "]"
-    next
+#}
 }
-# We make an attempt to create the crate name from the package name otherwise
+END { print cargoLock | cargoAudit }
 /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 }
@@ -1226,12 +1226,10 @@ file name or an nfs-root containing ':/')."
  (match spec
    ((? string?)
-     (if (string-match "^/dev/[a-zA-Z0-9]+$" spec)
+     (if (string-prefix? "/dev/" spec)
         ;; Nothing to do, but wait until SPEC shows up.
         (resolve device-exists? spec identity)
-         ;; Do not resolve NFS / CIFS / tmpfs devices
+         spec)) ; do not resolve NFS / CIFS / tmpfs devices
         ;; or bcachefs multi-device specifications.
         spec))
    ((? file-system-label?)
     ;; Resolve the label.
     (resolve find-partition-by-label
@@ -445,14 +445,10 @@ load path must be adjusted as needed."
          ;; Behave like an init process: create a sub-process that calls
          ;; THUNK, and wait for child processes.  Furthermore, forward
          ;; RELAYED-SIGNALS to the child process.
-          ;; We presently use `safe-clone` here due to a bug in the interaction
+          (match (primitive-fork)
-          ;; between Guix and `primitive-fork` in Guile 3.0.11:
+            (0
          ;; https://codeberg.org/guix/guix/issues/7690#issuecomment-12744123
          (safe-clone
            SIGCHLD
            (lambda ()
             (call-with-clean-exit thunk))
-            (lambda (pid)
+            (pid
             (install-signal-handlers pid)
             (let loop ()
               (match (wait-child-process)
@@ -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}.")
+   "Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}."))
  (shepherd-requirement
   (list-of-symbols '())
   "List of services that should be started before this service."))
 (define (home-gpg-agent-configuration-file config)
  "Return the @file{gpg-agent.conf} file for @var{config}."
@@ -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
+                 (start #~(make-systemd-constructor
-                  #~(lambda args
+                           (list #$(file-append gnupg "/bin/gpg-agent")
-                      ((make-systemd-constructor
+                                 "--supervised" "--enable-ssh-support")
-                        (list #$(file-append gnupg "/bin/gpg-agent")
+                           (list #$(endpoint "ssh" "S.gpg-agent.ssh")
-                              "--supervised" "--enable-ssh-support")
+                                 #$(endpoint "browser" "S.gpg-agent.browser")
-                        (list #$(endpoint "ssh" "S.gpg-agent.ssh")
+                                 #$(endpoint "extra" "S.gpg-agent.extra")
-                              #$(endpoint "browser" "S.gpg-agent.browser")
+                                 ;; #$(endpoint "scdaemon" "S.scdaemon")
-                              #$(endpoint "extra" "S.gpg-agent.extra")
+                                 #$(endpoint "std" "S.gpg-agent"))))
                              ;; #$(endpoint "scdaemon" "S.scdaemon")
                              #$(endpoint "std" "S.gpg-agent"))
                        ;; Inherit graphical session environment.
                        #:environment-variables (environ))
                       args)))
                 (stop #~(make-systemd-destructor))
                 (documentation "Start 'gpg-agent', the GnuPG passphrase
 agent, with support for handling OpenSSH material."))))
@@ -57,7 +57,7 @@
 # Copyright © 2022 ( <paren@disroot.org>
 # Copyright © 2022, 2026 jgart <jgart@dismail.de>
 # Copyright © 2022-2023, 2025-2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-# Copyright © 2023-2026 Zheng Junjie <z572@z572.online>
+# Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
 # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
 # Copyright © 2023 Andy Tai <atai@atai.org>
 # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
@@ -502,7 +502,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/myrddin.scm			\
  %D%/packages/ncdu.scm				\
  %D%/packages/ncurses.scm			\
  %D%/packages/netbeans.scm			\
  %D%/packages/netpbm.scm			\
  %D%/packages/nettle.scm			\
  %D%/packages/networking.scm			\
@@ -611,7 +610,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			\
@@ -1094,7 +1092,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/catdoc-CVE-2017-11110.patch		\
  %D%/packages/patches/chez-irregex-import-cond-expand.patch	\
  %D%/packages/patches/chez-scheme-bin-sh.patch			\
  %D%/packages/patches/cianna-remove-error-for-missing-cuda.patch		\
  %D%/packages/patches/circos-remove-findbin.patch		\
  %D%/packages/patches/cdparanoia-fpic.patch			\
  %D%/packages/patches/cdrkit-libre-cross-compile.patch	\
@@ -1133,10 +1130,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.9.2-remove-patch-sections.patch \
-  %D%/packages/patches/codex-acp-0.11.1-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	\
@@ -1180,7 +1176,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/curlftpfs-fix-no_verify_hostname.patch	\
  %D%/packages/patches/cursynth-wave-rand.patch			\
  %D%/packages/patches/cvc5-reproducible-build.patch		\
  %D%/packages/patches/cvc5-symfpu-compatibility.patch		\
  %D%/packages/patches/cvs-CVE-2017-12836.patch		\
  %D%/packages/patches/cyrus-sasl-fix-time-h.patch              \
  %D%/packages/patches/d-feet-drop-unused-meson-argument.patch	\
@@ -1190,6 +1185,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/date-output-pkg-config-files.patch	\
  %D%/packages/patches/dbacl-include-locale.h.patch		\
  %D%/packages/patches/dbacl-icheck-multiple-definitions.patch	\
  %D%/packages/patches/dblatex-importlib.patch		\
  %D%/packages/patches/dblatex-inkscape-1.0.patch		\
  %D%/packages/patches/dbus-helper-search-path.patch		\
  %D%/packages/patches/ddd-build.patch				\
@@ -1243,7 +1239,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-treelib-remove-python2-compat.patch	\
  %D%/packages/patches/elm-offline-package-registry.patch	\
  %D%/packages/patches/elm-reactor-static-files.patch		\
-  %D%/packages/patches/emacs-agent-shell-fix-tests.patch        \
+  %D%/packages/patches/emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch	\
  %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
  %D%/packages/patches/emacs-disable-jit-compilation.patch			\
  %D%/packages/patches/emacs-doc-toc-shell-commands.patch	\
@@ -1471,6 +1467,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			\
@@ -1589,7 +1586,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch	\
  %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
  %D%/packages/patches/gtk-doc-respect-xml-catalog.patch	\
-  %D%/packages/patches/gtk-doc-mkhtml-test-fix.patch	\
+  %D%/packages/patches/gtk-doc-mkhtml-test-fix.patch	        \
  %D%/packages/patches/gtk4-demo-reproducible.patch             \
  %D%/packages/patches/gtk4-needs-udmabuf.patch                 \
  %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch    	\
  %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
  %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
@@ -1620,6 +1619,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				\
@@ -1655,7 +1655,6 @@ 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		\
@@ -1678,7 +1677,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/java-commons-collections-fix-java8.patch \
  %D%/packages/patches/java-guava-remove-annotation-deps.patch \
  %D%/packages/patches/java-jeromq-fix-tests.patch		\
  %D%/packages/patches/java-jtidy-remove-xerces-dependency.patch	\
  %D%/packages/patches/java-openjfx-build-jdk_version.patch     \
  %D%/packages/patches/java-powermock-fix-java-files.patch		\
  %D%/packages/patches/java-simple-xml-fix-tests.patch		\
@@ -1687,8 +1685,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/java-xerces-build_dont_unzip.patch	\
  %D%/packages/patches/java-xerces-xjavac_taskdef.patch	\
  %D%/packages/patches/jbr-17-xcursor-no-dynamic.patch	\
  %D%/packages/patches/jbr-25-wayland-drag-icon.patch	\
  %D%/packages/patches/jbr-25-wayland-intra-jvm-dnd.patch	\
  %D%/packages/patches/jdk-currency-time-bomb.patch		\
  %D%/packages/patches/jdk-currency-time-bomb2.patch		\
  %D%/packages/patches/jfsutils-add-sysmacros.patch		\
@@ -1705,6 +1701,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/libcss-check-format.patch		\
  %D%/packages/patches/libeb-gcc-14.patch			\
  %D%/packages/patches/libextractor-tidy-support.patch		\
  %D%/packages/patches/libfossil-skip-amalgamation.patch	\
  %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch	\
@@ -1751,7 +1748,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	\
@@ -1980,11 +1977,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/netcdf-date-time.patch			\
  %D%/packages/patches/netdde-build-fix.patch			\
  %D%/packages/patches/netdde-csum.patch			\
  %D%/packages/patches/java-apache-xml-commons-resolver-1.2-netbeans.patch \
  %D%/packages/patches/java-simplevalidation-1.14.1.patch	\
  %D%/packages/patches/netbeans-25-nativeexecution-paths.patch \
  %D%/packages/patches/netbeans-25-terminal-no-login-shell.patch \
  %D%/packages/patches/netbeans-25-source-only-build.patch	\
  %D%/packages/patches/netpbm-CVE-2017-2586.patch		\
  %D%/packages/patches/netpbm-CVE-2017-2587.patch		\
  %D%/packages/patches/netsurf-message-timestamp.patch		\
@@ -2079,7 +2071,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/open-zwave-hidapi.patch			\
  %D%/packages/patches/opusfile-CVE-2022-47021.patch		\
  %D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
  %D%/packages/patches/orca-fix-gst-init-check-call.patch \
  %D%/packages/patches/orpheus-cast-errors-and-includes.patch	\
  %D%/packages/patches/ots-no-include-missing-file.patch	\
  %D%/packages/patches/owncloud-disable-updatecheck.patch	\
@@ -2132,6 +2123,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-pyreadstat-link-libiconv.patch	\
  %D%/packages/patches/python-sip-include-dirs.patch	\
  %D%/packages/patches/python-scikit-build-setuptools-compat.patch	\
  %D%/packages/patches/python-scikit-image-fix-python-pillow.patch	\
  %D%/packages/patches/python-sgmllib3k-assertions.patch	\
  %D%/packages/patches/python-sphobjinv-defer-ssl-import.patch	\
  %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch	\
@@ -2182,8 +2174,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/perl-www-curl-remove-symbol.patch	\
  %D%/packages/patches/perl-xml-libxml-fix-function-prototypes.patch	\
  %D%/packages/patches/phoronix-test-suite-fsdg.patch		\
  %D%/packages/patches/php-01-fix-expired-certificate.patch	\
  %D%/packages/patches/php-02-fix-sni-tests.patch		\
  %D%/packages/patches/picprog-non-intel-support.patch		\
  %D%/packages/patches/pidgin-add-search-path.patch		\
  %D%/packages/patches/pinball-system-ltdl.patch		\
@@ -2272,7 +2262,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       \
@@ -2362,16 +2351,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/renpy-fix-integer-slots.patch			\
  %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch	\
  %D%/packages/patches/rdkit-unbundle-external-dependencies.patch	\
  %D%/packages/patches/r-biostrings-r4.6.0-compat.patch		\
  %D%/packages/patches/r-h5mread-0001-h5mread-1.3.2-Get-rid-of-non-API-calls-to-R.patch \
  %D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch	\
  %D%/packages/patches/r-mscoreutils-0001-fix-non-API-call-to-R-SETLENGTH-by-using-lengthgets.patch \
  %D%/packages/patches/r-rsamtools-r-4.6.0-compat.patch		\
  %D%/packages/patches/r-snpstats-0001-fixed-non-API-except-for-IS_S4_OBJECT.patch \
  %D%/packages/patches/r-snpstats-0002-fixed-IS_S4_OBJECT.patch \
  %D%/packages/patches/r-sapa-lapack.patch			\
  %D%/packages/patches/r-shortread-0001-ShortRead-1.69.3-Get-rid-of-non-API-calls-to-R.patch \
  %D%/packages/patches/r-sparsearray-r-4.6.0-compat.patch	\
  %D%/packages/patches/ripperx-missing-file.patch		\
  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
  %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch	\
@@ -2416,14 +2397,6 @@ dist_patch_DATA =						\
  %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-codex-0.124.0-code-mode-stub-toolname.patch	\
  %D%/packages/patches/rust-codex-0.124.0-remove-patch-sections.patch	\
  %D%/packages/patches/rust-librocksdb-sys-unbundled-sources.patch	\
  %D%/packages/patches/rust-ring-0.17-ring-core.patch		\
  %D%/packages/patches/rw-igraph-0.10.patch			\
  %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch	\
@@ -2529,7 +2502,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/texmacs-wayland-hidpi.patch	\
  %D%/packages/patches/tflite-micro_disable_download.patch 	\
  %D%/packages/patches/thefuck-test-environ.patch		\
  %D%/packages/patches/thefuck-remove-broken-tests.patch	\
  %D%/packages/patches/tidy-CVE-2015-5522+5523.patch		\
  %D%/packages/patches/timewarrior-time-sensitive-tests.patch	\
  %D%/packages/patches/tinydir-fix-cbehave-test.patch		\
@@ -185,7 +185,7 @@ terminals.")
    (native-inputs
     (append
       (list clisp
-             python-cython-0 ;; See https://bugzilla.redhat.com/show_bug.cgi?id=2231865
+             python-cython
             doxygen
             gettext-minimal)
       ;; icedtea doesn't build reliably on all architectures.
@@ -37,7 +37,6 @@
  #:use-module (gnu packages)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix utils))
 (define-public acl
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2015-2018, 2020-2023 Eric Bavier <bavier@posteo.net>
@@ -109,7 +109,6 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system ruby)
@@ -1158,7 +1157,7 @@ on memory usage on GNU/Linux systems.")
 (define-public htop
  (package
    (name "htop")
-    (version "3.5.1")
+    (version "3.4.1")
    (source
     (origin
       (method git-fetch)
@@ -1166,7 +1165,7 @@ on memory usage on GNU/Linux systems.")
             (url "https://github.com/htop-dev/htop")
             (commit version)))
       (sha256
-        (base32 "187gyj081n6qsidll5wdri3jkr4m2i4m461z3xv03y342f5yj3lv"))
+        (base32 "058y4a4mvx9m179dyr4wi8mlm6i4ybywshadaj4cvfn9fv0r0nkx"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -1309,8 +1308,7 @@ re-executing them as necessary.")
                                  version ".tar.gz"))
              (sha256
               (base32
-                "11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1"))
+                "11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1"))))
              (patches (search-patches "inetutils-drop-test.patch"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -3442,7 +3440,7 @@ modules and plugins that extend Ansible.")
     (list ansible
           bash-minimal
           encfs
-           fuse
+           fuse-2
           util-linux ;; for umount
           findutils
           git
@@ -3751,68 +3749,59 @@ summarizes network bandwidth by process and remote host.")
 (define-public munge
  (package
    (name "munge")
-    (version "0.5.18")
+    (version "0.5.14")
    (source (origin
-              (method git-fetch)
+              (method url-fetch)
-              (uri (git-reference
+              (uri (string-append "https://github.com/dun/munge/releases/"
-                     (url "https://github.com/dun/munge")
+                                  "download/munge-" version "/munge-"
-                     (commit (string-append "munge-" version))))
+                                  version ".tar.xz"))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1b7gm680dlvmgvj9vxy7n0cqmnv1rl9n4563vasxdxx54f78j30s"))
+                "0h06sghb4rqvv1ywyd6mzsmbcgh712v6ygrff0gzm440y4ca41k6"))
              (modules '((guix build utils)))
              (snippet
-               ;; Don't insist on write access to /var.
+               '(begin
-               #~(substitute* "src/etc/Makefile.am"
+                  ;; Don't insist on write access to /var.
-                   (("\\$\\(MKDIR_P\\) .*(local|run)statedir.*" all)
+                  (substitute* "src/etc/Makefile.in"
-                    (string-append ": " all))))))
+                    (("\\$\\(INSTALL\\)(.*)localstatedir" _ middle)
                     (string-append "-$(INSTALL)" middle "localstatedir"))
                    (("\\$\\(MKDIR_P\\) .*(local|run)statedir.*")
                     ""))
                  #t))))
    (inputs
     (list openssl libgcrypt))
    (native-inputs
     (list autoconf
           automake
           libtool
           procps))                               ;for tests
    (build-system gnu-build-system)
    (arguments
-     (list #:configure-flags
+     `(#:configure-flags
-           #~(list "--localstatedir=/var"
+       (list "--localstatedir=/var"
-                   "--disable-static"
+             (string-append "--with-pkgconfigdir="
-                   #$@(if (%current-target-system)
+                            (assoc-ref %outputs "out") "/lib/pkgconfig")
-                          ;; Assume yes on pipes when cross compiling.
+             (string-append "--with-libgcrypt-prefix="
-                          `("ac_cv_file__dev_spx=yes"
+                            (assoc-ref %build-inputs "libgcrypt"))
-                            "x_ac_cv_check_fifo_recvfd=yes")
+             ,@(if (%current-target-system)
-                          '())
+                 ;; Assume yes on pipes when cross compiling.
-
+                 `("ac_cv_file__dev_spx=yes"
-                   ;; The '.pc' file is not installed when omitting this flag.
+                   "x_ac_cv_check_fifo_recvfd=yes")
-                   (string-append "--with-pkgconfigdir="
+                 '()))
-                                  #$output "/lib/pkgconfig"))
+       #:phases
-           #:phases
+       (modify-phases %standard-phases
-           #~(modify-phases %standard-phases
+         ;; XXX Many test series fail.  Some might be fixable, others do no-no
-               (add-before 'bootstrap 'pre-bootstrap
+         ;; things like invoking ‘sudo’.
-                 (lambda _
+         (add-after 'unpack 'skip-failing-tests
-                   (for-each patch-shebang (find-files "build-aux"))))
+           (lambda _
-               (add-after 'unpack 'skip-failing-tests
+             (for-each (lambda (test)
-                 (lambda _
+                         (substitute* "t/Makefile.in"
-                   ;; Pass '--force' to 'munged'; without it, it fails with "Socket
+                           (((string-append test "\\.t ")) "")))
-                   ;; is inaccessible" due to the build directory not being
+                       (list "0100-munged-lock"
-                   ;; world-readable.
+                             "0010-basic"
-                   (substitute* "tests/sharness.d/03-munged.sh"
+                             "0011-munged-cmdline"
-                     (("--group-update-time=-1" all)
+                             "0012-munge-cmdline"
-                      (string-append all " --force")))
+                             "0013-unmunge-cmdline"
-
+                             "0101-munged-security-socket"
-                   ;; The tests below invoke 'sudo' or have special expectations
+                             "0102-munged-security-keyfile"
-                   ;; about network interfaces.
+                             "0103-munged-security-logfile"
-                   (for-each (lambda (test)
+                             "0110-munged-origin-addr"))
-                               (substitute* "tests/Makefile.am"
+             #t)))))
                                 (((string-append test "\\.t "))
                                  "")))
                             (list "0100-munged-lock"
                                   "0101-munged-security-socket"
                                   "0102-munged-security-keyfile"
                                   "0103-munged-security-logfile"
                                   "0110-munged-origin-addr")))))))
    (home-page "https://dun.github.io/munge/")
    (synopsis "Cluster computing authentication service")
    (description
@@ -3927,6 +3916,18 @@ rules is done with the @code{auditctl} utility.")
                (wrap-program (string-append ndiff "/bin/ndiff")
                  `("GUIX_PYTHONPATH" prefix
                    (,(python-path ndiff)))))))
          (add-before 'check 'fix-tests-for-python-3.12
            (lambda _
              (substitute* "ndiff/ndifftest.py"
                (("import imp")
                 "import importlib.util")
                (("ndiff = imp\\.load_source\\(\"ndiff\", \"ndiff\\.py\"\\)")
                 (string-join
                  '("spec = \
 importlib.util.spec_from_file_location(\"ndiff\", \"ndiff.py\")"
                    "ndiff = importlib.util.module_from_spec(spec)"
                    "spec.loader.exec_module(ndiff)")
                  "\n")))))
          ;; These are the tests that do not require network access.
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
@@ -4056,51 +4057,59 @@ plug-in architecture to allow monitoring other system metrics.")
    (license license:gpl2+)))
 (define-public thefuck
-  (package
+  ;; Latest release, 3.32, is not compatible with Python 3.12.
-    (name "thefuck")
+  (let ((revision "0")
-    (version "3.32")
+        (commit "c7e7e1d884d3bb241ea6448f72a989434c2a35ec"))
-    (source
+    (package
-     (origin
+      (name "thefuck")
-       (method git-fetch)
+      (version (git-version "3.32" revision commit))
-       (uri (git-reference
+      (source
-             (url "https://github.com/nvbn/thefuck")
+       (origin
-             (commit version)))
+         (method git-fetch)
-       (file-name (git-file-name name version))
+         (uri (git-reference
-       (sha256
+                (url "https://github.com/nvbn/thefuck")
-        (base32 "18ipa1bm6q1n5drbi8i65726hhqhl1g41390lfqrc11hkbvv443d"))
+                (commit commit)))
-       (patches (search-patches "thefuck-test-environ.patch"
+         (file-name (git-file-name name version))
-                                "thefuck-remove-broken-tests.patch"))))
+         (sha256
-    (build-system pyproject-build-system)
+          (base32 "1l3i2cpdf3vznpbzqw7b18l23xikqs7andx6yzqvm5415snaqg06"))
-    (arguments
+         (patches (search-patches "thefuck-test-environ.patch"))))
-     (list
+      (build-system pyproject-build-system)
-      #:phases
+      (arguments
-      #~(modify-phases %standard-phases
+       (list
-          (add-before 'check 'pre-check
+        #:test-flags
-            (lambda _
+        #~(list
-              ;; Tests look for installed package
+           "--deselect=tests/test_utils.py::TestGetValidHistoryWithoutCurrent"
-              ;; Some tests need write access to $HOME.
+           "--ignore=tests/functional/conftest.py")
-              (setenv "HOME" "/tmp")
+        #:phases
-              ;; Even with that, this function tries to mkdir /.config.
+        #~(modify-phases %standard-phases
-              (substitute* "tests/test_utils.py"
+            (add-before 'check 'pre-check
-                (("settings\\.init\\(\\)") "")))))))
+              (lambda _
-    (native-inputs
+                ;; ModuleNotFoundError: No module named 'pytest_docker_pexpect'
-     (list go
+                (delete-file "tests/functional/conftest.py")
-           python-mock
+                ;; Tests look for installed package
-           python-pytest-8
+                ;; Some tests need write access to $HOME.
-           python-pytest-mock
+                (setenv "HOME" "/tmp")
-           python-setuptools
+                ;; Even with that, this function tries to mkdir /.config.
-           python-wheel))
+                (substitute* "tests/test_utils.py"
-    (inputs
+                  (("settings\\.init\\(\\)") "")))))))
-     (list python-colorama
+      (native-inputs
-           python-decorator
+       (list go
-           python-psutil
+             python-mock
-           python-pyte))
+             ;; Uses test markers that are incompatible with pytest 9.
-    (home-page "https://github.com/nvbn/thefuck")
+             python-pytest-8
-    (synopsis "Correct mistyped console command")
+             python-pytest-mock
-    (description
+             python-setuptools))
-     "The Fuck tries to match a rule for a previous, mistyped command, creates
+      (inputs
       (list python-colorama
             python-decorator
             python-psutil
             python-pyte))
      (home-page "https://github.com/nvbn/thefuck")
      (synopsis "Correct mistyped console command")
      (description
       "The Fuck tries to match a rule for a previous, mistyped command, creates
 a new command using the matched rule, and runs it.")
-    (license license:x11)))
+      (license license:x11))))
 (define-public di
  (package
@@ -7052,7 +7061,7 @@ network, which causes enabled computers to power on.")
 (define-public witr
  (package
    (name "witr")
-    (version "0.3.1")
+    (version "0.1.7")
    (source
     (origin
       (method git-fetch)
@@ -7061,7 +7070,7 @@ network, which causes enabled computers to power on.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "03v9n4mdvqm0knqjl4s64321i5clqpmlrlkkdb87glzb9p28sg00"))))
+        (base32 "18xx01lxd5j019gy9jmpms3awv4snlr028w01bfkyfid6hlwxbq2"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -7179,35 +7188,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")
@@ -88,7 +88,6 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system pyproject)
  #:use-module ((guix build-system python) #:select (pypi-uri))
  #:use-module (guix build-system r)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -458,7 +457,7 @@ precision.")
    (inputs
     ;; TODO: Unbundle "libmicropython.a".
     (list ao
-           fltk
+           fltk-1.3
           glpk
           gmp
           gsl
@@ -41,7 +41,6 @@
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
@@ -238,12 +238,12 @@ contains the graphical user interface for synfig.")
             (when tests?
               (invoke "./tests")))))))
    (native-inputs
-     (cons* gettext-minimal
+     (list gettext-minimal
-            `(,glib "bin")
+           `(,glib "bin")
-            perl
+           nasm
-            pkg-config
+           perl
-            python-wrapper
+           pkg-config
-            (maybe-nasm)))
+           python-wrapper))
    (inputs
     (list cairo
           curl
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016, 2020, 2021, 2025, 2026 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2020, 2021, 2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
 ;;; Copyright © 2019, 2022, 2024 Andy Tai <atai@atai.org>
@@ -43,7 +43,6 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix gexp)
  #:use-module (guix utils)
  #:use-module (gnu packages)
  #:use-module (gnu packages admin)
  #:use-module (gnu packages autotools)
@@ -249,16 +248,6 @@ complex.  It supports all currently known x86 architectural extensions, and
 has strong support for macros.")
    (license license:bsd-2)))
 (define* (maybe-nasm #:optional
                     (system (or (%current-target-system)
                                 (%current-system))))
  ;; For some packages nasm is only needed when compiling to/for x86/x86_64.
  (if (target-x86? system)
      (list nasm)
      '()))
 (export maybe-nasm)
 (define-public yasm
  (package
    (name "yasm")
@@ -179,7 +179,6 @@
  #: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 python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
@@ -1210,7 +1209,7 @@ PulseAudio clients, featuring:
 (define-public ardour
  (package
    (name "ardour")
-    (version "9.2")
+    (version "9.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1227,7 +1226,7 @@ PulseAudio clients, featuring:
 namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
              (sha256
               (base32
-                "14s6cq3x7l7b682ah9k8cdr6plfirlgm882dc2nm51lxwl91zcfd"))
+                "00bramm8dq0ihr376n7l9rg0mjzxmzw6lxvsbsdlrdsimfwsy16p"))
              (file-name (git-file-name name version))))
    (build-system waf-build-system)
    (arguments
@@ -3238,30 +3237,27 @@ synchronous execution of all clients, and low latency operation.")
  (package
    (inherit jack-1)
    (name "jack2")
-    (version "1.9.21")
+    ;; 1.9.22 does not compile with Python 3.12, use the latest commit instead.
    (properties '((commit . "17959465a722225a36a8b612aed26764036f258e")
                  (revision . "0")))
    (version (git-version "1.9.22"
                          (assoc-ref properties 'revision)
                          (assoc-ref properties 'commit)))
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                    (url "https://github.com/jackaudio/jack2")
+                     (url "https://github.com/jackaudio/jack2")
-                    (commit (string-append "v" version))))
+                     (commit (assoc-ref properties 'commit))))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0sbrffmdbajvrk7iqvsvrnwnpvmicvbjyq3f52r6ashdsznsz03b"))))
+                "18dbjq9y8mcp27j9aaqdlg4976hrisr7b88lk84ck09gmzlwqalp"))))
    (build-system waf-build-system)
    (arguments
     `(#:tests? #f                      ; no check target
       #:configure-flags '("--dbus" "--alsa")
       #:phases
       (modify-phases %standard-phases
         ;; Python 3.11 has removed the 'U' (universal newline) mode.  It has
         ;; been the default since Python 3.3.
         (add-after 'unpack 'python-compatibility
           (lambda _
             (substitute* '("waflib/Context.py"
                            "waflib/ConfigSet.py")
               (("m='rU'") "m='r'")
               (("read\\('rU'") "read('r'"))))
         (add-before 'configure 'set-linkflags
           (lambda _
             ;; Ensure -lstdc++ is the tail of LDFLAGS or the simdtests.cpp
@@ -3287,7 +3283,7 @@ synchronous execution of all clients, and low latency operation.")
           expat
           libsamplerate
           opus
-           python-dbus-1.2
+           python-dbus
           readline))
    (native-inputs
     (list pkg-config))
@@ -4090,9 +4086,7 @@ one-dimensional sample-rate conversion library.")
                 (string-append "'" #$(this-package-input "libsndfile")
                                "/lib/libsndfile"))))))))
    (native-inputs
-     (list python-pytest
+     (list python-pytest python-setuptools))
           python-pytest-cov
           python-setuptools))
    (inputs
     (list libsndfile
           portaudio))
@@ -6529,23 +6523,22 @@ on the ALSA software PCM plugin.")
 (define-public snd
  (package
    (name "snd")
-    (version "26.3")
+    (version "25.2")
-    (source
+    (source (origin
-     (origin
+              (method url-fetch)
-       (method url-fetch)
+              (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/"
-       (uri (string-append "https://ccrma.stanford.edu/software/snd/snd-"
+                                  "snd-" version ".tar.gz"))
-                           version ".tar.gz"))
+              (sha256
-       (sha256
+               (base32
-        (base32
+                "0fgxqk0byxdj6059mb9d5qic2dqjabz49j0szsrn2y3c9nz6iyq4"))))
         "1d573mjlrn9rhl9g0a3d1rkar34q60ln8mwlbibfalpn8lsz59a0"))))
    (build-system gnu-build-system)
    (arguments
     (list
-      #:tests? #f                       ; No tests.
+      #:tests? #f                       ; no tests
-      #:out-of-source? #f               ; Required by 'install-doc'.
+      #:out-of-source? #f               ; for the 'install-doc' phase
      #:configure-flags
-      #~(let
+      #~(let ((docdir (string-append #$output "/share/doc/"
-            ((docdir (string-append #$output "/share/doc/snd-" #$version)))
+                                     #$name "-" #$version)))
          (list "--with-alsa"
                "--with-jack"
                "--with-gmp"
@@ -6553,20 +6546,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
+              (install-file "s7.h" (string-append #$output "/include"))))
                                                  "/include"))))
          (add-after 'install 'install-doc
            (lambda _
-              (let
+              (let ((doc (string-append #$output "/share/doc/"
-                  ((docdir (string-append #$output "/share/doc/snd-"
+                                        #$name "-" #$version)))
                                          #$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 +6576,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
+    (license (license:non-copyleft "file://COPYING"))))
     ;; 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"))))
 (define-public libspecbleach
  (package
@@ -7827,60 +7815,59 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
                  (delete-file-recursively "third_party")
                  (delete-file-recursively "modules")))))
    (build-system cmake-build-system)
    (arguments
     (list
      #:configure-flags
      #~(list "-DLINK_BUILD_QT_EXAMPLES=ON"
              "-DLINK_BUILD_JACK=ON")
      #:phases
      #~(modify-phases %standard-phases
          (replace 'check
            (lambda* (#:key inputs tests? #:allow-other-keys)
              (when tests?
                (let* ((python (search-input-file inputs "/bin/python3"))
                       (run-tests "../source/ci/run-tests.py"))
                  (invoke python run-tests "--target" "LinkCoreTest")
                  (invoke python run-tests "--target" "LinkDiscoveryTest")))))
          (add-before 'install 'patch-cmake
            (lambda* (#:key inputs #:allow-other-keys)
              (let* ((source "../source/"))
                (substitute* (string-append source
                                            "cmake_include/AsioStandaloneConfig.cmake")
                  (((string-append "\\$\\{CMAKE_CURRENT_LIST_DIR\\}/\\.\\./"
                                   "modules/asio-standalone/asio/include"))
                   (dirname (search-input-file inputs "include/asio.hpp"))))
                (substitute* (string-append source "AbletonLinkConfig.cmake")
                  (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include")
                   "${CMAKE_CURRENT_LIST_DIR}/../../../include")
                  (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include/ableton/Link\\.hpp")
                   "${CMAKE_CURRENT_LIST_DIR}/../../../include/ableton/Link.hpp")))))
          (replace 'install
            (lambda _
              (let* ((out #$output)
                     (lib-cmake (string-append out "/lib/cmake/ableton-link"))
                     (source "../source"))
                (for-each delete-file
                          '("bin/LinkDiscoveryTest" "bin/LinkCoreTest"))
                (copy-recursively "bin" (string-append out "/bin"))
                (copy-recursively (string-append source "/include/ableton")
                                  (string-append out "/include/ableton"))
                (install-file (string-append source "/AbletonLinkConfig.cmake")
                              lib-cmake)
                (install-file (string-append source
                                             "/cmake_include/AsioStandaloneConfig.cmake")
                              (string-append lib-cmake "/cmake_include"))))))))
    (native-inputs
     (list catch-framework
-           python ;for running tests
+           portaudio                    ;for portaudio examples
-           portaudio)) ;for portaudio examples
+           python                       ;for running tests
           python-setuptools))          ;for running tests
    (inputs
     (list jack-1)) ;for JACK examples
    (propagated-inputs
     ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp
     ;; contains '#include <asio.hpp>'.
     (list asio-1.28))
    (arguments
     `(#:configure-flags
       '("-DLINK_BUILD_QT_EXAMPLES=ON"
         "-DLINK_BUILD_JACK=ON")
       #:phases
       (modify-phases %standard-phases
         (replace 'check
           (lambda* (#:key inputs tests? #:allow-other-keys)
             (when tests?
               (let* ((python (search-input-file inputs "/bin/python3"))
                      (run-tests "../source/ci/run-tests.py"))
                 (invoke python run-tests "--target" "LinkCoreTest")
                 (invoke python run-tests "--target" "LinkDiscoveryTest")))))
         (add-before 'install 'patch-cmake
           (lambda* (#:key inputs #:allow-other-keys)
             (let* ((source "../source/"))
               (substitute* (string-append source
                                           "cmake_include/AsioStandaloneConfig.cmake")
                 (((string-append "\\$\\{CMAKE_CURRENT_LIST_DIR\\}/\\.\\./"
                                  "modules/asio-standalone/asio/include"))
                  (string-append (assoc-ref inputs "asio")
                                 "/include")))
               (substitute* (string-append source "AbletonLinkConfig.cmake")
                 (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include")
                  "${CMAKE_CURRENT_LIST_DIR}/../../../include")
                 (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include/ableton/Link\\.hpp")
                  "${CMAKE_CURRENT_LIST_DIR}/../../../include/ableton/Link.hpp")))))
         (replace 'install
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))
                    (bin (string-append out "/bin"))
                    (lib-cmake (string-append out "/lib/cmake/ableton-link"))
                    (source "../source"))
               (for-each (lambda (test-file)
                           (delete-file test-file))
                         '("bin/LinkDiscoveryTest" "bin/LinkCoreTest"))
               (copy-recursively "bin" bin)
               (copy-recursively (string-append source "/include/ableton")
                                 (string-append out "/include/ableton"))
               (install-file (string-append source "/AbletonLinkConfig.cmake")
                             lib-cmake)
               (install-file (string-append source
                                            "/cmake_include/AsioStandaloneConfig.cmake")
                             (string-append lib-cmake "/cmake_include"))))))))
    (home-page "https://github.com/Ableton/link")
    (synopsis "Synchronize musical beat, tempo, and phase across multiple applications")
    (description
@@ -8066,7 +8053,7 @@ as sample rate, determining whether an audio file is silent, and much more.")
    (propagated-inputs
     (list python-numba python-numpy python-scipy python-six))
    (native-inputs
-     (list python-pytest python-pytest-cov python-setuptools python-wheel))
+     (list python-pytest python-setuptools python-wheel))
    (home-page "https://github.com/bmcfee/resampy")
    (synopsis "Efficient signal resampling")
    (description
@@ -8096,8 +8083,7 @@ Home Page}.")
     (list
      #:test-flags
      ;; Ignore --mpl flag.
-      '(list "-c" "/dev/null"
+      '(list "-k" (string-append
             "-k" (string-append
                   ;; Resampling tests require python-samplerate.
                   "not resample"
                   ;; These tests use Pooch and download data files.
@@ -8122,7 +8108,6 @@ Home Page}.")
     (list python-matplotlib
           python-packaging
           python-pytest
           python-pytest-cov
           python-resampy
           python-setuptools
           python-wheel))
@@ -0,0 +1,58 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 #
 # 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/>.
 import importlib.util
 import json
 def pytest_addoption(parser):
    """Add stub options to be ignored by pytest.
    More precisely, inject all options provided in .pytest_guix_options.json,
    except options whose plugin is indeed installed.
    For example, if the json file records --cov:
      if the pytest_cov module is installed, its --cov will be used.
      otherwise, --cov is ignored (read by this parser, but nothing is done
      with it).
    Flags can be given with additional keyword arguments in a json object.
    If the json object is not given, fallback to the default
    {"action": "append", "nargs": "?"}.  In practice, these arguments are only
    mandatory for the store_true and store_const actions to avoid eating other
    arguments.
    This allows to remove development packages, which are not required at build
    time while at the same time avoiding the need to adjust test options in
    pyproject.toml or other configuration files.
    """
    with open(".pytest_guix_options.json", "r") as options_file:
        plugin_options = json.load(options_file)
        group = parser.getgroup(
            "guix", "Options ignored by the Guix pyproject-build-system"
        )
        # Only add options for plugins that are not present.
        for key, options in plugin_options.items():
            if importlib.util.find_spec(f"pytest_{key}") is None:
                # Plugin not found, add stub options
                for option, kwargs in options.items():
                    if kwargs:
                        group.addoption(option, **kwargs)
                    else:
                        group.addoption(option, action="append", nargs="?")
@@ -50,7 +50,6 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #: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)
@@ -107,6 +106,7 @@
  #:use-module (gnu packages rsync)
  #:use-module (gnu packages ruby-xyz)
  #:use-module (gnu packages serialization)
  #:use-module (gnu packages sphinx)
  #:use-module (gnu packages ssh)
  #:use-module (gnu packages time)
  #:use-module (gnu packages tls)
@@ -137,7 +137,6 @@
           python-paramiko
           python-pexpect
           python-pytest
           python-pytest-runner
           python-setuptools-scm
           tzdata-for-tests
           python-mock))
@@ -632,41 +631,26 @@ rsnapshot uses hard links to deduplicate identical files.")
 (define-public borg
  (package
    (name "borg")
-    (version "1.4.3")
+    (version "1.4.4")
    (source
     (origin
-       (method url-fetch)
+       (method git-fetch)
-       (uri (pypi-uri "borgbackup" version))
+       (uri (git-reference
              (url "https://github.com/borgbackup/borg")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "07s4jqcv03s98hi6lvqpvmnnhl532qnvv11mjy2xc08rbmsgmfvr"))
+        (base32 "0bk302lbjjz1y8dg78wqqys80bm7mzkj5yf6wgyqdwvbqpsnpim4"))))
       (snippet
        #~(begin
            ;; Delete files generated by Cython.  We used to have a regex that
            ;; created the list of generated files but Borg has added new
            ;; non-generated C files that cause the regex to generate the
            ;; wrong list.
            (for-each delete-file
                      '("src/borg/algorithms/checksums.c"
                        "src/borg/chunker.c"
                        "src/borg/compress.c"
                        "src/borg/crypto/low_level.c"
                        "src/borg/hashindex.c"
                        "src/borg/item.c"
                        "src/borg/platform/darwin.c"
                        "src/borg/platform/freebsd.c"
                        "src/borg/platform/linux.c"
                        "src/borg/platform/posix.c"
                        "src/borg/platform/syncfilerange.c"
                        "src/borg/platform/windows.c"))))))
    (build-system pyproject-build-system)
    (arguments
     (list
      #:modules '((srfi srfi-26)        ; for cut
                  (guix build utils)
                  (guix build pyproject-build-system))
      ;; tests: 1318 passed, 293 skipped
      #:test-flags
      #~(list "--benchmark-skip"
-              "--numprocesses" (number->string (parallel-job-count))
+              "--numprocesses" (number->string (min 8 (parallel-job-count)))
              "--pyargs" "borg.testsuite"
              "-k" (string-join
                    ;; These tests need to write to '/var'.
@@ -687,7 +671,15 @@ rsnapshot uses hard links to deduplicate identical files.")
                          "test_mount_hardlinks "
                          "test_readonly_mount "
                          "test_fuse_versions_view "
-                          "test_migrate_lock_alive")
+                          "test_migrate_lock_alive"
                          ;; Test files are not in /gnu/store
                          "test_convert_all[False]"
                          "test_convert_all[True]"
                          "test_convert_segments[False]"
                          "test_convert_segments[True]"
                          "test_detect_attic_repo"
                          "test_key_export_qr"
                          "test_keys")
                    " and not "))
      #:phases
      #~(modify-phases %standard-phases
@@ -703,46 +695,58 @@ rsnapshot uses hard links to deduplicate identical files.")
                (setenv "BORG_LIBLZ4_PREFIX" lz4)
                (setenv "BORG_LIBXXHASH_PREFIX" xxhash)
                (setenv "BORG_LIBZSTD_PREFIX" zstd))))
-          (add-after 'install 'install-doc
+          (add-before 'build 'fix-testsuite-setuid-mode
            (lambda _
-              (let ((man (string-append #$output "/share/man/man1"))
+              (substitute* "src/borg/testsuite/archiver.py"
-                    (misc (string-append #$output "/share/doc/borg-"
+                (("0o4755") "0o0755"))))
-                                         #$(package-version this-package))))
+          (add-after 'install 'build-and-install-docs
            (lambda _
              (let* ((doc (string-append #$output "/share/doc/borg-" #$version))
                     (html (string-append doc "/html"))
                     (txt (string-append doc "/txt"))
                     (misc (string-append doc "/misc"))
                     (man (string-append #$output "/share/man/man1")))
                (with-directory-excursion "docs"
                  (invoke "make" "text" "man" "singlehtml"))
                (for-each (cut install-file <> misc)
                          '("docs/misc/create_chunker-params.txt"
                            "docs/misc/borg-data-flow.png"
                            "docs/misc/internals-picture.txt"
                            "docs/misc/prune-example.txt"))
-                (copy-recursively "docs/man" man))))
+                (copy-recursively "docs/_build/man" man)
-          (add-after 'install-doc 'install-shell-completions
+                (copy-recursively "docs/_build/singlehtml" html)
                (copy-recursively "docs/_build/text" txt))))
          (add-after 'build-and-install-docs 'install-shell-completions
            (lambda _
-              (let ((etc (string-append #$output "/etc"))
+              (let* ((etc (string-append #$output "/etc"))
-                    (share (string-append #$output "/share")))
+                     (share (string-append #$output "/share"))
                     (bash (string-append etc "/bash_completion.d"))
                     (zsh (string-append share "/zsh/site-functions"))
                     (fish (string-append share "/fish/vendor_completions.d")))
                (with-directory-excursion "scripts/shell_completions"
-                  (install-file "bash/borg"
+                  (install-file "bash/borg" bash)
-                                (string-append etc "/bash_completion.d"))
+                  (install-file "zsh/_borg" zsh)
-                  (install-file "zsh/_borg"
+                  (install-file "fish/borg.fish" fish))))))))
                                (string-append share "/zsh/site-functions"))
                  (install-file "fish/borg.fish"
                                (string-append share "/fish/vendor_completions.d")))))))))
    (native-inputs
     (list python-cython
-           python-dateutil
+           python-guzzle-sphinx-theme
           python-pkgconfig
           python-pytest
           python-pytest-benchmark
           python-pytest-xdist
           python-setuptools
           python-setuptools-scm
-           python-wheel))
+           python-sphinx
           python-sphinxcontrib-jquery))
    (inputs
     (list acl
           lz4
           openssl
-           ;; This is the latest version of msgpack accepted by 'setup.py'.
+           python-msgpack
           python-msgpack-for-borg
           ;; FUSE 3 isn't working well, so we stick with FUSE 2 for now:
           ;; <https://issues.guix.gnu.org/53407>
           python-llfuse
           python-packaging
           xxhash
           `(,zstd "lib")))
    (synopsis "Deduplicated, encrypted, authenticated and compressed backups")
@@ -1299,7 +1303,6 @@ compression parameters used by Gzip.")
    (native-inputs
     (list python-flexmock
           python-pytest
           python-pytest-cov
           python-setuptools
           python-wheel))
    (inputs
@@ -1363,9 +1366,9 @@ borgmatic is powered by borg.")
            (assoc-ref qt:%standard-phases 'qt-wrap)))))
    (native-inputs
     (list python-platformdirs
           python-pytest
           python-pytest-mock
           python-pytest-qt
           python-pytest-runner
           python-setuptools
           python-setuptools-git))
    (inputs
@@ -14,7 +14,6 @@
 ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2026 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2023 Advanced Micro Devices, Inc.
 ;;;
 ;;; This file is part of GNU Guix.
@@ -42,9 +41,7 @@
  #:use-module (guix amd-gpu)
  #:use-module (guix search-paths)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system meson)
  #:use-module (gnu packages)
@@ -732,7 +729,7 @@ and options.  With careful benchmarking, different hardware can be compared.")
 (define-public kdiskmark
  (package
    (name "kdiskmark")
-    (version "3.2.0")
+    (version "3.1.4")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -741,13 +738,14 @@ and options.  With careful benchmarking, different hardware can be compared.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "161yyy4fcy5bnzhbcd7p90nlcslcsfp7n3m3bz9bygch7bdjw46g"))))
+                "1x8vd6swmf0i7f6m6wl2154n6plx8jkmcqfq6zxbdy255f1da74c"))))
-    (build-system qt-build-system)
+    (build-system cmake-build-system)
    (arguments
     (list
      #:qtbase qtbase
      #:configure-flags
-      #~(list (string-append "-DPOLKITQT-1_INSTALL_DIR=" #$output))
+      ;; Drop runtime dependency on KDE's KFAuth.
      #~(list "-DPERFORM_PAGECACHE_CLEARING_USING_KF5AUTH=no"
              (string-append "-DPOLKITQT-1_INSTALL_DIR=" #$output))
      #:tests? #f                       ;no test suite
      #:phases
      #~(modify-phases %standard-phases
@@ -760,10 +758,10 @@ and options.  With careful benchmarking, different hardware can be compared.")
            (lambda _
              (rmdir "src/singleapplication")
              (symlink #$(package-source
-                          (this-package-input "single-application"))
+                          (this-package-input "single-application-qt5"))
                       "src/singleapplication"))))))
-    (native-inputs (list extra-cmake-modules qttools))
+    (native-inputs (list extra-cmake-modules qttools-5))
-    (inputs (list fio polkit-qt6 single-application qtwayland))
+    (inputs (list fio polkit-qt qtbase-5 single-application-qt5))
    (home-page "https://github.com/JonMagon/KDiskMark")
    (synopsis "Simple disk benchmark tool")
    (description "KDiskMark is an HDD and SSD benchmark tool.  KDiskMark
@@ -65,7 +65,6 @@
  #: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 build-system r)
  #:use-module (guix build-system ruby)
@@ -913,7 +912,7 @@ suite native in R.")
 (define-public r-bpcells
  (package
    (name "r-bpcells")
-    (version "0.3.1")
+    (version "0.3.0")
    (source
     (origin
       (method git-fetch)
@@ -922,7 +921,7 @@ suite native in R.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0yqgcajq83g25mznwcngaw7pi6vcqxqdnynpgb95yci57k3wrp6j"))
+        (base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))
       (modules '((guix build utils)))
       (snippet
        '(delete-file-recursively "r/src/vendor/highway"))))
@@ -931,15 +930,13 @@ suite native in R.")
    (arguments
     (list
      #:phases
-      `(modify-phases %standard-phases
+      '(modify-phases %standard-phases
         (add-after 'unpack 'chdir
-           (lambda _ (chdir "r")))
+           (lambda _
-         ,@(if (target-x86-32?)
+             (substitute* "r/configure"
-               '((add-after 'chdir 'require-sse2
+               (("tools/hwy-test.cpp" m)
-                   ;; This avoids falling back to the scalar backend in
+                (string-append m " $HWY_LIBS $HWY_CFLAGS")))
-                   ;; highway, which fails to build.
+             (chdir "r"))))))
                   (lambda _ (setenv "CFLAGS" "-msse2"))))
               '()))))
    (propagated-inputs
     (list r-dplyr
           r-ggplot2
@@ -2290,7 +2287,6 @@ version = ~s
                  (delete-file-recursively
                   (string-append #$output "/.pytest_cache")))))))))
    (native-inputs (list python-pytest
                         python-pytest-cov
                         python-pytest-datadir
                         python-pytest-doctestplus
                         python-recommonmark
@@ -3381,35 +3377,36 @@ encountered in PDB files prior to simulation tasks.")
 (define-public python-peaks2utr
  (package
    (name "python-peaks2utr")
-    (version "1.4.1")
+    (version "1.5.0")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (pypi-uri "peaks2utr" version))
+       (method git-fetch)
-              (sha256
+       (uri (git-reference
-               (base32
+              (url "https://github.com/haessar/peaks2utr")
-                "104il0kk61q07b58g9xrss7xflwlbx4kzsmw9iih99lhfsii0wzg"))))
+              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "1b4qiccp5j394pzqd1d4ss3k90zv3kdr84lykl6p8izn3k85b2bl"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      #:test-flags
      ;; These tests fail because file names are not URLs.
      '(list "-k" (string-join
                   (list "not test_forward_strand_annotations"
                         "test_matching_chr"
                         "test_reverse_strand_annotations")
                   " and not "))
      #:phases
-      '(modify-phases %standard-phases
+      #~(modify-phases %standard-phases
-         (add-after 'unpack 'relax-requirements
+          (add-after 'unpack 'relax-requirements
-           (lambda _
+            (lambda _
-             (substitute* "setup.cfg"
+              (substitute* "setup.cfg"
-               (("==") ">=")))))))
+                (("==") ">=")
                ;; See: <https://github.com/haessar/peaks2utr/issues/47>.
                (("numpy >= 1.21.4, <= 1.26.4") "numpy >= 1.21.4")))))))
    (native-inputs
     (list python-pytest
           python-setuptools))
    (propagated-inputs
     (list python-asgiref
           python-gffutils
           python-importlib-resources
-           macs
+           macs-3
-           python-numpy-1
+           python-numpy
           python-psutil
           python-pybedtools
           python-pysam
@@ -3417,7 +3414,6 @@ encountered in PDB files prior to simulation tasks.")
           python-tqdm
           python-typing-extensions
           python-zipp))
    (native-inputs (list python-setuptools python-wheel))
    (home-page "https://github.com/haessar/peaks2utr")
    (synopsis "Python CLI for annotating three prime UTR")
    (description
@@ -3866,7 +3862,6 @@ raw/ed14e050b2b75e7f4ddb73d512fbe928bbdb2b85")
           python-scipy))
    (native-inputs
     (list python-pytest
           python-pytest-cov
           python-pytest-datadir
           python-pytest-doctestplus
           python-setuptools
@@ -4292,7 +4287,6 @@ e.g. microbiome samples, genomes, metagenomes.")
    (native-inputs
     (list python-cython
           python-pytest
           python-pytest-cov
           python-setuptools
           python-wheel))
    (propagated-inputs
@@ -6968,7 +6962,6 @@ and v1.1 to v1.2.")
     (list python-mypy-extensions
           python-pytest
           python-pytest-mock
           python-pytest-runner
           python-setuptools
           python-wheel))
    (propagated-inputs
@@ -8848,7 +8841,8 @@ high-throughput sequencing (HTS) assays")
         ;; Needed by tests
         (add-after 'unpack 'set-HOME
           (lambda _ (setenv "HOME" "/tmp"))))))
-    (propagated-inputs (list python-appdirs
+    (propagated-inputs (list mysql-connector-python
                             python-appdirs
                             python-biopython
                             python-click
                             python-colorama
@@ -8856,7 +8850,6 @@ high-throughput sequencing (HTS) assays")
                             python-filelock
                             python-loguru
                             python-mygene
                             python-mysql-connector-python
                             python-norns
                             python-numpy
                             python-pandas
@@ -9812,29 +9805,39 @@ sequencing tag position and orientation.")
 (define-public macs-3
  (package
    (name "macs")
-    (version "3.0.3")
+    (version "3.0.4")
-    (source (origin
+    (source
-              (method git-fetch)
+     (origin
-              (uri (git-reference
+       (method git-fetch)
-                    (url "https://github.com/macs3-project/MACS")
+       (uri (git-reference
-                    (commit (string-append "v" version))
+              (url "https://github.com/macs3-project/MACS")
-                    (recursive? #true)))
+              (commit (string-append "v" version))
-              (file-name (git-file-name name version))
+              (recursive? #true)))
-              (sha256
+       (file-name (git-file-name name version))
-               (base32
+       (sha256
-                "08hi0a2a0md9gfg7jc75wxv69rggv2yqfd1hyrg4mi5bhi712m0v"))))
+        (base32 "16cv6bvvppi0z69r5l357ai8x4jg61rx8xrvcapk1wz6mh9naf5s"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      #:test-flags
      ;; AssertionError: np.float32(1.0) != np.float64(-1.0)
      ;; calculated step by step:
      ;;  6.559423e-18
      ;; expected:
      ;;  -2.98155597e-18
      #~(list (string-append "--deselect=test/test_SignalProcessing.py::"
                             "Test_maxima::test_implement_smooth_here"))))
    (native-inputs
     (list python-cython
           python-pytest
           python-setuptools
           zlib))
    (propagated-inputs
     (list python-cykhash
           python-hmmlearn
           python-numpy
           python-scikit-learn
           python-scipy))
    (native-inputs
     (list python-cython
           python-pytest
           python-setuptools
           zlib))
    (home-page "https://github.com/macs3-project/MACS")
    (synopsis "Model based analysis for ChIP-Seq data")
    (description
@@ -14307,11 +14310,7 @@ quality control are provided.")
            (lambda _
              (substitute* "setup.cfg"
                (("intervaltree~=3.0.2") "intervaltree")
-                (("termcolor~=1.1.0") "termcolor"))))
+                (("termcolor~=1.1.0") "termcolor")))))))
          (add-after 'unpack 'fix-pytest-config
            (lambda _
              (substitute* "pyproject.toml"
                ((" --cov=gdc_client --cov-report term") "")))))))
    (native-inputs
     (list python-flask
           python-httmock
@@ -20232,13 +20231,7 @@ fasta subsequences.")
              " and not test_roundtrip"
              ;; This test depends on ipytree, which contains a lot of
              ;; minified JavaScript.
-              " and not test_print_trees"))
+              " and not test_print_trees"))))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'fix-pytest-config
            (lambda _
              (substitute* "pyproject.toml"
                ((".*--cov.*") "")))))))
    (native-inputs
     (list python-hatchling
           python-pytest))
@@ -22351,6 +22344,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")
@@ -86,7 +86,6 @@
  #: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)
@@ -533,8 +532,9 @@ and will take advantage of multiple processor cores where possible.")
    (inputs (list boost-1.83 openssl))
    (native-inputs
     (list libfaketime
-           python-wrapper
+           pkg-config
-           pkg-config))
+           python-setuptools
           python-wrapper))
    (home-page "https://www.libtorrent.org/")
    (synopsis "Feature-complete BitTorrent implementation")
    (description
@@ -83,9 +83,6 @@
    (build-system gnu-build-system)
    (arguments
     (list
      #:imported-modules %pyproject-build-system-modules
      #:modules `(((guix build pyproject-build-system) #:select (python-version))
                  ,@%default-gnu-modules)
      #:tests? #f
      #:configure-flags
      #~(let ((icu (dirname (dirname (search-input-file
@@ -94,17 +91,26 @@
           ;; Auto-detection looks for ICU only in traditional
           ;; install locations.
           (string-append "--with-icu=" icu)
-           ;; Ditto for Python.
+           ;; Ditto for Python.  The Gexp can't be evaluated if python is not
-           #$@(if (%current-target-system)
+           ;; in the inputs (e.g. boost-for-mysql), so delay its evaluation
-                  #~()
+           ;; after checking for python, rather than concurrently.
-                  #~((let ((python (dirname (dirname (search-input-file
+           #$@(force
-                                                      %build-inputs
+               (if (or (%current-target-system)
-                                                      "bin/python")))))
+                       (not (this-package-input "python-minimal-wrapper")))
-                       (string-append "--with-python-root=" python)
+                   (delay
-                       (string-append "--with-python=" python
+                     #~())
-                                      "/bin/python")
+                   (delay
-                       (string-append "--with-python-version="
+                     #~((let ((python (dirname (dirname (search-input-file
-                                      (python-version python)))))
+                                                         %build-inputs
                                                         "bin/python")))))
                          (string-append "--with-python-root=" python)
                          (string-append "--with-python=" python
                                         "/bin/python")
                          (string-append "--with-python-version="
                                         #$(version-major+minor
                                            (package-version
                                             (this-package-input
                                              "python-minimal-wrapper")))))))))
           "--with-toolset=gcc"))
      #:make-flags
      #~(list "threading=multi" "link=shared"
@@ -200,29 +206,39 @@
          (replace 'install
            (lambda* (#:key make-flags #:allow-other-keys)
              (apply invoke "./b2" "install" make-flags)))
-          #$@(if (%current-target-system)
+          #$@(force  ; See above for why the force is necessary.
-                 #~()
+              (if (or (%current-target-system)
-                 #~((add-after 'install 'provide-libboost_python
+                      (not (this-package-input "python-minimal-wrapper")))
-                      (lambda* (#:key make-flags inputs outputs #:allow-other-keys)
+                  (delay
-                        (let* ((static? (member "link=static" make-flags))
+                    #~())
-                               (libext (if static? ".a" ".so"))
+                  (delay
-                               (python (dirname (dirname (search-input-file
+                    #~((add-after 'install 'provide-libboost_python
-                                                          inputs "bin/python"))))
+                         (lambda* (#:key make-flags inputs outputs
-                               (python-version (python-version python))
+                                   #:allow-other-keys)
-                               (libboost_pythonNN
+                           (let* ((static? (member "link=static" make-flags))
-                                (string-append "libboost_python"
+                                  (ext (if static? ".a" ".so"))
-                                               (string-join (string-split
+                                  (python (dirname
-                                                             python-version #\.)
+                                           (dirname (search-input-file
-                                                            "")
+                                                     inputs "bin/python"))))
-                                               libext)))
+                                  (python-version
-                          (with-directory-excursion (string-append #$output "/lib")
+                                   #$(version-major+minor
-                            (symlink libboost_pythonNN
+                                      (package-version
-                                     (string-append "libboost_python" libext))
+                                       (this-package-input
-                            ;; Some packages only look for the major version.
+                                        "python-minimal-wrapper"))))
-                            (symlink libboost_pythonNN
+                                  (NN (string-join (string-split
-                                     (string-append "libboost_python"
+                                                    python-version #\.)
-                                                    (string-take python-version 1)
+                                                   ""))
-                                                    libext)))))))))))
+                                  (libboost_pythonNN
                                   (string-append "libboost_python" NN ext))
                                  (major (string-take python-version 1)))
                             (with-directory-excursion
                                 (string-append #$output "/lib")
                               (symlink libboost_pythonNN
                                        (string-append "libboost_python" ext))
                               ;; Some packages only look for the major version.
                               (symlink libboost_pythonNN
                                        (string-append "libboost_python"
                                                       major ext)))))))))))))
    (inputs
     (append
      (list icu4c zlib)
@@ -328,15 +328,15 @@ with the @uref{https://keepassxc.org, KeePassXC} password manager.")
 (define noscript
  (package
    (name "noscript")
-    (version "13.6.18.1984")
+    (version "13.2.2")
    (source (origin
              (method url-fetch/zipbomb)
              (uri (string-append
-                    "https://archive.torproject.org/tor-package-archive/torbrowser/noscript/noscript-"
+                    "https://noscript.net/download/releases/noscript-" version
-                    version ".xpi"))
+                    ".xpi"))
              (sha256
               (base32
-                "0assv8v89hhg302q81vvv7ln3q8k9m6rzjkbprv2j05ghb23kkvm"))))
+                "0w2w0a76dk01bkh83mqwgs9ky02rjqk15z5sxg4a6mw0hpr81bpm"))))
    (build-system copy-build-system)
    (properties '((addon-id . "{73a6fe31-595d-460b-a920-fcc0f8843232}")))
    (arguments
@@ -94,7 +94,6 @@
  #: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)
@@ -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
@@ -432,9 +431,8 @@ files and generates build instructions for the Ninja build system.")
    (arguments
     (list
      #:tests? #f                       ;disabled to avoid extra dependencies
-      ;; Essentially a lighter copy of the former python-build-system.
+      ;; Custom build steps to prevent using pyproject-build-system which
-      ;; Using it rather than pyproject-build-system allows to edit the latter
+      ;; allows to edit the latter without a C++ world rebuild.
      ;; without a C++ world rebuild.
      #:phases
      #~(modify-phases %standard-phases
          (delete 'bootstrap)
@@ -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>
 ;;;
@@ -54,7 +54,6 @@
  #: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 store)
  #:use-module (gnu packages)
  #:use-module (gnu packages bash)
@@ -1762,7 +1761,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 +1770,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")
@@ -45,7 +45,6 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system pyproject)
  #:use-module ((guix build-system python) #:select (pypi-uri))
  #:use-module (gnu packages admin)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
@@ -131,7 +131,6 @@
  #: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 trivial)
  #:use-module (ice-9 match)
  #:use-module (srfi srfi-1))
@@ -1882,7 +1881,6 @@ http server.")
    (arguments (list #:tests? #false)) ;no tests included
    (native-inputs
     (list python-pytest
           python-pytest-cov
           python-setuptools
           python-wheel
           python-xmlschema))
@@ -1915,42 +1913,6 @@ XML output")
 decorators from external files.")
    (license license:expat)))
 (define-public python-pytest-random-order
  (package
    (name "python-pytest-random-order")
    (version "1.1.1")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "pytest-random-order" version))
       (sha256
        (base32 "104hww3b86jchk41kjhyycr541pd2dfgqkww6lx5y70z9z9xfwj4"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      #:test-flags
      ;; AttributeError: module 'py' has no attribute 'code'.
      #~(list "-k" (string-append "not test_it_works_with_actual_tests"
                                  " and not test_failed_first"
                                  " and not test_doctests"))))
    (native-inputs
     (list python-pytest-xdist
           python-setuptools
           python-py
           python-wheel))
    (propagated-inputs
     (list python-pytest))
    (home-page "https://github.com/jbasko/pytest-random-order")
    (synopsis "Pytest plugin to randomize the order of tests")
    (description "@code{pytest-random-order} is a Pytest plugin that
 randomizes the order of tests.  This can be useful to detect a test that
 passes just because it happens to run after an unrelated test that leaves the
 system in a favourable state.  The plugin allows user to control the level of
 randomness they want to introduce and to disable reordering on subsets of
 tests.  Tests can be rerun in a specific order by passing a seed value
 reported in a previous test run.")
    (license license:expat)))
 (define-public python-pytest-runner
  (package
    (name "python-pytest-runner")
@@ -2956,12 +2918,8 @@ mypy plugins.")
                           "and not upstream_url"))))
    (native-inputs
     (list python-pytest
           python-pytest-black
           python-pytest-checkdocs
           python-pytest-cov
           python-pytest-enabler
           python-pytest-flake8
           python-pytest-mypy
           python-setuptools
           python-wheel))
    (propagated-inputs
@@ -3086,7 +3044,6 @@ possible to write plugins to add your own checks.")
           python-path
           python-pyhamcrest
           python-pytest
           python-pytest-html
           python-setuptools))
    (propagated-inputs
     (list python-colorama
@@ -3131,7 +3088,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 +3676,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")
@@ -28,7 +28,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix download)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
@@ -580,7 +579,7 @@ stored with user-specified precision.")
           python-sphinx))
    (inputs
     (list fftwf
-           `(,hwloc "lib")
+           `(,hwloc-2 "lib")
           libtirpc
           lmfit
           muparser
@@ -826,7 +825,7 @@ colleagues, or to generate pre-rendered animations.")
 (define-public python-pyscf
  (package
    (name "python-pyscf")
-    (version "2.9.0")
+    (version "2.12.1")
    (source
     (origin
       (method git-fetch)
@@ -835,14 +834,10 @@ colleagues, or to generate pre-rendered animations.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1lj48c749aqf9zd5xbshjsfr0y972r2nsm8lf3760jbfadg9jdsi"))))
+        (base32 "00q5c0r5yzp05m65679164s7jzm9678b63msm8g7953vh8v9g25y"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      #:modules
      '((guix build pyproject-build-system)
        (guix build utils)
        (ice-9 textual-ports))
      ;; Some tests take a very long time and libxc support is not enabled.
      #:tests? #f
      #:phases
@@ -868,16 +863,8 @@ colleagues, or to generate pre-rendered animations.")
                         "-DBUILD_XCFUN=OFF"
                         "-DBUILD_LIBCINT=OFF"))))))))
    (native-inputs
-     (list
+     (list cmake-minimal
-      cmake-minimal
+           python-setuptools))
      ;; HACK: Add gcc, make tune work.
      ;; build-system-with-tuning-compiler on guix/transformations.scm
      ;; want to find compiler on the build-inputs, but gcc is on the
      ;; python-build-system's host-inputs, so when tune it , will report:
      ;; "failed to determine which compiler is used"
      (canonical-package gcc)
      python-setuptools
      python-wheel))
    (inputs
     (list
      ;; Use qcint when tuning for x86_64.
@@ -400,7 +400,7 @@
  ;; run the Blink performance tests, just remove everything to save ~70MiB.
  '("third_party/blink/perf_tests"))
-(define %chromium-version "147.0.7727.137")
+(define %chromium-version "147.0.7727.55")
 (define %ungoogled-revision (string-append %chromium-version "-1"))
 (define %debian-revision (string-append "debian/" %ungoogled-revision))
@@ -412,7 +412,7 @@
    (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
    (sha256
     (base32
-      "1ha84j3zckdv2l8dpicqhmr6a8mq3bqwalw0bmgamvlmns9i7nrj"))))
+      "0l6v4wf16067igawjlh90f3d287mkw0cq4j5lvrxxy17y1skynzc"))))
 (define %debian-origin
  (origin
@@ -425,7 +425,7 @@
                                ((_ version) version))))
    (sha256
     (base32
-      "04lqbclkvn9nsksgjpjilh78a8y17mwwq4pmhr6h8gvpp2y3bhhc"))))
+      "0gqarll08i7rcs1amapciv263xvzglc8p44ikavq3xd12yyvcd98"))))
 (define (origin-file origin file)
  (computed-file
@@ -570,7 +570,7 @@
                                  %chromium-version "-lite.tar.xz"))
              (sha256
               (base32
-                "1m22whg5n9lw9gqhalm95jwfm45lqp4a7cs3mn3f4n8w0rvr0r5j"))
+                "1salvlw5sykx3zmsbp7cgmf7y8yy6jlgb4b4zswzsbjrprk4jnap"))
              (modules '((guix build utils)))
              (snippet (force ungoogled-chromium-snippet))))
    (build-system gnu-build-system)
@@ -596,7 +596,6 @@
              "use_custom_libcxx=false" ; support for this is deprecated and to be removed.
              "optimize_webui=false"
              "webnn_use_tflite=false"
              "build_tflite_with_xnnpack=false"
              "safe_browsing_use_unrar=false"
              "chrome_pgo_phase=0"
              "use_sysroot=false"
@@ -689,7 +688,7 @@
              "use_gnome_keyring=false" ;deprecated by libsecret
              "use_pulseaudio=true"
              "link_pulseaudio=true"
-              "icu_use_data_file=true"
+              "icu_use_data_file=false"
              ;; VA-API acceleration is currently only supported on x86_64-linux.
              #$@(if (string-prefix? "x86_64" (or (%current-target-system)
@@ -697,13 +696,6 @@
                     '("use_vaapi=true")
                     '())
              #$@(if (string-prefix? "aarch64" (or (%current-target-system)
                                                   (%current-system)))
                     '("use_v4l2_codec=true"
                       "use_vaapi=false"
                       "use_av1_hw_decoder=true")
                     '())
              ;; Do not artificially restrict formats supported by system ffmpeg.
              "proprietary_codecs=true"
              "ffmpeg_branding=\"Chrome\""
@@ -777,7 +769,12 @@
                   (string-append libclang "clang_base_path"))
                  (("(_rustfmt_path = \")\\$\\{rust_bindgen_root\\}" _ rustfmt)
                   (string-append rustfmt "${rust_sysroot_absolute}"))))))
-          (add-after 'patch-stuff 'add-absolute-references
+          (add-after 'patch-stuff 'include-pthreadpool
            ;; FIXME: Somehow the build system cannot locate this header.
            (lambda _
              (copy-file "third_party/pthreadpool/src/include/pthreadpool.h"
                         "pthreadpool.h")))
          (add-after 'include-pthreadpool 'add-absolute-references
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((cups-config (search-input-file inputs "/bin/cups-config"))
                    (libnssckbi.so (search-input-file inputs
@@ -895,7 +892,6 @@
                                       "resources.pak"
                                       "v8_context_snapshot.bin"
                                       "chrome_crashpad_handler"
                                       "icudtl.dat"
                                       ;; Swiftshader ICD.
                                       "libvk_swiftshader.so"
@@ -918,11 +914,9 @@
                (substitute* '("chrome/app/resources/manpage.1.in"
                               "chrome/installer/linux/common/desktop.template")
-                  (("@@MENUNAME") "Chromium")
+                  (("@@MENUNAME@@") "Chromium")
-                  (("@@PACKAGE") "chromium")
+                  (("@@PACKAGE@@") "chromium")
-                  (("/usr/bin/@@usr_bin_symlink_name") exe)
+                  (("/usr/bin/@@USR_BIN_SYMLINK_NAME@@") exe))
                  (("@@uri_scheme") "x-scheme-handler/chromium")
                  (("@@extra_desktop_entries") ""))
                (mkdir-p man)
                (copy-file "chrome/app/resources/manpage.1.in"
@@ -30,7 +30,6 @@
  #: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 (gnu packages)
  #:use-module (gnu packages admin)
  #:use-module (gnu packages autotools)
@@ -47,7 +47,6 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
  #:use-module (gnu packages)
  #:use-module (gnu packages backup)
@@ -49,7 +49,6 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system cmake)
  #:use-module ((guix build-system python) #:select (pypi-uri))
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system trivial)
  #:use-module (guix build-system go)
@@ -18,10 +18,10 @@
 ;;; This module is separate from (gnu packages rust-apps) to avoid a
 ;;; circular module dependency: (gnu packages rust-sources), which
-;;; defines rust-codex-0.124.0, transitively loads (gnu packages
+;;; defines rust-codex-0.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.124.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,46 +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 version-control))
  #:use-module (gnu packages virtualization))
 (define-public codex
  (package
    (name "codex")
-    (version (package-version rust-codex-0.124.0))
+    (version (package-version rust-codex-0.98.0))
    (source
     (origin
-       (inherit (package-source rust-codex-0.124.0))
+       (inherit (package-source rust-codex-0.98.0))
       (patches (search-patches
-                 "codex-acp-0.11.1-disable-code-mode.patch"
+                 "codex-0.98.0-remove-patch-sections.patch"
                 "rust-codex-0.124.0-code-mode-stub-toolname.patch"
                 "rust-codex-0.124.0-remove-patch-sections.patch"
                 "rust-codex-0.120.0-remove-libwebrtc.patch"
                 "rust-codex-0.98.0-test-shebangs.patch"
-                 "rust-codex-0.120.0-test-timeout.patch"))))
+                 "rust-codex-0.98.0-test-timeout.patch"))))
    (build-system cargo-build-system)
    (arguments
     (list
      #:install-source? #f
-      ;; exec-server is library-only in 0.124 (no [[bin]] in
+      #:cargo-install-paths '(list "cli" "exec" "exec-server"
-      ;; exec-server/Cargo.toml); cargo install --path exec-server fails
+                                   "linux-sandbox" "mcp-server" "network-proxy"
      ;; with "no packages found with binaries or examples".  Drop it
      ;; from the install paths -- the library is consumed via the
      ;; workspace by other binaries here, not installed standalone.
      #:cargo-install-paths '(list "cli" "exec"
                                   "linux-sandbox" "mcp-server"
                                   "app-server" "tui")
      ;; schema_fixtures_match_generated (upstream fixture is stale:
      ;; FileChange::Update in codex-protocol gained old_content,
@@ -84,55 +71,72 @@
      #:cargo-test-flags '(list "--workspace"
                                "--exclude" "codex-app-server-protocol"
                                "--"
-                                ;;; BEGIN Landlock returns NotEnforced
+                                ;; These tests exercise sandbox denial and
-                                ;;; in the build container; the sandbox
+                                ;; escalation, which requires Landlock to
-                                ;;; binary panics instead of cleanly
+                                ;; cleanly deny filesystem access.  Inside the
-                                ;;; denying filesystem access.
+                                ;; build container Landlock returns NotEnforced
-                                ;; Sandbox denial and escalation tests.
+                                ;; 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
+                                ;; These tests (in codex-exec) directly call
-                                ;; panics with LandlockRestrict (exit 101).
+                                ;; 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
+                                ;; These linux-sandbox tests directly invoke
-                                ;; invokes Landlock; same panic.
+                                ;; 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
+                                ;; This test iterates many approval scenarios;
-                                ;; which panics; cargo --skip cannot
+                                ;; one of them
-                                ;; target individual scenarios.
+                                ;; (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
+                                ;; This test verifies session-level patch
-                                ;; which interferes with the approval cache.
+                                ;; 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
+                                ;; 2. Landlock is unavailable in the Guix
-                                ;;    sandbox binary exits instantly.
+                                ;;    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 --
+                                ;;    returns false (sandboxing.rs:222),
-                                ;;    denial returned directly.
+                                ;;    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,
@@ -146,370 +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
+                                ;; Upstream bug: test hardcodes "0.0.0" in the
-                                ;; commands with codex-linux-sandbox;
+                                ;; expected user-agent string but the workspace
-                                ;; Landlock panics, command never runs,
+                                ;; version is "0.98.0".
-                                ;; exit_code is None instead of Some(0).
+                                "--skip" "get_user_agent_returns_current_codex_user_agent"
-                                "--skip" "request_permissions_grants_apply_to_later_exec_command_calls"
+                                ;; Same upstream bug: mcp-server tests
-                                ;; Same root cause.
+                                ;; check the initialize response which
-                                "--skip" "request_permissions_grants_apply_to_later_shell_command_calls"
+                                ;; includes "version": "0.0.0" but the
-                                ;; Same root cause.
+                                ;; server returns "0.98.0".
                                "--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".
                                "--skip" "test_codex_tool_passes_base_instructions"
                                "--skip" "test_shell_command_approval_triggers_elicitation"
                                "--skip" "test_patch_approval_triggers_elicitation"
-                                ;;; END version mismatch
+                                ;; These codex-exec-server tests need
-                                ;;; BEGIN Test isolation bug:
+                                ;; "dotslash", a Meta tool that lazily
-                                ;;; unique_temp_dir() in
+                                ;; downloads pre-built binaries from a
-                                ;;; state/src/runtime.rs names dirs
+                                ;; JSON manifest.  The test helper
-                                ;;; using nanosecond timestamps, so
+                                ;; create_transport runs
-                                ;;; parallel tests can collide.  The
+                                ;; `dotslash -- fetch <path>` to obtain a
-                                ;;; SQLite migration runs CREATE TABLE
+                                ;; custom bash binary described in
-                                ;;; threads (without IF NOT EXISTS),
+                                ;; exec-server/tests/suite/bash.
-                                ;;; so the second init panics with
+                                ;; dotslash is not available in the build
-                                ;;; "table threads already exists".
+                                ;; 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"
+                                "--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"
                                ;;; BEGIN Stack overflow in 'current_thread'
                                ;;; tokio runtime.  The sibling tests in
                                ;;; tracing_tests.rs use the local helper
                                ;;; run_current_thread_test_with_stack
                                ;;; (4 MiB) but this one uses bare
                                ;;; #[tokio::test] on the 2 MiB default
                                ;;; test-thread stack, and TurnStart's
                                ;;; future graph exceeds it.  With
                                ;;; RUST_MIN_STACK raised the overflow is
                                ;;; gone but the test then deterministically
                                ;;; times out waiting for a span tagged
                                ;;; codex.op = "user_input" on the remote
                                ;;; trace that upstream never emits on that
                                ;;; trace in our environment.
                                "--skip" "turn_start_jsonrpc_span_parents_core_turn_spans"
                                ;;; END tracing test stack/timeout
                                ;;; BEGIN The upstream loader resolves the
                                ;;; MCP OAuth credentials store mode by
                                ;;; calling
                                ;;; resolve_mcp_oauth_credentials_store_mode
                                ;;; with env!("CARGO_PKG_VERSION") -- which
                                ;;; in the released 0.124.0 tarball is
                                ;;; "0.124.0".  These fixture tests
                                ;;; construct the expected Config by
                                ;;; passing the LOCAL_DEV_BUILD_VERSION
                                ;;; constant ("0.0.0") to the same
                                ;;; resolver, and the resolver only returns
                                ;;; File for "0.0.0" -- Auto otherwise.
                                ;;; Upstream CI builds from a checkout
                                ;;; still carrying version = "0.0.0" so the
                                ;;; tests pass there; they cannot pass
                                ;;; against a released tag.
                                "--skip" "test_precedence_fixture_with_gpt3_profile"
                                "--skip" "test_precedence_fixture_with_gpt5_profile"
                                "--skip" "test_precedence_fixture_with_o3_profile"
                                "--skip" "test_precedence_fixture_with_zdr_profile"
                                ;;; END LOCAL_DEV_BUILD_VERSION fixture mismatch
                                ;;; BEGIN Verifies that Codex's user-shell
                                ;;; spawn produces a child where
                                ;;; CODEX_SANDBOX_NETWORK_DISABLED is unset
                                ;;; (asserts stdout == "not-set").  We
                                ;;; deliberately set that env var at the
                                ;;; check phase to trigger upstream's
                                ;;; skip_if_no_network! guards; the var then
                                ;;; leaks into the spawned shell and the
                                ;;; assertion fails.  The guix skip is a
                                ;;; direct cost of the network-gate fix --
                                ;;; trading one broken test for two that
                                ;;; now skip cleanly.
                                "--skip" "user_shell_command_does_not_set_network_sandbox_env_var"
                                ;;; END CODEX_SANDBOX_NETWORK_DISABLED leak
                                ;;; BEGIN The exec-server/tests/file_system
                                ;;; integration tests invoke the real
                                ;;; system bwrap, which tries to execvp the
                                ;;; test binary at the cargo target path
                                ;;; under the build dir.  Same root cause
                                ;;; as the existing
                                ;;; sandbox_reenables_writable_subpaths_under_unreadable_parents
                                ;;; skip: guix builds live under /tmp but
                                ;;; bwrap's mount namespace excludes /tmp,
                                ;;; making the binary invisible inside the
                                ;;; namespace.
                                "--skip" "file_system_copy_preserves_symlink_source"
                                "--skip" "file_system_copy_rejects_symlink_escape_destination"
                                "--skip" "file_system_copy_rejects_symlink_escape_source"
                                "--skip" "file_system_create_directory_rejects_symlink_escape"
                                "--skip" "file_system_read_directory_rejects_symlink_escape"
                                "--skip" "file_system_remove_rejects_symlink_escape"
                                "--skip" "file_system_remove_removes_symlink_not_target"
                                "--skip" "file_system_sandboxed_read_allows_readable_root"
                                "--skip" "file_system_sandboxed_read_rejects_symlink_escape"
                                "--skip" "file_system_sandboxed_read_rejects_symlink_parent_dotdot_escape"
                                "--skip" "file_system_sandboxed_write_allows_additional_write_root"
                                "--skip" "file_system_sandboxed_write_rejects_symlink_escape"
                                "--skip" "file_system_sandboxed_write_rejects_unwritable_path"
                                ;;; END bwrap-cant-see-/tmp file_system tests
                                ;;; BEGIN Landlock is unavailable on Guix,
                                ;;; so the sandbox cannot deny network
                                ;;; syscalls.  These tests expect
                                ;;; SandboxErr::Denied for the nc, ping,
                                ;;; ssh, getent, and dev_tcp_redirection
                                ;;; commands but those commands instead
                                ;;; block on connect() until the test's 2s
                                ;;; timeout fires (Timeout, exit 124).
                                ;;; Same root cause as the Landlock skips
                                ;;; at the top of this list; new test names
                                ;;; in 0.124.
                                "--skip" "sandbox_blocks_nc"
                                "--skip" "sandbox_blocks_ping"
                                "--skip" "sandbox_blocks_dev_tcp_redirection"
                                "--skip" "sandbox_blocks_getent"
                                "--skip" "sandbox_blocks_ssh"
                                ;;; END Landlock network block
                                ;;; BEGIN Requires github.com network access.
                                ;;; With no "extraKnownMarketplaces" entry
                                ;;; in settings.json,
                                ;;; collect_marketplace_import_sources
                                ;;; inserts a fallback entry for the
                                ;;; "claude-plugins-official" marketplace
                                ;;; pointing at the github shorthand
                                ;;; "anthropics/claude-plugins-official".
                                ;;; add_marketplace -> parse_marketplace_source
                                ;;; expands that to a github.com/.git URL
                                ;;; and clone_git_source runs 'git clone'.
                                ;;; The Guix build sandbox has no network,
                                ;;; so the clone fails and the marketplace
                                ;;; lands in failed_marketplaces.  No mock
                                ;;; cloner is injected via
                                ;;; ExternalAgentConfigService::new_for_test,
                                ;;; so there is no in-tree way to satisfy
                                ;;; the test offline.
                                "--skip" "import_plugins_infers_claude_official_marketplace_when_missing_from_settings"
                                ;;; END github.com network access
                                ;;; BEGIN Async race between the rollout
                                ;;; writer task and a direct SQLite read.
                                ;;; The test calls
                                ;;; update_memory_settings_with_app_server,
                                ;;; which routes through the in-memory
                                ;;; thread path on the app-server's
                                ;;; ThreadMemoryModeSet handler ->
                                ;;; Session::set_thread_memory_mode ->
                                ;;; persist_thread_memory_mode_update,
                                ;;; which writes a RolloutItem::SessionMeta
                                ;;; with the new mode to the rollout file
                                ;;; via recorder.record_items + flush.  The
                                ;;; rollout writer task then asynchronously
                                ;;; calls sync_thread_state_after_write,
                                ;;; which calls state_db::apply_rollout_items
                                ;;; to mirror the SessionMeta into SQLite.
                                ;;; flush() only awaits the rollout-file
                                ;;; write, not the subsequent SQLite sync.
                                ;;; The test opens a fresh StateRuntime and
                                ;;; reads get_thread_memory_mode
                                ;;; immediately, so it observes the creation
                                ;;; default of "enabled" written by
                                ;;; upsert_thread_with_creation_memory_mode
                                ;;; instead of the new "disabled".  Upstream
                                ;;; CI wins this race; we lose.
                                "--skip" "update_memory_settings_updates_current_thread_memory_mode"
                                ;;; END memory-mode rollout/sqlite race
                                ;;; BEGIN The Stopwatch::new constructor in
                                ;;; codex_shell_escalation anchors
                                ;;; T0 = Instant::now() at construction;
                                ;;; the spawned cancellation task fires at
                                ;;; T0 + limit.  The test captures
                                ;;; start = Instant::now() at T1 > T0 (after
                                ;;; cancellation_token() returns) and
                                ;;; asserts start.elapsed() >= limit,
                                ;;; i.e. (T0 + limit) - T1 >= limit, which
                                ;;; is always false by the offset T1 - T0.
                                ;;; The test only passes when scheduler
                                ;;; jitter on the sleep wakeup happens to
                                ;;; exceed that offset.  Upstream wins the
                                ;;; race; we don't always.
                                "--skip" "cancellation_receiver_fires_after_limit"
                                ;;; END Stopwatch construction/start offset race
                                )
      #:cargo-package-crates
      ''(;;; Tier 0: No internal deps.
         "codex-ansi-escape"
         "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"
+         "codex-backend-openapi-models"
-         ;;; Tier 1.
+         "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"
@@ -518,69 +226,35 @@
         "codex-secrets"
         "codex-execpolicy-legacy"
         "codex-debug-client"
         "codex-analytics"
         "codex-rollout"
         "codex-rollout-trace"
         "codex-terminal-detection"
         "codex-utils-approval-presets"
         "codex-utils-cli"
         "codex-uds"
         "codex-install-context"
         "codex-device-key"
         ;;; Tier 2.
         "codex-app-server-protocol"
         "codex-rmcp-client"
         "codex-otel"
         "codex-thread-store"
         "codex-state"
         "codex-features"
         "codex-model-provider"
         "codex-config"
         "codex-agent-identity"
         "codex-aws-auth"
         "codex-hooks"
         "codex-code-mode"
         "codex-feedback"
         "codex-skills"
         "codex-test-binary-support"
         "codex-core"
         "codex-core-plugins"
         "codex-utils-sandbox-summary"
         "codex-linux-sandbox"
-         "codex-sandboxing"
+         "codex-feedback"
         "codex-connectors"
         "codex-core-skills"
         ;;; 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.
@@ -596,7 +270,7 @@
              ;; Update them to match the actual package version.
              (let ((snap-files (find-files "." "\\.snap$")))
                (substitute* snap-files
-                  (("\\(v0\\.0\\.0\\)   ") "(v0.124.0) ")))))
+                  (("\\(v0\\.0\\.0\\) ") "(v0.98.0)")))))
          (add-after 'chdir-to-workspace 'patch-git-deps-to-vendor
            (lambda _
              ;; Replace git dependencies with version references so cargo
@@ -605,57 +279,23 @@
                (("nucleo = \\{ git = [^}]+\\}")
                 "nucleo = \"0.5.0\"")
                (("runfiles = \\{ git = [^}]+\\}")
-                 "runfiles = \"0.1.0\""))
+                 "runfiles = \"0.1.0\""))))
-              ;; Remove workspace members that have unbuildable deps
+          (add-after 'chdir-to-workspace 'add-version-to-workspace-deps
              ;; (v8-poc requires V8).  code-mode stays a workspace member
              ;; so its codex-protocol resolves to the same local copy as
              ;; the rest of the build; disabling its default features
              ;; (below) avoids pulling in V8.
              (substitute* "Cargo.toml"
                (("\"v8-poc\",") ""))
              ;; Disable V8 runtime in codex-code-mode by turning off
              ;; default features.  Keep path= so code-mode is resolved
              ;; from the local source tree and shares codex-protocol
              ;; (and other workspace crates) with the rest of the build;
              ;; resolving it from the vendor instead introduces a
              ;; duplicate codex-protocol and causes E0308 type
              ;; mismatches in codex-tools.
              (substitute* "Cargo.toml"
                (("codex-code-mode = \\{ path = \"code-mode\" \\}")
                 "codex-code-mode = { path = \"code-mode\", default-features = false }"))
              ;; cargo build at workspace root ignores per-dep
              ;; default-features=false and builds code-mode with its
              ;; own default features, which include v8-runtime and
              ;; would pull in V8.  Make the default feature empty.
              (substitute* "code-mode/Cargo.toml"
                (("^default = \\[\"v8-runtime\"\\]") "default = []"))))
          (add-after 'patch-git-deps-to-vendor 'add-version-to-workspace-deps
            (lambda _
              ;; cargo package requires all dependencies to have versions.
-              ;; Add version = "0.124.0" to internal path dependencies.
+              ;; cargo package requires all dependencies to have versions.
              ;; Add version = "0.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.124.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.124.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.124.0\""))))))
+                   (string-append path-line "\nversion = \"0.98.0\""))))))
          (add-after 'chdir-to-workspace 'use-gnu-store-in-sandbox
            (lambda _
              ;; LINUX_PLATFORM_DEFAULT_READ_ROOTS in linux-sandbox/src/
              ;; bwrap.rs is the read-only baseline that codex's bwrap
              ;; sandbox bind-mounts so commands can read /usr/bin/ls,
              ;; libc, etc.  Upstream lists "/nix/store" for NixOS;
              ;; Guix's equivalent is "/gnu/store".  Without this swap,
              ;; the codex sandbox cannot locate any binaries on a Guix
              ;; system because every "system" path resolves into
              ;; /gnu/store/<hash>-pkg/bin/...
              (substitute* "linux-sandbox/src/bwrap.rs"
                (("\"/nix/store\"") "\"/gnu/store\""))))
          (add-after 'chdir-to-workspace 'patch-hardcoded-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((bash-bin (string-append
@@ -685,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 "\""))
@@ -707,150 +339,42 @@
                   (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#"..."#)
+                ;; shebang in test-only file
                ;; that are written to scripts at runtime.  The
                ;; main "/bin/sh" patterns only match double-quoted
                ;; occurrences; these shebangs have no surrounding
                ;; double quotes.
                (substitute*
-                  (list "core/src/plugins/startup_sync_tests.rs"
+                  "core/tests/suite/user_notification.rs"
                        "core/src/tools/runtimes/shell/unix_escalation_tests.rs"
                        "core/tests/suite/client.rs"
                        "core/tests/suite/js_repl.rs"
                        "core/tests/suite/skill_approval.rs"
                        "core/tests/suite/user_notification.rs"
                        "exec-server/tests/file_system.rs"
                        "login/src/auth/auth_tests.rs"
                        "models-manager/src/manager_tests.rs"
                        "sandboxing/src/bwrap_tests.rs")
                  (("#!/bin/bash")
-                   (string-append "#!" bash-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)))))
          (add-before 'check 'set-home
            (lambda _
-              ;; HOME must not be a prefix of /tmp, otherwise
+              (setenv "HOME" "/tmp")
-              ;; the TUI's path shortener replaces /tmp/... with
+              (setenv "USER" "nixbld"))))))
-              ;; ~/... and 30 snapshot tests fail.
+    (native-inputs (list clang              ;bindgen uses libclang to parse BoringSSL's C headers
-              (setenv "HOME" "/tmp/guix-home")
+                         cmake-minimal    ;BoringSSL is compiled from C source
-              (mkdir-p "/tmp/guix-home")
+                         libunwind        ;BoringSSL tests verify stack unwinding in assembly
-              (setenv "USER" "nixbld")
+                         perl python-minimal ;for tests
-              ;; Default libtest thread stack is 2 MiB, which is not
+                         pkg-config))
              ;; enough for tokio current_thread tests that drive
              ;; codex-core's full turn pipeline.  Upstream gates such
              ;; tests through run_current_thread_test_with_stack (4 MiB)
              ;; in app-server/src/message_processor/tracing_tests.rs;
              ;; raise the global default so future additions that
              ;; forget the wrapper still pass.
              (setenv "RUST_MIN_STACK" "8388608")
              ;; Disable network access.
              (setenv "CODEX_SANDBOX_NETWORK_DISABLED" "1"))))))
    (native-inputs `(("bubblewrap" ,bubblewrap) ;tests need bwrap on PATH
                     ("clang" ,clang)
                     ("cmake-minimal" ,cmake-minimal)
                     ("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))))
    (inputs (cons* bash-minimal coreutils git-minimal sed
-                   libcap oniguruma openssl sqlite zlib `(,zstd "lib")
+                   openssl sqlite `(,zstd "lib")
                   (cargo-inputs 'codex)))
    (properties '((timeout . 108000) ; 30  hours
                  (max-silent-time . 54000))) ; 15 hours
    (home-page "https://github.com/openai/codex")
    (synopsis "AI-assisted coding CLI and TUI")
    (description
     "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}.
+Configure providers via @file{~/.codex/config.toml}.")
 codex-code-mode's V8 Javascript executor is disabled.")
    (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)
@@ -859,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"))
+        (base32 "190sq6s6jfz8dkj1y8305r7x6ln86qqr2j1bnfjci7f1x2wyzmsj"))
-       (patches (search-patches "codex-acp-0.11.1-remove-patch-sections.patch"))))
+       (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
@@ -868,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\"")
+                (("git = \"https://github.com/zed-industries/codex\", branch = \"acp\"")
-                 "version = \"0.117.0\""))
+                 "version = \"0.0.0\"")))))))
-              ;; Disable V8 runtime in codex-code-mode (transitive dep).
+    (native-inputs (list pkg-config))
-              (let ((port (open-file "Cargo.toml" "a")))
+    (inputs (cons* openssl sqlite `(,zstd "lib") (cargo-inputs 'codex-acp)))
                (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)))
    (home-page "https://github.com/zed-industries/codex-acp")
    (synopsis "ACP-compatible agent bridging Zed Codex with ACP clients")
    (description
@@ -2375,9 +2375,7 @@ non-Windows systems without running the actual installer using wine.")
     (sha256
      (base32 "17k679glx05v23n8kxbg9vmbf89i2252g5xj6w3dkz19asmh1zd6"))))
   (build-system gnu-build-system)
-   (native-inputs
+   (native-inputs (list autoconf automake libtool nasm))
    (cons* autoconf automake libtool
           (maybe-nasm)))
   (home-page "https://github.com/intel/isa-l")
   (synopsis "Intelligent storage acceleration library")
   (description "ISA-L is a collection of optimized low-level functions
@@ -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
@@ -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>
@@ -52,7 +52,6 @@
 ;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
 ;;; Copyright © 2025 Murilo <murilo@disroot.org>
 ;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -79,7 +78,6 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system scons)
  #:use-module (guix modules)
@@ -1905,8 +1903,7 @@ using the string similarity calculations from FuzzyWuzzy.")
          (add-after 'unpack 'fix-pytest-config
            (lambda _
              (substitute* "pyproject.toml"
-                ((" \"pytest-cov\", ") "")
+                (("\"pytest-cov\", ") "")))))))
                ((" --cov-fail-under=90 --cov=cpplint") "")))))))
    (native-inputs
     (list python-pytest
           python-pytest-timeout
@@ -3193,7 +3190,8 @@ pointers, containers, compiler building blocks, etc.")
    (native-inputs
     (list build))
    (inputs
-     (list libcutl xerces-c))
+     `(("libcutl" ,libcutl)
       ("libxerces-c" ,xerces-c)))
    (synopsis "XSD Front-end")
    (description "@code{libxsd-frontend} is a compiler frontend for the W3C
 XML Schema definition language.  It includes a parser, semantic graph types
@@ -3360,7 +3358,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 +3367,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 +3606,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 +3615,7 @@ std::wstring, etc).")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1l13nsl4sgq71m7aifrmmmfyl14vp48vqdh7pb50hxqq6f8bq2b5"))))
+                "19x1yklf641yrpad6lk4cq3jmird10d5ig8hicm3p9lxh92k78cl"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -3628,10 +3626,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++")
@@ -105,7 +105,6 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix utils)
  #:use-module (srfi srfi-1)
@@ -276,17 +275,18 @@ Ed448-Goldilocks and Curve448, using the Decaf encoding.")
 (define-public libsodium
  (package
    (name "libsodium")
-    (version "1.0.22")
+    (version "1.0.18")
-    (source
+    (source (origin
-     (origin
+            (method url-fetch)
-       (method git-fetch)
+            (uri (list (string-append
-       (uri (git-reference
+                        "https://download.libsodium.org/libsodium/"
-              (url "https://github.com/jedisct1/libsodium")
+                        "releases/libsodium-" version ".tar.gz")
-              (commit (string-append version "-RELEASE"))))
+                       (string-append
-       (file-name (git-file-name name version))
+                        "https://download.libsodium.org/libsodium/"
-       (sha256
+                        "releases/old/libsodium-" version ".tar.gz")))
-        (base32
+            (sha256
-         "05lqdn6nzldsia5mv5a9xfvc5k0kybh9snwv7qsb135gva4bpjwk"))))
+             (base32
              "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"))))
    (build-system gnu-build-system)
    (synopsis "Portable NaCl-based crypto library")
    (description
@@ -62,7 +62,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix download)
  #:use-module (guix git-download)
@@ -31,7 +31,6 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (gnu packages databases)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cpp)
@@ -69,9 +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>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -128,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)
@@ -201,11 +197,9 @@
  #: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)
  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system ruby)
  #:use-module (guix build-system cmake)
@@ -1257,6 +1251,98 @@ management system that supports the standardized Structured Query
 Language.")
    (license license:gpl2)))
 (define-public mysql-connector-python
  (package
    (name "mysql-connector-python")
    (version "8.3.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/mysql/mysql-connector-python")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32 "18jvpnnwmfrn961rvqmsygp7dw3spf3swhxhal4hhj5hqddckj5f"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      ;; tests: 1371 passed
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'compatibility
            (lambda _
              (substitute* "src/mysql_capi.c"
                (("res = mysql_options\\(&self->session, MYSQL_OPT_LOAD_DATA_LOCAL_DIR.*")
                 "res = 0;")
                (("mysql_options\\(&self->session, MYSQL_OPT_LOAD_DATA_LOCAL_DIR.*")
                 "")
                (("mysql_options\\(&self->session, MYSQL_OPT_TLS_CIPHERSUITES.*")
                 "")
                ;; The C API does not have mysql_bind_param, so we produce an
                ;; error here.
                (("status = mysql_bind_param.*") "status = 1;")
                (("#include \"mysql_capi_conversion\\.h\"" all)
                 (string-append all "\n" "#include <stdbool.h>")))))
          (add-after 'unpack 'chdir
            (lambda _
              (chdir "mysql-connector-python")))
          (add-before 'build 'prepare-build
            (lambda _
              (setenv "MYSQL_CAPI" #$(this-package-input "mysql"))))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
                ;; Some of these tests might be failing due to the build
                ;; container's restrictions, others are due to the version
                ;; mismatch.
                (substitute* "tests/cext/test_cext_api.py"
                  (("def test_change_user") "def _do_not_test_change_user")
                  (("def test_get_character_set_info")
                   "def _do_not_test_get_character_set_info"))
                (substitute* "tests/test_bugs.py"
                  (("def test_change_user") "def _do_not_test_change_user")
                  (("def test_lost_connection") "def _do_not_test_lost_connection")
                  (("def test_kill_query") "def _do_not_test_kill_query")
                  ;; These all fail because of expired certificates.
                  (("def test_cext_verify_server_certificate")
                   "def _do_not_test_cext_verify_server_certificate")
                  (("def test_pure_verify_server_certificate")
                   "def _do_not_test_pure_verify_server_certificate")
                  (("def test_verify_server_name_cext_cnx")
                   "def _do_not_test_verify_server_name_cext_cnx")
                  (("def test_verify_server_name_pure_cnx")
                   "def _do_not_test_verify_server_name_pure_cnx"))
                (substitute* '("tests/test_connection.py"
                               "tests/test_aio_connection.py")
                  (("def test_allow_local_infile_in_path")
                   "def _do_not_test_allow_local_infile_in_path")
                  ;; This fails because of expired certificates.
                  (("def test_connect_with_unix_socket")
                   "def _do_not_test_connect_with_unix_socket"))
                (substitute* "tests/test_constants.py"
                  (("def test_deprecated")
                   "def _do_not_test_deprecated"))
                (mkdir-p "/tmp/datadir")
                (invoke "python3" "unittests.py"
                        "--verbosity=3"
                        (string-append "--with-mysql=" #$(this-package-input "mysql"))
                        "--keep"
                        "--mysql-topdir=/tmp/datadir"
                        "--unix-socket=/tmp/datadir")))))))
    (propagated-inputs (list python-protobuf))
    (inputs (list mysql protobuf-3.20 openssl-1.1 zlib))
    (native-inputs (list python-setuptools))
    (home-page "https://dev.mysql.com/doc/connector-python/en/index.html")
    (synopsis "MySQL driver written in Python")
    (description "MySQL Connector/Python enables Python programs to access
 MySQL databases, using an API that is compliant with the Python Database API
 Specification v2.0 (PEP 249).")
    (license license:gpl2)))
 (define-deprecated-package python-mysql-connector-python
  mysql-connector-python)
 (define-public mariadb
  (package
    (name "mariadb")
@@ -3101,64 +3187,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")
@@ -4160,8 +4188,8 @@ programmatically or as a standalone CLI application.")
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (inputs
-     (list openssl
+     `(("libcrypto" ,openssl)
-           tcl))                        ;for tests
+       ("libtcl8.6" ,tcl))) ; required for running the tests
    (native-inputs
     (list tcl))
    (arguments
@@ -4716,33 +4744,24 @@ PickleShare.")
 (define-public python-apsw
  (package
    (name "python-apsw")
-    (version "3.46.0.0")
+    (version "3.50.4.0")
    ;; The compressed release has fetching functionality disabled.
    (source
     (origin
-       (method url-fetch)
+       (method git-fetch)
-       (uri (string-append
+       (uri (git-reference
-             "https://github.com/rogerbinns/apsw/releases/download/"
+              (url "https://github.com/rogerbinns/apsw")
-             version "/apsw-" version ".zip"))
+              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32
+        (base32 "0r9awjgpl9cmqz5xd4zbqrpiv0rv5c36a18jkqnsfky6n6sgr424"))))
         "10yfbasi4mq63g0svyl1h49ylwn9znjylq78id16dzxzk9q9ipdx"))))
    (build-system pyproject-build-system)
    (native-inputs
     (list unzip python-setuptools python-wheel))
    (inputs (list sqlite-next))         ;SQLite 3.45.1 required.
    (arguments
-     (list
+     (list #:test-backend #~'custom
-      #:phases
+           #:test-flags #~(list "-m" "apsw.tests")))
-      #~(modify-phases %standard-phases
+    (native-inputs
-          (add-before 'build 'build-extensions
+     (list python-setuptools))
-            (lambda _
+    (inputs
-              (invoke "python" "setup.py" "build" "--enable-all-extensions"
+     (list sqlite-next))         ;SQLite 3.45.1 required.
                      "--enable=load_extension")))
          (add-after 'build 'build-test-helper
            (lambda _
              (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext"
                      "-I." "-Isqlite3" "src/testextension.c"))))))
    (home-page "https://github.com/rogerbinns/apsw/")
    (synopsis "Another Python SQLite Wrapper")
    (description
@@ -5050,54 +5069,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")
@@ -5719,7 +5690,6 @@ __version_tuple__ = version_tuple = (~a)~%" version version-tuple))))))
           pkg-config
           python-cython
           python-pytest
           python-pytest-runner
           python-setuptools-scm
           python-setuptools))
    (outputs '("out"))
@@ -6316,7 +6286,7 @@ mechanism of @code{dogpile}.")
 (define-public datasette
  (package
    (name "datasette")
-    (version "1.0a19")
+    (version "1.0a26")
    (source
     (origin
       (method git-fetch)
@@ -6325,23 +6295,20 @@ mechanism of @code{dogpile}.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0wb73iksrc5vg2lnq3q4vr7yhlzxwr711jfmjdndd0s77996zsfh"))))
+        (base32 "1ra0yfrz9w3jx7ix3dmcsg0g8hjxkz37586g7ijmqshxpzczxfm7"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      ;; tests: 1720 passed, 9 skipped, 8 xfailed, 13 xpassed, 3 warnings, 120
      ;; subtests passed
      #:test-flags
-      ;; See https://github.com/simonw/datasette/issues/2048
+      #~(list "--numprocesses" (number->string (min 8 (parallel-job-count)))
-      #~(list "-k" (string-append
+              "--ignore=tests/test_black.py")
                    ;; These contain two unexpected extra items.
                    "not test_searchable"
                    " and not test_searchmode")
              "--ignore=tests/test_black.py"
              "-n" (number->string (parallel-job-count)))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'relax-requirements
            (lambda _
-              (substitute* "setup.py"
+              (substitute* "pyproject.toml"
                (("\"pip\",") "")))))))
    (propagated-inputs
     (list python-aiofiles
@@ -6356,7 +6323,6 @@ mechanism of @code{dogpile}.")
           python-janus
           python-jinja2
           python-mergedeep
           python-pint
           python-pluggy
           python-pyyaml
           python-sqlite-utils
@@ -6365,9 +6331,9 @@ mechanism of @code{dogpile}.")
     (list nss-certs-for-test
           python-beautifulsoup4
           python-cogapp
           python-multipart-form-data-conformance
           python-pytest
-           python-pytest-asyncio-0.26
+           python-pytest-asyncio
           python-pytest-runner
           python-pytest-timeout
           python-pytest-xdist
           python-setuptools
@@ -27,7 +27,6 @@
 (define-module (gnu packages dav)
  #:use-module (guix build-system cargo)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -143,9 +142,6 @@ CardDAV server with a local folder or file.")
    (build-system pyproject-build-system)
    (native-inputs
     (list python-pytest
           python-pytest-cov
           python-pytest-flake8
           python-pytest-isort
           python-setuptools
           python-waitress
           python-wheel))
@@ -244,7 +240,6 @@ efficient syncing
     (list python-aioresponses
           python-pytest
           python-pytest-asyncio
           python-pytest-cov
           python-pytest-httpserver
           python-setuptools
           python-setuptools-scm
@@ -275,7 +275,7 @@ simple way to add custom protocol messages.")
       (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (native-inputs
-     (list flex python-pytest python-pytest-flake8))
+     (list flex python-pytest))
    (inputs
     (list bash-minimal clang llvm unifdef
           python python-pebble python-psutil python-chardet))
@@ -1213,7 +1213,7 @@ and input distributions can also be expressed in Fandango.")
                          ;; Shorten paths to sockets in tests.
                          (lambda _ (setenv "TMPDIR" "/tmp"))))
           #:test-target "test"))
-    (native-inputs (list python))      ; for tests
+    (native-inputs (list python python-setuptools)) ; for tests
    (synopsis "Fault injector in userspace")
    (description "Fiu provides CLI utilities and a C library
 to mark points of failure inside your code
@@ -41,7 +41,6 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
  #:use-module (gnu packages)
@@ -67,7 +67,6 @@
  #:use-module (gnu packages vim)
  #:use-module (gnu packages web)
  #:use-module (gnu packages xml)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
@@ -290,14 +289,6 @@ install.")
              (for-each (lambda (file)
                          (chmod file #o755))
                        (find-files #$output "autopkgtest-virt-.*"))))
          ;; Adjust use of importlib.resources to use python 3.10 compatible
          ;; syntax, which requires an argument.
          ;; Drop when switching to python 3.12+.
          (add-after 'unpack 'adjust-importlib-resources-for-old-python
            (lambda _
              (substitute* "reprotest/__init__.py"
                (("importlib.resources.files\\(\\)")
                  "importlib.resources.files(package='reprotest')"))))
          (add-after 'unpack 'skip-most-tests
            ;; These tests require functionality not available in the guix
            ;; build environment
@@ -27,7 +27,6 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system trivial)
  #:use-module (guix utils)
  #:use-module (gnu packages check)
@@ -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>
@@ -59,7 +59,6 @@
  #: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 build-system scons)
  #:use-module (guix build-system trivial)
@@ -94,8 +93,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 +419,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")
@@ -51,7 +51,7 @@
 (define-public boinc-client
  (package
    (name "boinc-client")
-    (version "8.2.12")
+    (version "8.2.9")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -62,7 +62,7 @@
              (file-name (git-file-name "boinc" version))
              (sha256
               (base32
-                "0531n0yij1gh06xy6plwivbpmhqfq15jizg3rdgri40nz41rzbgr"))))
+                "0ik9423ii6kal29jdn907pxy8w86zpi8n158qx1gcsh8lsaif1v5"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -37,7 +37,6 @@
  #:use-module (guix git-download)
  #:use-module (guix gexp)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix deprecation)
  #:use-module (guix search-paths)
  #:use-module (guix utils)
@@ -201,13 +200,13 @@ your project into different processes.")
 (define-public python-django
  (package
    (name "python-django")
-    (version "5.2.13")
+    (version "5.2.11")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "django" version))
       (sha256
-        (base32 "1i1vlffzhwbzp6r6y8ycvwklc45diy4c6i897z379l48a7dqj5d3"))))
+        (base32 "1lq2dynfw6jmvzrzgfrlij2qnxcksaxgnrfr0pj3bvmrv0m2jbbz"))))
    (build-system pyproject-build-system)
    (arguments
     '(#:test-flags
@@ -298,6 +297,22 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
                      ;; This CVE is fixed in 4.1.9.
                      "CVE-2023-31047"))))))
 (define-public python-django-4
  (package
    (inherit python-django)
    (name "python-django-4")
    (version "4.2.28")
    (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django" version))
        (sha256
         (base32 "1znc2q1m9p2kxz1rkfkh2hg2sx6i3aqv72zsraad7bci364cvfd4"))))
    (arguments
     (substitute-keyword-arguments arguments
       ((#:phases phases)
        #~(modify-phases #$phases (delete 'delete-sitecustomize)))))))
 (define-public python-django-cache-url
  (package
    (name "python-django-cache-url")
@@ -313,7 +328,7 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
        (base32 "1a5vd07wrnfbclvf6pz9p8ag9kdd1453lsl9q0bkyc45hq2xqd2a"))))
    (build-system pyproject-build-system)
    (native-inputs
-     (list python-django python-pytest python-pytest-cov python-setuptools))
+     (list python-django python-pytest python-setuptools))
    (home-page "https://github.com/epicserve/django-cache-url")
    (synopsis "Configure Django cache settings from URLs")
    (description
@@ -404,7 +419,6 @@ and adapters that are useful for non-trivial configuration scenarios.")
           python-factory-boy
           python-pygments
           python-pytest
           python-pytest-cov ; runs by default
           python-pytest-django
           python-setuptools
           python-shortuuid
@@ -1313,7 +1327,6 @@ server headers required for Cross-Origin Resource Sharing (CORS).")
           python-mock
           python-msgpack
           python-pytest
           python-pytest-cov
           python-pytest-django
           python-pytest-mock
           python-setuptools
@@ -2170,7 +2183,6 @@ templates and not in python-level form definitions.")
    (build-system pyproject-build-system)
    (native-inputs
     (list python-pytest
           python-pytest-cov ; runs by default
           python-pytest-django
           python-setuptools
           python-wheel))
@@ -29,7 +29,6 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
@@ -10,7 +10,6 @@
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022 Esther Flashner <esther@flashner.co.il>
 ;;; Copyright © 2025-2026 Jonas Meeuws <jonas.meeuws@gmail.com>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -321,11 +320,11 @@ integration tests...\n")
                                 "|core.thread.osthread-debug-shared")))
                           (#t `("")))))))))))))
    (native-inputs
-     (modify-inputs native-inputs
+     (append (delete "llvm"
-       (delete "llvm")
+                     (alist-replace "ldc" (list ldc-bootstrap)
-       (replace "ldc" ldc-bootstrap)
+                                    (package-native-inputs ldc-bootstrap)))
-       (append clang-17                 ;propagates llvm and clang-runtime
+         `(("clang" ,clang-17)          ;propagates llvm and clang-runtime
-               python-lit)))
+           ("python-lit" ,python-lit))))
    (properties
     (alist-delete 'hidden? (package-properties ldc-bootstrap)))))
@@ -77,8 +77,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)
@@ -95,8 +93,6 @@
  #: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)
@@ -115,7 +111,6 @@
       (uri (git-reference
              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
              (commit (string-append "adns-" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32
         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
@@ -308,58 +303,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")
@@ -555,39 +498,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
@@ -53,7 +53,6 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (srfi srfi-26))
 ;; The fetch-plan, install-plan and phases for docbook-xml tend to vary
@@ -666,7 +665,8 @@ the in DocBook SGML DTDs.")
               (base32
                "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"))
              (patches
-               (search-patches "dblatex-inkscape-1.0.patch"))))
+               (search-patches "dblatex-importlib.patch"
                               "dblatex-inkscape-1.0.patch"))))
    (outputs '("out" "doc"))
    (build-system pyproject-build-system)
    (arguments
@@ -39,7 +39,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix utils)
  #:use-module (gnu packages autotools)
@@ -41,7 +41,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix deprecation)
@@ -472,9 +471,8 @@ inspired by Dash.")
    (build-system gnu-build-system)
    (arguments
     (list
-      ;; Essentially a lighter copy of the former python-build-system.
+      ;; Custom build steps to prevent using pyproject-build-system which
-      ;; Using it rather than pyproject-build-system allows to edit the latter
+      ;; allows to edit the latter without a texlive + haskell world rebuild.
      ;; without a texlive + haskell world rebuild.
      #:phases
      #~(modify-phases %standard-phases
          (delete 'bootstrap)
@@ -62,7 +62,6 @@
  #:use-module (guix utils)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system python)
  #:use-module (ice-9 match))
 (define-public treecc
@@ -25,7 +25,6 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system pyproject)
  #:use-module ((guix build-system python) #:select (pypi-uri))
  #:use-module (guix build-system r)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -148,13 +147,13 @@ system.")
 (define-public r-duckdb
  (package
    (name "r-duckdb")
-    (version "1.5.2")
+    (version "1.5.1")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "duckdb" version))
       (sha256
-        (base32 "1dldlfwvc33czvlxfmwaj4p9y6sjjj5iqy98yda47a8kclrqmyam"))
+        (base32 "177621m08whqqk4yhj3zrr08l3d9hhlqh3gm9jzhi5cplg47cksq"))
       ;; This package bundles the duckdb sources and builds a custom variant
       ;; of duckdb.  I'd be happy to link it with our duckdb library instead,
       ;; but it does not seem possible to do that.
@@ -40,7 +40,6 @@
  #: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 (gnu packages)
  #:use-module (gnu packages autotools)
@@ -91,7 +91,6 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
  #:use-module (srfi srfi-1))
@@ -64,7 +64,6 @@
  #: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 deprecation)
  #:use-module (guix download)
@@ -480,8 +479,10 @@ individual low-level driver modules.")
    (build-system gnu-build-system)
    (arguments
     (list
-      #:imported-modules (append %default-gnu-imported-modules
+      #:imported-modules %pyproject-build-system-modules
-                                 %python-build-system-modules)
+      #:modules '((guix build gnu-build-system)
                  ((guix build pyproject-build-system) #:prefix py:)
                  (guix build utils))
      #:make-flags
      #~(list (string-append "PREFIX=" #$output))
      #:phases
@@ -507,8 +508,7 @@ individual low-level driver modules.")
                ;; https://github.com/YosysHQ/eqy/actions/runs/18767539188/job/53545383858
                (invoke "make" "-C" "examples/spm")
                (invoke "make" "-C" "examples/simple"))))
-          (add-after 'install 'python:wrap
+          (add-after 'install 'python:wrap py:wrap))))
            (@@ (guix build python-build-system) wrap)))))
    (native-inputs
     (list clang python-minimal-wrapper python-sphinx texinfo yosys))
    (inputs
@@ -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
+electrical diagrams), gerbview (viewing Gerber files) and others.")
 SQLite-backed database libraries, install the optional @code{sqliteodbc}
 package.")
    (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.")))
@@ -2074,7 +2072,10 @@ versus schematic} tests and can assist with automatic routing.")
     (list
      #:tests? #f                       ;there are no tests
      #:imported-modules (append %qt-build-system-modules
-                                 %python-build-system-modules)
+                                 %pyproject-build-system-modules)
      #:modules '((guix build qt-build-system)
                  ((guix build pyproject-build-system) #:prefix py:)
                  (guix build utils))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'build-info-documentation
@@ -2102,8 +2103,7 @@ versus schematic} tests and can assist with automatic routing.")
                  (chmod bin_ #o755)))
              (install-it "mcy")
              (install-it "mcy-dash")))
-          (add-after 'make-install 'python:wrap
+          (add-after 'make-install 'python:wrap py:wrap))))
            (@@ (guix build python-build-system) wrap)))))
    (native-inputs
     (list pkg-config
           python-sphinx
@@ -2331,7 +2331,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
 (define-public nvc
  (package
    (name "nvc")
-    (version "1.20.1")
+    (version "1.19.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2340,7 +2340,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1b38x2ch468s4p6mrq6c8s0d95vb84p6w4v8in79l4w7sfy8jnr0"))))
+                "1zizz2dafm53lzpjayy6vig5pz5ri9cszdivg0jzzh8s3ggkpy1i"))))
    (build-system gnu-build-system)
    (arguments
     (list #:out-of-source? #t
@@ -3010,7 +3010,6 @@ Numpy arrays for convenience.")
              (setenv "PDM_BUILD_SCM_VERSION" #$version))))))
    (native-inputs
     (list python-pdm-backend
           python-pytest-cov
           python-setuptools
           python-setuptools-scm
           sby
@@ -3323,9 +3322,7 @@ Standard} data mode.")
        (base32 "15nnydvr1a4ykh8cagi484sfgvdg0dnjxaw6c0ivhjbrbblpaqnw"))))
    (build-system pyproject-build-system)
    (native-inputs
-     (list python-pytest-cov
+     (list python-setuptools python-setuptools-scm))
           python-setuptools
           python-setuptools-scm))
    (home-page "http://pyvcd.readthedocs.io/")
    (synopsis "Library to manipulate digital wave files")
    (description
@@ -3461,7 +3458,7 @@ form of AXI, AXI lite, and AXI stream modules.")
 (define-public python-edalize
  (package
    (name "python-edalize")
-    (version "0.6.8")
+    (version "0.6.6")
    (source
     (origin
       (method git-fetch)
@@ -3470,7 +3467,7 @@ form of AXI, AXI lite, and AXI stream modules.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "04m2lhkclw9fj92k43c06j003qnq9i1yhy2131fvcnkkr0d9438m"))))
+        (base32 "115nc15n2cx4x9irjim07zkg0287418djqd6ja7rm8jrnyldvln9"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -3602,10 +3599,7 @@ Automation}.")
                         #$output "/share/info/hdlmake-figures")))))
      #:test-flags #~(list "test_all.py")))
    (native-inputs
-     (list python-pytest-cov
+     (list python-setuptools python-sphinx texinfo))
           python-setuptools
           python-sphinx
           texinfo))
    (propagated-inputs (list python-networkx))
    (home-page "https://ohwr.gitlab.io/project/hdl-make/")
    (synopsis "Generate multi-purpose makefiles for HDL projects")
@@ -3768,18 +3762,9 @@ design.")
      ;; Tests are expensive and may introduce race condition on systems with
      ;; high (more than 16) threads count; limit parallel jobs to 8x.
      #~(list
-         "--numprocesses" (number->string (min 8 (parallel-job-count))))
+         "--numprocesses" (number->string (min 8 (parallel-job-count))))))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'pathch-pytest-options
            (lambda _
              (substitute* "pyproject.toml"
                ((".*--cov=.*") "")
                ((".*--self-contained-html.*") "")
                ((".*-n.*auto.*") "")))))))
    (native-inputs
-     (list python-pytest-cov
+     (list python-pytest
           python-pytest-html
           python-pytest-xdist
           python-setuptools))
    (propagated-inputs
@@ -4248,11 +4233,10 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
     (list
      #:parallel-tests? #f
      #:test-target "test"
      #:imported-modules %pyproject-build-system-modules
      #:modules `((guix build gnu-build-system)
-                  ((guix build python-build-system) #:prefix python:)
+                  ((guix build pyproject-build-system) #:prefix python:)
                  (guix build utils))
      #:imported-modules `(,@%default-gnu-imported-modules
                           (guix build python-build-system))
      #:make-flags #~(list (string-append "PREFIX=" #$output))
      #:phases
      #~(modify-phases %standard-phases
@@ -4516,7 +4500,7 @@ unique design feature of Trilinos is its focus on packages.")
 (define-public verilator
  (package
    (name "verilator")
-    (version "5.048")
+    (version "5.046")
    (source
     (origin
       (method git-fetch)
@@ -4525,7 +4509,7 @@ unique design feature of Trilinos is its focus on packages.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "16c1x66kqmc5ldqjij81kypj471fibfihcqn6kz4wbxvnn0smyn6"))))
+        (base32 "1gr1qhxvl4856hnmnx46dqd2qp0jhdh959zm2qfmxzzh19np7xkm"))))
    (native-inputs
     (list autoconf
           automake
@@ -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")
+      #~(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")))))))
    (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))
+    (inputs (list bash-minimal erlang rebar3 git))
    (native-inputs (list git-minimal))
    (native-search-paths
     (list (search-path-specification
            (variable "GUIX_ELIXIR_LIBS")
@@ -62,7 +62,7 @@ as bold, underscore or italic.")
 (define-public emacs-buttercup
  (package
    (name "emacs-buttercup")
-    (version "1.40")
+    (version "1.38")
    (source
     (origin
       (method git-fetch)
@@ -72,7 +72,9 @@ as bold, underscore or italic.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r"))))
+         "09n8skr5wi8bs7x81d5bi6z89dd8s1zi9a5f4r2qadaz69slncxq"))
       (patches
        (search-patches "emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -28,7 +28,6 @@
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com>
 ;;; Copyright © 2025 John Kehayias <john@guixotic.coop>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -870,7 +869,7 @@ Started in 2014 as a GSOC project, Guile-Emacs was resurrected in 2024.")
         "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list gettext-minimal))
+     `(("gettext" ,gettext-minimal)))
    (arguments
     `(#:configure-flags
       (list (string-append "--with-charmaps="
@@ -45,7 +45,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system trivial)
  #:use-module ((guix build utils) #:select (alist-replace delete-file-recursively))
  #:use-module (gnu packages)
@@ -2033,13 +2032,7 @@ whereas kdmx creates pseudo-ttys.")
      ;; tests: 631 passed, 27 skipped, 1 warning
      #:test-flags
      ;; E   ModuleNotFoundError: No module named 'mbed_tools_ci_scripts'
-      #~(list "--ignore=tests/ci_scripts/test_sync_board_db.py")
+      #~(list "--ignore=tests/ci_scripts/test_sync_board_db.py")))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'fix-pytest-config
            (lambda _
              (substitute* "pytest.ini"
                (("addopts = .*") "")))))))
    (native-inputs
     (list python-factory-boy
           python-pytest
@@ -140,7 +140,6 @@
  #: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 python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial))
@@ -1264,8 +1263,7 @@ Enjoy all of your favorite Atari 2600 games on your PC thanks to Stella!")
        (base32 "1xf15b6c3i0vv92b420a92pfvfaxhji56ivin8pn5r7fajkqyfb7"))))
    (build-system gnu-build-system)
    (native-inputs
-     (cons* pkg-config which
+     (list pkg-config nasm which))
            (maybe-nasm)))
    (inputs
     (list freetype
           glu
@@ -1290,6 +1288,8 @@ Enjoy all of your favorite Atari 2600 games on your PC thanks to Stella!")
                      (list "all" (string-append "PREFIX=" out)))
       ;; There are no tests.
       #:tests? #f))
    ;; As per the Makefile (in projects/unix/Makefile):
    (supported-systems '("i686-linux" "x86_64-linux"))
    (home-page "https://www.mupen64plus.org/")
    (synopsis "Nintendo 64 emulator core library")
    (description
@@ -2163,9 +2163,7 @@ as RetroArch.")
              (lambda _
                (install-file "mupen64plus_next_libretro.so"
                              (string-append #$output "/lib/libretro/")))))))
-      (native-inputs
+      (native-inputs (list nasm pkg-config))
       (cons* pkg-config
              (maybe-nasm)))
      (inputs (list mesa libpng minizip unzip xxhash zlib))
      (home-page "https://github.com/libretro/mupen64plus-libretro-nx")
      (synopsis "Improved Mupen64Plus libretro core")
@@ -3453,7 +3451,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)
@@ -3462,16 +3460,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"
+                       '("asio" "expat" "glm" "libflac" "libjpeg" "lua"
-                         "portaudio" "portmidi" "pugixml" "rapidjson"
+                         "portaudio" "portmidi" "pugixml" "rapidjson" "SDL2"
-                         "sqlite3" "utf8proc" "zlib")))))))
+                         "SDL2-override" "sqlite3" "utf8proc" "zlib")))))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -3605,9 +3603,7 @@ This is a part of the TiLP project.")
           libjpeg-turbo
           libxi
           libxinerama
-           ;; MAME requires Lua compiled as C++ to work correctly.
+           lua
           ;; See https://www.mamedev.org/?p=523
           lua-5.4-for-c++
           portaudio
           portmidi
           pugixml
@@ -41,7 +41,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix licenses)
  #:use-module (srfi srfi-1))
@@ -77,7 +77,6 @@
  #: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)
@@ -1828,7 +1827,6 @@ it suitable for security research and analysis.")
    (native-inputs (list python-gitpython
                         python-pytest
                         python-pytest-asyncio
                         python-pytest-cov
                         python-pytest-mock
                         python-setuptools))
    (inputs (list bash-minimal
@@ -2367,7 +2365,6 @@ Newton-Raphson power flow solvers in the C++ library lightsim2grid, and the
                         python-networkx
                         python-openpyxl
                         python-pytest
                         python-pytest-cov ; --cov runs by default on skrf
                         python-pytest-mock
                         python-pyvisa
                         python-setuptools
@@ -2730,7 +2727,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 +2737,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))
@@ -2901,20 +2898,22 @@ interpolation toolkit.")
 (define-public python-motulator
  (package
    (name "python-motulator")
-    (version "0.5.0")
+    (version "0.6.2")
    (source
     (origin
-       (method url-fetch)
+       (method git-fetch)
-       (uri (pypi-uri "motulator" version))
+       (uri (git-reference
              (url "https://github.com/Aalto-Electric-Drives/motulator/")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1kh13zfa4w73q04pny2w2zgym47fp8xy7glwfx82fdx4fihk7dv7"))))
+        (base32 "1di2r1i19jl751v0hj426zkwk48w5yf8zpw2bl6qzk0vq4z2vpbw"))))
    (build-system pyproject-build-system)
    (arguments
     (list #:tests? #f)) ; there are no tests
-    (propagated-inputs (list python-matplotlib python-numpy python-scipy))
+    (propagated-inputs
-    (native-inputs (list python-hatchling
+     (list python-numpy python-matplotlib python-scipy python-tqdm))
-                         python-ipykernel
+    (native-inputs (list python-hatchling))
                         python-toml))
    (home-page "https://aalto-electric-drives.github.io/motulator/")
    (synopsis "Motor Drive Simulator in Python")
    (description "This package includes simulation models for an induction
@@ -30,7 +30,6 @@
  #:use-module (guix gexp)
  #:use-module (guix utils)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (gnu packages)
  #:use-module (gnu packages algebra)
@@ -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
@@ -220,7 +220,6 @@ testing InfiniBand networks.")
                           "--disable-assertions"
                           "--disable-params-check"
                           "--enable-mt"
                           (string-append "--with-verbs="
                                          #$(this-package-input "rdma-core"))
@@ -148,11 +148,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)
@@ -29,7 +29,6 @@
  #: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 licenses) #:prefix license:)
  #:use-module (guix utils)
  #:use-module (gnu packages)
@@ -245,7 +244,6 @@ seamlessly with your desktop environment.")
    (native-inputs
     (list nss-certs-for-test
           python-pytest
           python-pytest-cov
           python-pytest-mock
           python-pytest-recording
           python-pytest-retry
@@ -50,7 +50,6 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system linux-module)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
  #:use-module (guix utils)
@@ -1128,8 +1127,8 @@ transaction log.
     (inherit jfsutils)
     (name "jfsutils-static")
     (inputs
-      (modify-inputs inputs
+      `(("util-linux:static" ,util-linux "static")
-        (prepend (list util-linux "static")))))))
+        ,@(package-inputs jfsutils))))))
 (define-public jfs_fsck/static
  (package
@@ -70,7 +70,6 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system haskell)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system go)
@@ -165,7 +164,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 +172,7 @@
                              version "/bitcoin-" version ".tar.gz"))
              (sha256
               (base32
-                "1qxkcyq8nwq6sw4qi660z8n8356mqdsf4jvpq5ndkvrsx9gfz80b"))))
+                "1jw4djh22v0nih0n7irdbknfbqavlc4l3b8176b5qgc88a60pl3g"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -197,7 +196,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))
@@ -1621,10 +1622,7 @@ features:
       (sha256
        (base32 "0yir8hka3vmpk0qhiaffagkdjg3mjgai808s0razsggbd5cn80bb"))))
    (build-system pyproject-build-system)
-    (native-inputs
+    (native-inputs (list python-pytest python-setuptools))
     (list python-pytest
           python-pytest-cov
           python-setuptools))
    (home-page "https://arthurdejong.org/python-stdnum/")
    (synopsis "Python module to handle standardized number and code formats")
    (description
@@ -2507,10 +2505,6 @@ analysis of financial market data.")
        (base32 "13g5338aa8vgkx8g94vz5d8ynfq3jndvyh1nz6dlhw4axwr4x8dp"))))
    (properties '(("upstream-name" #{.}# "mt-940")))
    (build-system pyproject-build-system)
    (arguments
     (list
      #:test-flags
      #~(list "-c" "/dev/null")))       ; Remove custom --cov flags.
    (native-inputs (list python-pytest python-pyyaml python-setuptools))
    (home-page "https://mt940.readthedocs.io/")
    (synopsis "Python parser for MT940-encoded SWIFT data")
@@ -47,7 +47,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system trivial)
  #:use-module (gnu packages)
@@ -1159,10 +1158,10 @@ Executables included are:
      (native-inputs
       (append
         (list acpica
               nasm
               perl
               python-3
               (list util-linux "lib"))
         (maybe-nasm (string-append arch "-" arch))
         (if (not (string-prefix? arch (%current-system)))
             (if (string=? arch "armhf")
                 (list (cross-gcc "arm-linux-gnueabihf")
@@ -49,7 +49,6 @@
  #: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)
@@ -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
@@ -96,7 +96,6 @@
  #: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 utils)
  #:use-module (srfi srfi-1))
@@ -473,6 +472,53 @@ font design software, it allows you to join, split, offset, and perform many
 other operations on paths.")
    (license license:expat)))
 (define-public python-booleanoperations
  (package
    (name "python-booleanoperations")
    (version "0.9.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/typemytype/booleanOperations")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32 "0ahfgamyq1ndwbr9n8sdx8qhqc2195xnbahylgjpk877hbr2gxav"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      ;; Some tests fail due to small differences in the expected result (see:
      ;; <https://github.com/typemytype/booleanOperations/issues/69>).
      #:test-flags
      #~(list "-k"
              (string-join
               (list "not test_QTail_reversed_difference"
                     "test_QTail_reversed_intersection"
                     "test_QTail_reversed_union"
                     "test_QTail_reversed_xor"
                     "test_Q_difference"
                     "test_Q_intersection"
                     "test_Q_union"
                     "test_Q_xor")
               " and not "))))
    (native-inputs
     (list python-defcon-bootstrap
           python-fontpens-bootstrap
           python-pytest
           python-setuptools
           python-setuptools-scm))
    (propagated-inputs
     (list python-fonttools-minimal
           python-pyclipper))
    (home-page "https://github.com/typemytype/booleanOperations")
    (synopsis "Boolean operations on paths")
    (description
     "Boolean operations on paths which uses a super fast
@url{http://www.angusj.com/delphi/clipper.php, polygon clipper library by
 Angus Johnson}.")
    (license license:expat)))
 (define-public python-cffsubr
  (package
    (name "python-cffsubr")
@@ -574,7 +620,6 @@ for fontTools.")
     (list python-cython
           python-defcon
           python-pytest
           python-pytest-runner
           python-setuptools
           python-setuptools-scm
           python-wheel
@@ -701,8 +746,7 @@ implementing the pen protocol for manipulating glyphs.")
      (modify-inputs native-inputs
        (append python-fontparts-bootstrap
                python-fontpens-bootstrap
-                python-pytest
+                python-pytest))))))
                python-pytest-runner))))))
 ;;; A variant used to break a cycle with python-fontpens.
 (define-public python-fontparts-bootstrap
@@ -983,7 +1027,6 @@ suite of the @code{psautohint} package.")
    (native-inputs
     (list psautohint-font-data
           python-pytest
           python-pytest-cov
           python-pytest-xdist
           python-setuptools-scm
           python-setuptools
@@ -1827,6 +1870,10 @@ definitions.")
           pango
           potrace
           python
           ;; XXX: Python 3.12 lacks distutils:
           ;; ModuleNotFoundError: No module named 'distutils'
           ;; Remove when package is updated.
           python-setuptools-bootstrap
           zlib))
    (arguments
     (append
@@ -43,7 +43,6 @@
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 wvlab <me@wvlab.xyz>
 ;;; Copyright © 2025 jgart <jgart@dismail.de>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -74,7 +73,6 @@
  #: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 glib-or-gtk)
  #:use-module (guix build-system qt)
  #:use-module (guix search-paths)
@@ -1379,41 +1377,43 @@ For information about libevdev, see:
    (license license:expat)))
 (define-public python-pyxdg
-  (package
+  ;; Latest unreleased commits add Python 3.12, 3.14 and 3.15 support.
-    (name "python-pyxdg")
+  (let ((commit "63033ac306aa26d32e1439417e59ae8f8a4c9820")
-    (version "0.28")
+        (revision "0"))
-    (source
+    (package
-     (origin
+      (name "python-pyxdg")
-       (method url-fetch)
+      (version "0.28")
-       (uri (pypi-uri "pyxdg" version))
+      (source
-       (sha256
+       (origin
-        (base32
+         (method git-fetch)
-         "1d48bqwkbnpid80cpwz6h62i112laxl0ivpj58hdyd79fhqbnrrj"))))
+         (uri (git-reference
-    (build-system pyproject-build-system)
+                (url "https://gitlab.freedesktop.org/xdg/pyxdg")
-    (arguments
+                (commit commit)))
-     (list
+         (file-name (git-file-name name version))
-      #:test-flags
+         (sha256
-      ;; Tests failing with error: AssertionError: 'image' != 'inode'
+          (base32
-      #~(list "--deselect=test/test_mime.py::MimeTest::test_get_type"
+           "10wk95rmcr2fglmvmv1a6ad9hkw9587r0rlww0gq6kbfz85whgmd"))))
-              "--deselect=test/test_mime.py::MimeTest::test_get_type2")
+      (build-system pyproject-build-system)
-      #:phases
+      (arguments
-      #~(modify-phases %standard-phases
+       (list
-          (add-before 'check 'pre-check
+        #:phases
-            (lambda _
+        #~(modify-phases %standard-phases
-              (setenv "XDG_DATA_DIRS"
+            (add-before 'check 'pre-check
-                      (string-append #$(this-package-native-input "shared-mime-info")
+              (lambda _
-                                     "/share/")))))))
+                (setenv "XDG_DATA_DIRS"
-    (native-inputs
+                        (string-append #$(this-package-native-input "shared-mime-info")
-     (list shared-mime-info
+                                       "/share/")))))))
-           hicolor-icon-theme
+      (native-inputs
-           python-pytest
+       (list shared-mime-info
-           python-setuptools))
+             hicolor-icon-theme
-    (home-page "https://www.freedesktop.org/wiki/Software/pyxdg")
+             python-pytest
-    (synopsis "Implementations of freedesktop.org standards in Python")
+             python-setuptools))
-    (description
+      (home-page "https://www.freedesktop.org/wiki/Software/pyxdg")
-     "PyXDG is a collection of implementations of freedesktop.org standards in
+      (synopsis "Implementations of freedesktop.org standards in Python")
      (description
       "PyXDG is a collection of implementations of freedesktop.org standards in
 Python.")
-    (license license:lgpl2.0)))
+      (license license:lgpl2.0))))
 (define-public hyprland-protocols
  (package
@@ -2178,7 +2178,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
           libxslt                      ;for xsltproc
           pkg-config
           python-minimal
-           python-dbus-1.2              ;for test
+           python-dbus                  ;for test
           python-pygobject             ;for test
           vala))
    (propagated-inputs
@@ -2372,7 +2372,7 @@ different sorts of messages in different formats.")
          (base32 "02wb61h2k3hhis5y2xi5rhc6pmikd13x722hk620sqb9b3m5pn3s"))))
      (build-system gnu-build-system)
      (native-inputs (list autoconf automake libtool pkg-config))
-      (inputs (list libxslt python-wrapper python-dbus-1.2))
+      (inputs (list libxslt python-wrapper python-dbus))
      (propagated-inputs (list telepathy-glib))
      (home-page "https://telepathy.freedesktop.org/")
      (synopsis "Telepathy IRC connection manager")
@@ -3054,10 +3054,10 @@ useful with system integration.")
         "0zs4z7l9b57jldwz0ban77f3c2zq43ambd0dssf5qg9i216f9lmj"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list dbus-test-runner
+     `(("dbus-test-runner" ,dbus-test-runner)
-           (list glib "bin")
+       ("glib:bin" ,glib "bin")
-           pkg-config
+       ("pkg-config" ,pkg-config)
-           xorg-server-for-tests))
+       ("xvfb" ,xorg-server-for-tests)))
    (inputs
     (list gtk+ glib))
    (arguments
@@ -3418,50 +3418,50 @@ interfaces.")
 (define-public xdg-desktop-portal-wlr
  (package
    (name "xdg-desktop-portal-wlr")
-    (version "0.8.2")
+    (version "0.7.1")
-    (source
+    (source (origin
-     (origin
+              (method git-fetch)
-       (method git-fetch)
+              (uri (git-reference
-       (uri (git-reference
+                     (url "https://github.com/emersion/xdg-desktop-portal-wlr")
-             (url "https://github.com/emersion/xdg-desktop-portal-wlr")
+                     (commit (string-append "v" version))))
-             (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
-       (file-name (git-file-name name version))
+              (sha256
-       (sha256
+               (base32
-        (base32 "1jj0a9s3h3i04qsxkhcpxjzbb17hs9ngdy7wkypja09233zdz10w"))
+                "1mbq3czka9swwmfaasnaj89y2m254p3qa522ayclh688jdwh70hq"))
-       (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
+              (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
    (build-system meson-build-system)
    (arguments
-     (list
+     `(#:configure-flags
-      #:configure-flags
+       '("-Dsystemd=disabled"
-      #~(list "-Dsystemd=disabled"
+         "-Dsd-bus-provider=libelogind")
-              "-Dsd-bus-provider=libelogind")
+       #:phases
-      #:phases
+       (modify-phases %standard-phases
-      #~(modify-phases %standard-phases
+         (add-after 'unpack 'hardcode-binaries
-          (add-after 'unpack 'hardcode-binaries
+           (lambda* (#:key inputs #:allow-other-keys)
-            (lambda* (#:key inputs #:allow-other-keys)
+             (let ((sh (search-input-file inputs "/bin/sh"))
-              (let ((sh (search-input-file inputs "/bin/sh"))
+                   (grim (search-input-file inputs "/bin/grim"))
-                    (grim (search-input-file inputs "/bin/grim"))
+                   (slurp (search-input-file inputs "/bin/slurp")))
-                    (slurp (search-input-file inputs "/bin/slurp")))
+               (substitute* "src/screenshot/screenshot.c"
-                (substitute* '("src/screencast/chooser.c"
+                 (("grim") grim)
-                               "src/screenshot/screenshot.c")
+                 (("slurp") slurp)
-                  (("grim") grim)
+                 (("execl\\(\"/bin/sh\", \"/bin/sh\"")
-                  (("slurp") slurp)
+                  (string-append "execl(\"" sh "\", \"" sh "\"")))
-                  (("/bin/sh") sh))
+               (substitute* "src/screencast/screencast.c"
-                (substitute* "src/screencast/screencast.c"
+                 (("execvp\\(\"sh")
-                  (("execvp\\(\"sh")
+                  (string-append "execvp(\"" sh))))))
-                   (format #f "execvp(\"~a" sh))))))
+         (add-after 'install 'install-documentation
-          (add-after 'install 'install-documentation
+           (lambda* (#:key outputs #:allow-other-keys)
-            (lambda _
+             (install-file "../source/README.md"
-              (install-file "../source/README.md"
+                           (string-append (assoc-ref outputs "out")
-                            (string-append #$output "/share/doc/"
+                                          "/share/doc/" ,name)))))))
-                                           #$name)))))))
+    (native-inputs
-    (native-inputs (list cmake-minimal pkg-config scdoc))
+     (list cmake-minimal pkg-config))
-    (inputs (list bash-minimal
+    (inputs (list elogind
-                  elogind
+                  bash-minimal
                  grim
                  iniparser
                  libinih
                  mesa
                  libinih
                  pipewire
                  slurp
                  wayland
@@ -70,7 +70,6 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system renpy)
  #:use-module (guix build-system scons)
  #:use-module (gnu packages)
@@ -552,14 +552,14 @@ use with @code{udev-service-type}.")
 (define-public armagetronad
  (package
    (name "armagetronad")
-    (version "0.2.9.3.0")
+    (version "0.2.9.2.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/armagetronad/stable/"
                                  version "/armagetronad-" version ".tbz"))
              (sha256
               (base32
-                "1q1zlbhbcimr6bw0ms1pr8hz4q850ivi3hvxn3467jfgiq22f3cy"))))
+                "0a6rlp2lj5bp7pg1yf8brjyb3mw7nqp3amj19wvz3xni21bbc31k"))))
    (build-system gnu-build-system)
    (arguments
     (list #:configure-flags
@@ -576,7 +576,6 @@ use with @code{udev-service-type}.")
                     (("^install_link .*BINDIR.*") "")))))))
    (native-inputs (list pkg-config))
    (inputs (list libxml2
                  curl
                  (sdl-union (list sdl sdl-image sdl-mixer))
                  freeglut
                  libpng
@@ -3408,8 +3407,7 @@ and defeat them with your bubbles!")
                                 "SamTSE/Sources/Engine/Engine.cpp")
                (("@OUTPUT_DIR@") #$output)))))))
    (inputs (list sdl2 libvorbis))
-    (native-inputs (cons* flex bison imagemagick
+    (native-inputs (list flex bison nasm imagemagick))
                          (maybe-nasm)))
    (home-page "https://github.com/tx00100xt/SeriousSamClassic")
    (synopsis "SeriousSam engine and Serious Sam: TFE and TSE")
    (description
@@ -4130,7 +4128,7 @@ a C library, so they can easily be integrated into other programs.")
 (define-public taisei
  (package
    (name "taisei")
-    (version "1.4.4")
+    (version "1.4.2")
    (source
     (origin
       (method url-fetch)
@@ -4138,7 +4136,7 @@ a C library, so they can easily be integrated into other programs.")
                           "taisei/releases/download/v" version
                           "/taisei-" version ".tar.xz"))
       (sha256
-        (base32 "13b2ha8nsdzbydirvc7hw1q46jzhn6cx9b9spgk777swjlgx2vph"))))
+        (base32 "19sgm175clkvpcv0b9p4jkjpfxqw0kyl2i5p8w63kwzqcjp9m1jx"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -4147,8 +4145,7 @@ a C library, so they can easily be integrated into other programs.")
                                "-Dr_gles30=enabled"
                                "-Dshader_transpiler=enabled")))
    (native-inputs
-     (list cmake-minimal
+     (list pkg-config
           pkg-config
           python
           python-docutils
           python-pygments
@@ -4156,29 +4153,24 @@ a C library, so they can easily be integrated into other programs.")
    (inputs
     (list cglm
           freetype
           glslang
           libdecor                     ; XXX: for sdl3
           libpng
           libwebp
           libzip
           mesa
           openssl
           opusfile
-           sdl3
+           sdl2
           sdl2-mixer
           shaderc
           spirv-cross
           spirv-tools                  ; for glslang
           vulkan-loader                ; XXX: for sdl3?
           zlib
           (list zstd "lib")))
    (home-page "https://taisei-project.org/")
    (synopsis "Shoot'em up fangame and libre clone of Touhou Project")
    (description
-     "Taisei is a vertical shoot'em up game, in which the player controls
+     "The player controls a character (one of three: Good, Bad, and Dead),
-one of three characters.  While moving through stages, a large number of
+dodges the missiles (lots of it cover the screen, but the character's hitbox
-enemies and even larger amounts of bullets appear that require careful
+is very small), and shoot at the adversaries that keep appear on the screen.")
 maneuvers to dodge.  By shooting the enemies, players receive powerups
 for their characters, allowing them to shoot even more.")
    (license (list
              ;; game
              license:expat
@@ -4731,10 +4723,6 @@ for common mesh file formats, and collision detection.")
                      (url "https://github.com/thelaui/M.A.R.S.")
                      (commit commit)))
                (file-name (git-file-name name version))
                (modules '((guix build utils)))
                (snippet
                 #~(begin
                     (delete-file-recursively "ext_libs_for_windows")))
                (sha256
                 (base32
                  "0bdi4ja39rark742qvqixm8khai5k8qd84z5kzim9jcjdvvwyqj9"))))
@@ -4761,8 +4749,7 @@ for common mesh file formats, and collision detection.")
 attractive physics.  Players can battle each other or computer controlled
 enemies in different game modes such as space ball, death match, team death
 match, cannon keep, and grave-itation pit.")
-      (license (list license:gpl3+
+      (license license:gpl3+))))
                     license:cc-by-sa3.0))))) ;/data/audio/music
 (define-public alienblaster
  (package
@@ -5357,9 +5344,7 @@ also available.")
                   (with-directory-excursion "src"
                     (substitute* "CMakeLists.txt"
                       (("glm::glm")
-                        "glm")))
+                        "glm")))))))
                   ;; Rename the icon to match with the executable file.
                   (rename-file "srb2.png" "ringracers.png")))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -5369,30 +5354,15 @@ also available.")
              "-DCMAKE_CXX_FLAGS_RELWITHDEBINFO='-O3 -g -DNDEBUG'")
      #:phases
      #~(modify-phases %standard-phases
-          (replace 'install
+          (add-after 'install 'move-and-wrap-binary
            (lambda _
              (install-file "bin/ringracers" (string-append #$output "/bin"))
              (install-file "../source/ringracers.png"
                            (string-append #$output "/share/pixmaps"))))
          (add-after 'install 'wrap-program
            ;; Install executable to $out/bin.
            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-program "bin/ringracers"
+              (with-directory-excursion #$output
-                `("RINGRACERSWADDIR" =
+                (mkdir "bin")
-                  (,(assoc-ref inputs "ring-racers-data"))))))
+                (rename-file "ringracers" "bin/ringracers")
-          (add-after 'wrap-program 'create-desktop-entry
+                (wrap-program "bin/ringracers"
-            (lambda _
+                  `("RINGRACERSWADDIR" =
-              (let* ((datadir (string-append #$output "/share"))
+                    (,(assoc-ref inputs "ring-racers-data"))))))))))
                     (appdir (string-append datadir "/applications")))
                (mkdir-p appdir)
                (make-desktop-entry-file (string-append appdir
                                                        "/ringracers.desktop")
                  #:name "Dr. Robotnik's Ring Racers"
                  #:comment "Technical kart racing game"
                  #:icon "ringracers"
                  #:exec (string-append #$output "/bin/ringracers")
                  #:startup-notify #f
                  #:categories '("Application" "Game"))))))))
    (native-inputs (list pkg-config))
    (inputs (list glm
                  libogg
@@ -5564,13 +5534,23 @@ falling, themeable graphics and sounds, and replays.")
    (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
@@ -5957,7 +5937,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") "\",
@@ -5984,7 +5964,7 @@ Transport Tycoon Deluxe.")
  (package
    (inherit openttd)
    (name "openttd-jgrpp")
-    (version "0.71.2")
+    (version "0.70.2")
    (source
     (origin
       (method git-fetch)
@@ -5993,7 +5973,7 @@ Transport Tycoon Deluxe.")
             (commit (string-append "jgrpp-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1gb5gickmf1d1wkzqny5ryapvw32a2g94f77iq0102xhyyw8g8s0"))))
+        (base32 "1jzzvribf2cqvjl9cympyx9qpplljvmhqrrlw7aq4ckzl92d87z3"))))
    (inputs (modify-inputs inputs
              (append zstd harfbuzz)))
    (arguments
@@ -55,7 +55,6 @@
  #: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 build-system r)
  #:use-module (guix build-system zig)
@@ -298,7 +297,7 @@ than 600 operators available.")
 (define-public h3
  (package
    (name "h3")
-    (version "4.1.0")
+    (version "4.4.1")
    (source
     (origin
       (method git-fetch)
@@ -307,7 +306,7 @@ than 600 operators available.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0x764xzna8ka6yhgv2y4hb158a61y3g9a6835qckqp7wfkpqvb7f"))))
+        (base32 "1ijnbr4a54ph7bkn8waqwgnxmxlylv9yly9mwjdj69lkmdfjgaml"))))
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
@@ -319,48 +318,25 @@ combining the benefits of a hexagonal grid with S2's hierarchical
 subdivisions.")
    (license license:asl2.0)))
 ;; For python-timezonefinder, remove it when it starts supporting newer
 ;; version.
 (define-public h3-3
  (package
    (inherit h3)
    (name "h3")
    (version "3.7.2")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/uber/h3")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "0bvsljfxmjvl23v9gxykc4aynjzh5xfy3wg02bxad7cknr1amx9j"))))))
 (define-public python-h3
  (package
    (name "python-h3")
-    (version "4.0.0b2")
+    (version "4.4.2")
    (source
     (origin
-       (method git-fetch) ; no tests data in PyPi package
+       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/uber/h3-py")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1k1n256hhlh05gjcj64pqh08zlaz6962jkb6nk1aazsgg8p41zs0"))
+        (base32 "02gry51hn8x2bl80y1ipcyrg0ghcif4vjch26qil215wdzz1yrzv"))
       (modules '((guix build utils)))
       ;; Remove bundled H3 lib.
       (snippet #~(begin (delete-file-recursively "src/h3lib")))))
    (build-system pyproject-build-system)
    (arguments
     (list
      ;; FIXME: Check why these tests are failing.
      ;; test_versions - assert (4, 1) == (4, 0)
      ;; test_resolution - h3._cy.error_system.H3Failed
      #:test-flags #~(list "-k" (string-append
                                 "not test_versions"
                                 " and not test_resolution"))
      #:phases
      #~(modify-phases %standard-phases
          ;; Use packaged in Guix h3 source.
@@ -381,10 +357,7 @@ subdivisions.")
           python-cython
           python-numpy
           python-pytest
-           python-scikit-build
+           python-scikit-build-core))
           python-setuptools
           python-setuptools-scm
           python-wheel))
    (inputs (list h3))
    (home-page "https://uber.github.io/h3-py")
    (synopsis "Python bindings for H3")
@@ -392,26 +365,6 @@ subdivisions.")
 hierarchical hexagonal geospatial indexing system")
    (license license:asl2.0)))
 ;; For python-timezonefinder, remove it when it starts supporting newer
 ;; version.
 (define-public python-h3-3
  (package
    (inherit python-h3)
    (name "python-h3")
    (version "3.7.6")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/uber/h3-py")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "16gxa1sivghxw179rik87r918mjasars2qkzidlwq83qfa4axn20"))))
    (inputs
     (modify-inputs inputs
       (replace "h3" h3-3)))))
 (define-public geos
  (package
    (name "geos")
@@ -425,29 +378,14 @@ hierarchical hexagonal geospatial indexing system")
               (base32
                "00qdk9a4048pzfj2rhzkfw3lvm642znf6kr4x29i3d94494pxsnn"))))
    (build-system cmake-build-system)
-    (arguments
+    (arguments `(#:phases
-     `(#:phases
+                 (modify-phases %standard-phases
-       (modify-phases %standard-phases
+                   (add-after
-         ,@(if (or (target-x86-32?) (target-arm32?))
+                    'unpack 'patch-test-shebangs
-               '((add-after 'unpack 'disable-broken-tests
+                    (lambda _
-                   (lambda _
+                      (substitute* '("tests/xmltester/testrunner.sh"
-                     ;; This test fails due to limited accuracy.
+                                     "tests/xmltester/safe_to_xml.sh")
-                     (delete-file "tests/xmltester/tests/general/TestCentroid.xml")
+                        (("/bin/sh") (which "sh"))))))))
                     (with-directory-excursion "tests/unit"
                       ;; These also fail due to limited accuracy.
                       (delete-file "algorithm/MinimumAreaRectangleTest.cpp")
                       (delete-file "capi/GEOSMinimumRotatedRectangleTest.cpp")
                       ;; It is unclear why these fail, but I'm guessing:
                       ;; limited accuracy.
                       (delete-file "linearref/LengthIndexedLineTest.cpp")
                       (delete-file "math/DDTest.cpp")))))
               '())
         (add-after
             'unpack 'patch-test-shebangs
           (lambda _
             (substitute* '("tests/xmltester/testrunner.sh"
                            "tests/xmltester/safe_to_xml.sh")
               (("/bin/sh") (which "sh"))))))))
    (inputs
     (list glib))
    (home-page "https://libgeos.org/")
@@ -970,29 +908,6 @@ hydrology and waste deposition.")
        (base32
         "03r6mspfv22fs4x4jcgv25v9gsj5k6zy8incvyf94qf50g47s2bc"))))
    (build-system cmake-build-system)
    (arguments
     (if (target-32bit?)
         (list
          #:phases
          '(modify-phases %standard-phases
             (add-after 'unpack 'patch-tests
               (lambda _
                 ;; These regression tests fail due to accuracy problems.
                 (substitute* "test/unit/test_factory.cpp"
                   (("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
                    (string-append m "\nGTEST_SKIP();\n")))
                 (substitute* "test/unit/test_grids.cpp"
                   (("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
                    (string-append m "\nGTEST_SKIP();\n")))
                 (substitute* "test/unit/test_defmodel.cpp"
                   (("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
                    (string-append m "\nGTEST_SKIP();\n")))
                 ;; These regression tests fail due to accuracy problems.
                 (substitute* "test/CMakeLists.txt"
                   (("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
                   (("proj_add_gie_test\\(\"Builtins\".+") "")
                   (("proj_add_gie_test\\(\"peirce_q\".+") ""))))))
         '()))
    (native-inputs (list googletest pkg-config))
    (propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc
    (home-page "https://proj.org/")
@@ -1022,34 +937,7 @@ lets developers use the functionality of Proj in their own software.")
                           version ".tar.gz"))
       (sha256
        (base32
-         "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))
+         "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))))
    (arguments
     (if (target-32bit?)
         (list
          #:phases
          '(modify-phases %standard-phases
             (add-after 'unpack 'patch-tests
               (lambda _
                 ;; These regression tests fail due to accuracy problems.
                 (substitute* "test/unit/test_factory.cpp"
                   (("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
                    (string-append m "\nGTEST_SKIP();\n")))
                 (substitute* "test/unit/test_grids.cpp"
                   (("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
                    (string-append m "\nGTEST_SKIP();\n")))
                 (substitute* "test/unit/test_defmodel.cpp"
                   (("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
                    (string-append m "\nGTEST_SKIP();\n")))
                 ;; These regression tests fail due to accuracy problems.
                 (substitute* "test/CMakeLists.txt"
                   (("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
                   (("proj_add_gie_test\\(\"Builtins\".+") "")
                   (("proj_add_gie_test\\(\"peirce_q\".+") "")
                   (("proj_add_gie_test\\(\"adams_ws2\".+") ""))
                 (substitute* "test/cli/CMakeLists.txt"
                   (("proj_add_test_script_sh\\(\"testvarious\" CS2CS_BIN\\)") ""))))))
         '()))))
 (define-public python-obspy
  (package
@@ -1124,7 +1012,6 @@ for seismology.")
    (inputs (list gdal))
    (native-inputs (list python-cython
                         python-pytest
                         python-pytest-cov
                         python-setuptools
                         python-tomli
                         python-versioneer
@@ -1224,7 +1111,7 @@ projections and coordinate transformations library.")
 (define-public python-fiona
  (package
    (name "python-fiona")
-    (version "1.9.6")
+    (version "1.10.1")
    (source
     (origin
       (method git-fetch)
@@ -1233,24 +1120,38 @@ projections and coordinate transformations library.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "08whhjrspp194qasjhr9kf70fl342ms47k78rwpcf5q6ikf0rfii"))))
+        (base32 "0xribbcy5wvrm5y3bq281dry86vhjcnphg9772yp9s3y30y7mlz4"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      ;; tests: 757 passed, 161 skipped, 24 deselected, 1 xfailed, 6 xpassed
      #:test-flags
      #~(list "-m" "not network and not wheel"
-              ;; FIXME: Find why the
+              #$@(map (lambda (test) (string-append "--deselect=tests/" test))
-              ;; test_no_append_driver_cannot_append[PCIDSK] test is failing.
+                      ;; UserWarning: The parameter --where is used more than
-              "-k" "not test_no_append_driver_cannot_append")
+                      ;; once. Remove its duplicate as parameters should be
                      ;; unique.
                      (list "test_fio_cat.py::test_bbox_json_yes"
                            "test_fio_cat.py::test_bbox_no"
                            "test_fio_cat.py::test_bbox_where"
                            "test_fio_cat.py::test_bbox_yes"
                            "test_fio_cat.py::test_bbox_yes_two_files"
                            "test_fio_cat.py::test_dst_crs_epsg3857"
                            "test_fio_cat.py::test_multi_layer"
                            "test_fio_cat.py::test_one"
                            "test_fio_cat.py::test_two"
                            "test_fio_cat.py::test_vfs"
                            "test_fio_cat.py::test_where_no"
                            "test_fio_cat.py::test_where_yes"
                            "test_fio_cat.py::test_where_yes_two_files"
                            ;; FileNotFoundError:
                            ;; https://github.com/Toblerity/Fiona/files/\
                            ;; 11151652/coutwildrnp.zip
                            "test_pyopener.py::test_opener_fsspec_zip_http_fs")))
      #:phases
      #~(modify-phases %standard-phases
-          (add-before 'build 'set-configure-flags
+          (add-before 'check 'remove-local-source
            (lambda _
              (setenv "CFLAGS" "-Wno-error=incompatible-pointer-types")))
          (add-before 'check 'remove-local-fiona
            (lambda _
              ;; This would otherwise interfere with finding the installed
              ;; fiona when running tests.
              (delete-file-recursively "fiona"))))))
    (inputs
     (list gdal))
@@ -1258,19 +1159,19 @@ projections and coordinate transformations library.")
     (list python-attrs
           python-certifi
           python-click
-           python-click-plugins-1
+           python-click-plugins
           python-cligj))
    (native-inputs
     (list gdal ; for gdal-config
           python-boto3
           python-cython
           python-fsspec
           python-pytest
           python-pytest-cov
           python-pytz
-           python-setuptools))
+           python-setuptools
           python-shapely))
    (home-page "https://github.com/Toblerity/Fiona")
-    (synopsis
+    (synopsis "Fiona reads and writes spatial data files")
     "Fiona reads and writes spatial data files")
    (description
     "Fiona is GDAL’s neat and nimble vector API for Python programmers. Fiona
 is designed to be simple and dependable.  It focuses on reading and writing
@@ -1284,23 +1185,20 @@ readily with other Python GIS packages such as pyproj, Rtree, and Shapely.")
 (define-public python-geopack
  (package
    (name "python-geopack")
-    (version "1.0.12")
+    (version "1.0.10")
    (source
     (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "geopack" version))
              (url "https://github.com/tsssss/geopack")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0ap5j4359xxjkbz06y097yq5d37sxcwlnlsfwrv6dvza7ydmgcgg"))))
+        (base32 "0mryjp7m4h99qlpvnn40s81sygr73qcv8rkmjp9pcli1gz829kjf"))))
    (build-system pyproject-build-system)
    (arguments
     (list
      ;; XXX Reported upstream <https://github.com/tsssss/geopack/issues/21>.
      #:tests? #f))
    (native-inputs
-     (list python-setuptools))
+     (list python-pytest python-setuptools python-wheel))
    (propagated-inputs
     (list python-numpy python-scipy))
    (home-page "https://github.com/tsssss/geopack")
@@ -1533,7 +1431,6 @@ street bearings/orientations, and speed/travel time.")
           python-pyproj
           python-pyyaml
           python-pytest
           python-pytest-cov
           python-pytest-httpserver
           python-pytz
           python-requests
@@ -1865,10 +1762,7 @@ utilities for data translation and processing.")
      ;; This test requires internet access.
      '(list "--deselect" "test_shapefile.py::test_reader_url")))
    (native-inputs
-     (list python-pytest
+     (list python-pytest python-setuptools python-wheel))
           python-pytest-runner
           python-setuptools
           python-wheel))
    (home-page "https://github.com/GeospatialPython/pyshp")
    (synopsis "Read/write support for ESRI Shapefile format")
    (description
@@ -3598,10 +3492,9 @@ orienteering sport.")
       (list
        #:tests? #f                    ; No tests
        #:modules `((guix build gnu-build-system)
-                    ((guix build python-build-system) #:prefix python:)
+                    ((guix build pyproject-build-system) #:prefix python:)
                    (guix build utils))
-        #:imported-modules `(,@%default-gnu-imported-modules
+        #:imported-modules %pyproject-build-system-modules
                             (guix build python-build-system))
        #:configure-flags
        #~(list "--with-blas"
                "--with-bzlib"
@@ -3773,13 +3666,13 @@ growing set of geoscientific methods.")
    (build-system cmake-build-system)
    (arguments
     (list
      #:imported-modules (append %cmake-build-system-modules
                                 %pyproject-build-system-modules
                                 '((guix build qt-utils)))
      #:modules '((guix build cmake-build-system)
-                  ((guix build python-build-system) #:prefix python:)
+                  ((guix build pyproject-build-system) #:prefix py:)
                  (guix build qt-utils)
                  (guix build utils))
      #:imported-modules `(,@%cmake-build-system-modules
                           (guix build python-build-system)
                           (guix build qt-utils))
      #:configure-flags
      #~(list "-DWITH_QTWEBKIT=NO")
      #:phases
@@ -3940,11 +3833,10 @@ growing set of geoscientific methods.")
            ;; Configure correct path to PyQt5 SIP directory
            (add-after 'unpack 'configure-pyqt5-sip-path
              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((sip-dir (string-append
+                (let* ((pyqt (assoc-ref inputs "python-pyqt+qscintilla"))
-                                (assoc-ref inputs "python-pyqt+qscintilla")
+                       (sip-dir (string-append
-                                "/lib/python"
+                                 (py:site-packages inputs `(("out" . ,pyqt)))
-                                (python:python-version (assoc-ref inputs "python"))
+                                 "/PyQt5/bindings")))
                                "/site-packages/PyQt5/bindings")))
                  (substitute* "cmake/FindPyQt5.py"
                    (("sip_dir = cfg.default_sip_dir")
                     (string-append "sip_dir = \"" sip-dir "\"")))
@@ -3974,7 +3866,7 @@ SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)")
                              "-E" (string-join ignored-tests "|")))
                    (format #t "test suite not run~%"))))
            (add-after 'install 'wrap-python
-              (assoc-ref python:%standard-phases 'wrap))
+              (assoc-ref py:%standard-phases 'wrap))
            (add-after 'wrap-python 'wrap-qt
              (lambda* (#:key inputs #:allow-other-keys)
                (wrap-qt-program "qgis" #:output #$output #:inputs inputs)))
@@ -476,17 +476,31 @@ inverse fourier transform.")
  (package
    (name "libmypaint")
    (version "1.6.1")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (string-append "https://github.com/mypaint/libmypaint/"
+       (method git-fetch)
-                                  "releases/download/v" version "/libmypaint-"
+       (uri (git-reference
-                                  version ".tar.xz"))
+              (url "https://github.com/mypaint/libmypaint")
-              (sha256
+              (commit (string-append "v" version))))
-               (base32
+       (file-name (git-file-name name version))
-                "0priwpmc7dizccqvn21ig6d649bprl3xl1hmjj7nddznjgr585vl"))))
+       (sha256
        (base32 "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178"))))
    (build-system gnu-build-system)
    (arguments
     (list
      #:phases
      #~(modify-phases %standard-phases
          (add-before 'bootstrap 'overwrite-automake-and-aclocal-versions
            (lambda _
              (setenv "AUTOMAKE" "automake")
              (setenv "ACLOCAL" "aclocal"))))))
    (native-inputs
-     (list intltool pkg-config))
+     (list autoconf
           automake
           intltool
           libtool
           pkg-config
           python))
    ;; As needed by 'libmypaint.pc'.
    (propagated-inputs
     (list json-c gobject-introspection))
@@ -498,6 +512,26 @@ brushstrokes which is used by MyPaint and GIMP.")
    (home-page "http://mypaint.org")
    (license license:isc)))
 ;; To update mypaint, remove when a fresh version is released.
 (define-public libmypaint-next
  (package
    (inherit libmypaint)
    (name "libmypaint")
    (properties '((commit . "551dfb9ca5d2b82f2361a5a8a9e7f386f35fd320")
                  (revision . "0")))
    (version (git-version "1.6.1"
                          (assoc-ref properties 'revision)
                          (assoc-ref properties 'commit)))
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/mypaint/libmypaint")
              (commit (assoc-ref properties 'commit))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "0pl8cma6gfkrqx364fs1xw7f491f7y6pzxqjq1cdqlrf9r8gg0sk"))))))
 (define-public mypaint-brushes
  (package
    (name "mypaint-brushes")
@@ -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,44 @@
 ;;; 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 build-system gnu)
-  #:use-module (guix deprecation))
+  #:use-module (guix download)
  #:use-module (guix gexp)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix utils)
  #: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
+(define-public gkrellm
-  (@ (guix packages monitoring) gkrellm))
+  (package
    (name "gkrellm")
    (version "2.5.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://gkrellm.srcbox.net/releases/gkrellm-"
                           version ".tar.bz2"))
       (sha256
        (base32 "0qvy2xmwmfy5f0g09yn9lr262shnx82ba04r5il2wj4qscg3r7h8"))))
    (build-system gnu-build-system)
    (inputs (list gtk+-2 libsm))
    (native-inputs (list gettext-minimal pkg-config))
    (arguments
     (list
      #:tests? #f ;there is no check target
      #:phases
      #~(modify-phases %standard-phases
          (delete 'configure)) ;no configure script
      #:make-flags
      #~(list (string-append "INSTALLROOT=" #$output)
              (string-append "CC=" #$(cc-for-target)))))
    (home-page "https://gkrellm.srcbox.net/")
    (synopsis "System monitors")
    (description
     "GKrellM is a single process stack of system monitors which supports
 applying themes to match its appearance to your window manager, Gtk, or any
 other theme.")
    (license license:gpl3+)))
@@ -79,7 +79,6 @@
  #:use-module (guix build-system cargo)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
@@ -1420,8 +1419,8 @@ original glmark benchmark by Ben Smith.")
    (license license:bsd-2)))
 (define-public piglit
-  (let ((revision "1")
+  (let ((revision "2")
-        (commit "814046fe6942eac660ee4a6cc5fcc54011a49945"))
+        (commit "040ed91f234abb6a502d3a6910f1b0e54bd239a7"))
    (package
     (name "piglit")
     (version (git-version "0.0.0" revision commit))
@@ -1432,7 +1431,7 @@ original glmark benchmark by Ben Smith.")
                    (commit commit)))
              (file-name (git-file-name name version))
              (sha256
-               (base32 "1bzaalcxskckfnwprw77sbbmfqi59by2j8imaq8ghnlzhlxv7mk7"))))
+               (base32 "1j5dmkym1mmz410xgwygimnjk2aswsqmcpjwz4s98pgmymh1yjvf"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DPIGLIT_SSE2=OFF")
@@ -1451,16 +1450,21 @@ original glmark benchmark by Ben Smith.")
                                      "'")))))
                (add-after 'install 'wrap
                  (lambda* (#:key outputs #:allow-other-keys)
-                    (wrap-script (string-append (assoc-ref outputs "out")
+                    (wrap-script (string-append #$output "/bin/piglit")
                                                "/bin/piglit")
                      `("GUIX_PYTHONPATH" prefix
                        (,(getenv "GUIX_PYTHONPATH")))))))))
-     (inputs (list guile-3.0            ; for wrap-script
+     (inputs (list glslang
                   guile-3.0            ; for wrap-script
                   libxkbcommon
-                   python python-lxml python-mako python-numpy-1
+                   python
-                   glslang vulkan-headers vulkan-loader
+                   wayland-protocols
                   vulkan-headers
                   vulkan-loader
                   waffle))
-     (native-inputs (list pkg-config))
+     (native-inputs (list pkg-config
                          python-lxml
                          python-mako
                          python-numpy))
     (home-page "https://piglit.freedesktop.org/")
     (synopsis "Test OpenGL implementations")
     (description "Piglit is a collection of automated tests for OpenGL and
@@ -51,7 +51,6 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
  #:use-module (guix packages)
@@ -1335,74 +1334,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"))
@@ -250,7 +250,6 @@
  #: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 trivial)
  #:use-module ((guix config) #:select (%storedir))
  #:use-module (guix deprecation)
@@ -2759,7 +2758,7 @@ schemas for settings shared by various components of the GNOME desktop.")
                (invoke "./run-tests")))))))
    (native-inputs (list python-pytest python-setuptools xorg-server-for-tests))
    (inputs (list gtk+))
-    (propagated-inputs (list python-pygobject))
+    (propagated-inputs (list python-pygobject-3.50))
    (home-page "https://getting-things-gnome.github.io/liblarch")
    (synopsis "Library to easily handle complex data structures")
    (description
@@ -2818,7 +2817,7 @@ and how they are displayed (View).")
           gtksourceview-4
           pango
           python
-           python-dbus-1.2
+           python-dbus
           python-liblarch
           python-lxml
           python-pycairo
@@ -2986,7 +2985,7 @@ guidelines.")
           python
           cups
           gtk+
-           python-dbus-1.2
+           python-dbus
           python-pygobject
           python-pycups
           python-requests
@@ -5000,6 +4999,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
    (arguments
     (list
      #:configure-flags #~(list "-Ddocs=disabled")
      #:parallel-tests? #f              ;hsts-db-test might hang otherwise.
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'adjust-tests
@@ -5041,7 +5041,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
           zlib))
    (inputs
     (list samba/pinned))               ; For ntlm_auth support
-    (home-page "https://wiki.gnome.org/Projects/libsoup")
+    (home-page "https://libsoup.gnome.org")
    (synopsis "GLib-based HTTP Library")
    (description
     "LibSoup is an HTTP client/server library for GNOME.  It uses GObjects
@@ -5157,7 +5157,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
           libxslt
           pkg-config
           python
-           python-dbus-1.2
+           python-dbus
           python-pygobject-3.50
           vala))
    (propagated-inputs
@@ -8158,12 +8158,6 @@ to display dialog boxes from the commandline and shell scripts.")
    (build-system meson-build-system)
    (arguments
     (list
      #:modules '((guix build meson-build-system)
                  ((guix build python-build-system) #:prefix python:)
                  (guix build utils)
                  (ice-9 match))
      #:imported-modules `(,@%meson-build-system-modules
                           (guix build python-build-system))
      #:glib-or-gtk? #t
      #:configure-flags
      #~(list
@@ -8686,7 +8680,7 @@ users.")
           libxslt
           perl
           pkg-config
-           python-dbus-1.2
+           python-dbus
           python-pygobject-3.50
           python-wrapper
           vala))
@@ -10628,6 +10622,7 @@ playing media, scanning, and much more.")
           cheese
           decibels
           epiphany
           evince
           file-roller
           gnome-calculator
           gnome-calendar
@@ -10647,7 +10642,6 @@ playing media, scanning, and much more.")
           localsearch
           loupe
           nautilus
           papers
           simple-scan
           showtime
           xdg-desktop-portal-gnome
@@ -10674,7 +10668,6 @@ playing media, scanning, and much more.")
                            system-config-printer
                            xdg-desktop-portal
                            xdg-user-dirs
                            xdg-user-dirs-gtk
                            yelp
                            zenity))
   (description "This package provides a list of packages required for
@@ -11576,8 +11569,7 @@ accessibility infrastructure.")
                    name "-" version ".tar.xz"))
              (sha256
               (base32
-                "0sfs06f66dsibvnp87jshhs7n3f8shkn9x7j3ygpk8409za2n2xy"))
+                "0sfs06f66dsibvnp87jshhs7n3f8shkn9x7j3ygpk8409za2n2xy"))))
              (patches (search-patches "orca-fix-gst-init-check-call.patch"))))
    (build-system meson-build-system)
    (arguments
     '(#:glib-or-gtk? #t
@@ -11595,7 +11587,10 @@ accessibility infrastructure.")
                   (pgrep (string-append
                           (assoc-ref inputs "procps") "/bin/pgrep")))
               (substitute* "src/orca/orca_modifier_manager.py"
-                 (("\"xkbcomp\"") (format #f "'~a'" xkbcomp)))
+                 (("'xkbcomp'") (format #f "'~a'" xkbcomp)))
               (substitute* "src/orca/debug.py"
                 (("'pgrep %s'")
                  (format #f "'~a %s'" pgrep)))
               (substitute* "src/orca/orca_bin.py.in"
                 (("'pgrep -u %s -x orca'")
                  (format #f "'~a -u %s -x orca'" pgrep))))))
@@ -11626,7 +11621,6 @@ accessibility infrastructure.")
           `(,liblouis "python")
           procps                       ; for pgrep
           python
           python-dbus
           python-pygobject-3.50
           python-pyatspi
           speech-dispatcher
@@ -12337,7 +12331,6 @@ advanced image management tool")
           intltool
           pkg-config
           python-psutil
           python-pytest-runner
           python-pytest))
    (inputs
     (list bash-minimal ;for wrap-program
@@ -12346,7 +12339,7 @@ advanced image management tool")
           gsettings-desktop-schemas
           gtk+
           python-wrapper
-           python-dbus-1.2
+           python-dbus
           python-notify2
           python-pycairo
           python-pygobject
@@ -26,7 +26,6 @@
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
 ;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -87,7 +86,6 @@
  #: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)
@@ -972,8 +970,10 @@ passphrase when @code{gpg} is run and needs it.")))
           (lambda _
             (invoke "sh" "autogen.sh"))))))
    (native-inputs
-     (modify-inputs native-inputs
+     `(("autoconf" ,autoconf)
-       (prepend autoconf automake gettext-minimal)))
+       ("automake" ,automake)
       ("gettext" ,gettext-minimal)
       ,@(package-native-inputs pinentry-tty)))
    (inputs
     (modify-inputs inputs
       (prepend efl)))
--- a/Show More
+++ b/Show More