docs: Update release signing key.

The release artifacts are now signed by Efraim, not Ludo. * doc/guix-cookbook.texi: Switch gpg url to codeberg, mention Efraim's key. * doc/guix.texi: Likewise. Change-Id: Iae667796b6978cdd4a44f73990da7b9599ab509c Fixes: #5946 Signed-off-by: Rutherther <rutherther@ditigal.xyz> Merges: #6213
gnu: guix: Update to 1.5.0.
2026-07-10 21:14:06 +02:00 · 2026-04-29 11:31:02 +02:00 · 2026-01-21 18:33:35 +01:00 · 2026-01-21 17:33:14 +01:00 · 2026-01-21 15:23:59 +01:00 · 2026-01-21 14:23:26 +01:00
212 changed files with 191415 additions and 28226 deletions
@@ -129,7 +129,7 @@ guix/build/gnu-build-system\.scm                   @guix/core-packages
 guix/build/utils\.scm                              @guix/core-packages
 guix/build-system/gnu\.scm                         @guix/core-packages

-gnu/packages/(.*-|)crypto\.scm$                    @guix/crypto
+gnu/packages/crypto\.scm                           @guix/crypto
 gnu/packages/gnupg\.scm                            @guix/crypto
 gnu/packages/nettle\.scm                           @guix/crypto
 gnu/packages/password-utils\.scm                   @guix/crypto
@@ -376,6 +376,7 @@ MODULES =					\
  guix/scripts/import/luanti.scm  		\
  guix/scripts/import/minetest.scm  		\
  guix/scripts/import/npm-binary.scm		\
+  guix/scripts/import/nuget.scm  		\
  guix/scripts/import/opam.scm			\
  guix/scripts/import/pypi.scm			\
  guix/scripts/import/stackage.scm		\
@@ -505,7 +506,8 @@ EXAMPLES =					\
  gnu/system/examples/plasma.tmpl		\
  gnu/system/examples/raspberry-pi-64.tmpl	\
  gnu/system/examples/raspberry-pi-64-nfs-root.tmpl	\
-  gnu/system/examples/vm-image.tmpl
+  gnu/system/examples/vm-image.tmpl		\
+  gnu/system/examples/vm-image-efi.tmpl

 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)

@@ -747,7 +749,7 @@ dist_fishcompletion_DATA = etc/completion/fish/guix.fish
 nodist_selinux_policy_DATA = etc/guix-daemon.cil

 # AppArmor profiles.
-nodist_apparmor_profile_DATA =	\
+dist_apparmor_profile_DATA =	\
  etc/apparmor.d/guix		\
  etc/apparmor.d/guix-daemon

@@ -771,9 +773,12 @@ EXTRA_DIST +=						\
  build-aux/compile-as-derivation.scm			\
  build-aux/config.rpath				\
  build-aux/convert-xref.scm				\
+  build-aux/cuirass/evaluate.scm			\
  build-aux/extract-syscall-ranges.sh			\
  build-aux/generate-authors.scm			\
+  build-aux/gitlog-to-changelog				\
  build-aux/git-version-gen				\
+  build-aux/keep-only-translated.scm			\
  build-aux/mdate-from-git.scm				\
  build-aux/test-driver.scm				\
  build-aux/update-NEWS.scm				\
@@ -1185,7 +1190,7 @@ release: all
 	$(MKDIR_P) "$(releasedir)"
 	@echo "Building guix inferior for current commit."
 	COMMIT="$$(git rev-parse HEAD)" &&					\
-	GUIX="$$(guix time-machine --commit=$$COMMIT)/bin/guix" &&		\
+	GUIX="$$(guix time-machine -q --commit=$$COMMIT)/bin/guix" &&		\
 	echo "Building artifacts for current commit: $$COMMIT." &&		\
 	ARTIFACTS="$$($$GUIX build --no-grafts					\
 		-f ./etc/teams/release/artifacts.scm)" &&			\
@@ -6,6 +6,7 @@ Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
 Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
 Copyright © 2021, 2022, 2024 Maxim Cournoyer <maxim@guixotic.coop>
 Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
+Copyright © 2026 Noé Lopez <noelopez@free.fr>

  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright
@@ -16,8 +17,77 @@ Please send Guix bug reports to bug-guix@gnu.org.
 * Changes in 1.5.0 (since 1.4.0)
 ** Package management
 *** New ‘rpm’ format for the ‘guix pack’ command
+*** New ‘appimage’ format for the ‘guix pack’ command
+*** New ‘--max-layers’ and ‘--file’ options for the ‘guix pack’ command
+*** New ‘--roll-back’ and ‘--expression’ options for the ‘guix deploy’ command
+*** New ‘--with-version’ package transformation option
+*** New ‘--with-configure-flag’ package transformation option
+*** New ‘--nesting’ option to use Guix within ‘guix shell’ containers
+*** New ‘--emulate-fhs’ option for ‘guix shell’ containers
+*** New ‘--dependents’ and ‘--development’ options for ‘guix build’
+*** New ‘--interactive’ and ‘--list-types’ flags for ‘guix repl’
+*** The root file-system of ‘guix shell’ containers is now read-only
+*** New ‘--writable-root’ option for the ‘guix shell’ command
+*** Improved style rules for ‘guix style’
+*** New ‘guix locate’ command
+*** ‘guix refresh’ now honours the ‘--key-server’ option
+*** ‘guix git authenticate‘ now remembers introduction commit and signer
+*** ‘guix git authenticate’ now installs pre-push and post-merge git hooks
+*** System reconfiguration now supports kexec for fast reboot
+*** Hetzner Cloud is now supported by the ‘guix deploy’ command
+*** The Guix Daemon can now be run without root privileges
+*** ‘guix refresh’ can now target partial version
+*** New ‘guix import composer’ command
+*** New ‘guix import binary-npm’ command
+*** New ‘guix import nuget’ command
+*** New ‘graphml’ backend for guix graph
+*** New ‘cyclonedx-json’ backend for guix graph
+*** AppArmor profiles are now available for guix and guix-daemon
 ** Distribution
 *** ‘nss-certs’ is now included in ‘%base-packages’
+*** ‘udev-service-type’ now supports hardware configuration files
+*** ‘gdm-service-type’ now uses Wayland by default
+*** KDE Plasma 6.5 is now available with the new ‘plasma-desktop-service-type’
+*** GNOME was updated to version 44 with a more modular desktop service
+*** Declarative offloading with new ‘build-machines’ field of operating-system
+*** ‘containerd-service-type’ is no longer included with the Docker service
+*** ‘privileged-programs’ replaces ‘setuid-programs’ in ‘operating-system’
+*** The ‘postgresql’ field of ‘postgresql-configuration‘ is now mandatory
+*** The Rottlog service was replaced by new ‘log-rotation-service-type’
+*** The default system log has been changed to Shepherd’s ‘system-log’ service
+*** New recommended ‘%base-home-services’ variable for Guix Home
+*** UDisks now mounts removable devices in /run/media/$USER instead of /media
+*** Syncthing service received incompatible changes
+*** ‘node-build-system’ received incompatible changes
+*** New services for /etc/profile.d and /etc/bashrc.d
+*** New build system for clasp-cl
+*** New Rust packaging model
+*** C.utf8 locale is now supported by glibc
+*** Fully bootstrapped mono and zig are now available
+*** 64bit Hurd (x86_64-gnu) now has experimental support
+*** 12525 new packages
+*** 8911 package updates
+
+Noteworthy updates:
+bash 5.2.37, binutils 2.44, clojure 1.12.0, cups 2.4.14, emacs 30.2,
+gcc-toolchain 15.2.0, gdb 16.3, ghc 9.2.8, gimp 3.0.4, glibc 2.41,
+gnome 46.10, gnupg 2.4.7, go 1.25.3, guile 3.0.9, icecat 140.6.0-gnu1,
+icedtea 3.19.0, inkscape 1.3.2, julia 1.8.5, libreoffice 25.2.5.2,
+linux-libre 6.17.12, lxde 0.99.3, mate 1.28.2, ocaml 5.3.0, octave 10.3.0,
+openjdk 25, perl 5.36.0, python 3.11.14, racket 8.18, rust 1.85.1, r 4.5.2,
+sbcl 2.5.8, shepherd 1.0.9, xfce 4.20.0, xorg-server 21.1.21
+
+** Programming interfaces
+*** ‘(gnu system setuid)’ has been renamed to ‘(gnu system privilege)’
+*** Moved to a new Rust packaging model and repackaged all Rust applications
+*** Rust library packages have been moved to the guix-rust-past-crates channel
+*** Most Python packages now use the ‘pyproject-build-system’
+** Noteworthy bug fixes
+*** Daemon vulnerability allowing store corruption has been fixed
+*** Daemon vulnerability allowing takeover of build users has been fixed
+*** Daemon privilege escalation vulnerabilities fixed
+*** Daemon CVEs have been fixed
+CVE-2024-27297, CVE-2024-52867, CVE-2025-46415, CVE-2025-46416, CVE-2025-59378
 * Changes in 1.4.0 (since 1.3.0)
 ** Package management
 *** New ‘guix home’ command, for home environment management
@@ -1926,7 +1996,7 @@ zynaddsubfx@3.0.3, zziplib@0.13.69
 *** ‘guix pack’ now honors package transformation options
 *** ‘guix package --search’ no longer shows superseded packages
    (<https://bugs.gnu.org/30566>)
-*** ‘guix offload test’ reports errors more nicely 
+*** ‘guix offload test’ reports errors more nicely
    (<https://bugs.gnu.org/28057>)
 *** postgresql service is started through ‘pg_ctl’
    (<https://bugs.gnu.org/29992>)
@@ -5664,7 +5734,7 @@ Monad” in the manual.

 *** X session is executed from a login shell (<http://bugs.gnu.org/19119>)
 *** grub.cfg is now a garbage-collector root (<http://bugs.gnu.org/19160>)
-*** Substituter progress report properly formatted 
+*** Substituter progress report properly formatted
    (<http://bugs.gnu.org/19313>)
 *** Document permissions for /gnu/store (<http://bugs.gnu.org/19316>)
 *** Make sure config.go is newer than config.scm
@@ -5920,18 +5990,18 @@ This could cause problems with ancient Linux kernel.
 *** download: Use the 'SERVER NAME' TLS extension when possible
    (<http://bugs.gnu.org/18526>)
 *** libdaemon: Add alternate source URLs (<http://bugs.gnu.org/18639>)
-*** icu4c: Reinstate RUNPATH on shared libraries 
+*** icu4c: Reinstate RUNPATH on shared libraries
    (<http://bugs.gnu.org/18695>)
 *** nss-mdns: Add alternate source URLs (<http://bugs.gnu.org/18704>)
 *** download: Add "Accept: */*" to the HTTP headers
    (<http://bugs.gnu.org/18768>)
-*** guix-register: Do not attempt to create NIX_STORE_DIR 
+*** guix-register: Do not attempt to create NIX_STORE_DIR
    (<http://bugs.gnu.org/18689>)
 *** Allow Linux-libre to find our 'modprobe' command
    (<http://bugs.gnu.org/18525>)
 *** man-pages: Build sequentially (<http://bugs.gnu.org/18701>)
 *** Fix intermittent test failures involving GC (<http://bugs.gnu.org/18935>)
-*** guix import: pypi: Gracefully handle non-existent packages 
+*** guix import: pypi: Gracefully handle non-existent packages
    (<http://bugs.gnu.org/18831>)
 *** Make sure the shared library has the '.so' extension
    (<http://bugs.gnu.org/18521>)
@@ -198,6 +198,12 @@ if test "x$have_guile_lzlib" != "xyes"; then
  AC_MSG_ERROR([Guile-lzlib is missing; please install it.])
 fi

+dnl Check for Guile-semver.
+GUILE_MODULE_AVAILABLE([have_guile_semver], [(semver)])
+if test "x$have_guile_semver" != "xyes"; then
+  AC_MSG_ERROR([Guile-semver is missing; please install it.])
+fi
+
 dnl Check for Guile-Avahi.
 GUILE_MODULE_AVAILABLE([have_guile_avahi], [(avahi)])
 AM_CONDITIONAL([HAVE_GUILE_AVAHI],
@@ -82,7 +82,7 @@

 (define %latest-guix-version
  ;; Latest released version.
-  "1.4.0")
+  "1.5.0")

 (define (texinfo-manual-images source)
  "Return a directory containing all the images used by the user manual, taken
@@ -777,7 +777,8 @@ in SOURCE."
              (define version-links
                (list (menu-item #$latest-version
                                 (string-append
-                                  "/manual/" language
+                                  "/manual/" #$latest-version
+                                  "/" language
                                  (if split-node? "/html_node" "")))
                      (menu-item "development"
                                 (string-append
@@ -942,7 +943,8 @@ makeinfo OPTIONS."
                      (let* ((texi (language->texi-file-name language))
                             (opts `("--html"
                                     "-c" ,(string-append "TOP_NODE_UP_URL=/manual/"
-                                                         language)
+                                                          #$%latest-guix-version
+                                                          "/" language)
                                     #$@options
                                     ,texi)))
                        (format #t "building HTML manual for language '~a'...~%"
@@ -134,14 +134,11 @@ C++11 standard.
@section Building from Git

 If you want to hack Guix itself, it is recommended to use the latest
-version from the Git repository@footnote{
-Guix uses @code{master} as the default branch name. A proposal in 2025 to
-change the default branch name to @code{main} did not reach consensus.
-See @uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/003-rename-default-branch.md,
-Guix Consensus Document 003}.}:
+version from the Git repository:

@example
 git clone https://git.guix.gnu.org/guix.git
+cd guix
@end example

@cindex authentication, of a Guix checkout
@@ -181,6 +178,7 @@ guix shell -D guix -CPW
 or even, from within a Git worktree for Guix:

@example
+echo $(pwd) >> ~/.config/guix/shell-authorized-directories
 guix shell -CPW
@end example

@@ -188,6 +186,10 @@ If @option{-C} (short for @option{--container}) is not supported on your
 system, try @command{--pure} instead of @option{-CPW}.
@xref{Invoking guix shell}, for more information on that command.

+Most of the test suite runs without an internet connection. The @option{-N}
+(short for @option{--network}) can be added to the @code{guix shell} command
+to run the tests that require internet access.
+
 If you are unable to use Guix when building Guix from a checkout, the
 following are the required packages in addition to those mentioned in the
 installation instructions (@pxref{Requirements}).
@@ -201,11 +203,11 @@ installation instructions (@pxref{Requirements}).
@item @url{https://www.gnu.org/software/help2man/, GNU Help2man (optional)}.
@end itemize

-On Guix, extra dependencies can be added by instead running @command{guix
-shell}:
+On Guix, other development tools, like @code{strace}, can be included by
+giving them as extra arguments to @command{guix shell}:

@example
-guix shell -D guix help2man git strace --pure
+guix shell -D guix -CPW strace
@end example

 From there you can generate the build system infrastructure
@@ -1734,8 +1734,8 @@ At this stage, the package @code{cargo-audit} is buildable.

@item
 Finally we'll unbundle the vendored dependencies.  The lockfile importer
-inserts @code{TODO:} comments for libraries with high probability of
-bundled dependencies.  @code{cargo-build-system} also performs
+inserts @code{TODO REVIEW:} comments for libraries with high probability
+of bundled dependencies.  @code{cargo-build-system} also performs
 additional check for binary files in its
@code{check-for-pregenerated-files} phase, which usually indicates
 bundling:
@@ -1909,11 +1909,11 @@ Don't forget to modify all workspace members in @code{(gnu packages
 rust-crates)}:

@lisp
-(define rust-pipewire-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7)
-(define rust-pipewire-sys-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7)
+(define rust-pipewire-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7)
+(define rust-pipewire-sys-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7)
@dots{}
-(define rust-libspa-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7)
-(define rust-libspa-sys-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7)
+(define rust-libspa-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7)
+(define rust-libspa-sys-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7)
@end lisp

@node Using Rust Libraries in Other Build Systems
@@ -2930,8 +2930,8 @@ your Linode Summary section.) Now you can run the "install guix from

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

@example
-wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
+wget https://guix.gnu.org/guix-install.sh
 chmod +x guix-install.sh
 ./guix-install.sh
 guix pull
@@ -10,8 +10,8 @@
@include version.texi

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

@c Base URL for downloads.
@set BASE-URL https://ftpmirror.gnu.org/gnu/guix
@@ -770,57 +770,43 @@ This section only applies to systems without Guix.  Following it for
 existing Guix installations will overwrite important system files.
@end quotation

-Some GNU/Linux distributions, such as openSUSE, Alpine and NixOS provide
-Guix through their own package managers.  The version of Guix may be
-older than @value{VERSION} but you can update it afterwards by running
-@samp{guix pull}.
-
-We advise system administrators who install Guix, both from the
-installation script or @i{via} the native package manager of their
-foreign distribution, to also regularly read and follow security
-notices, as shown by @command{guix pull}.
-
-If you are running Parabola, after enabling the pcr (Parabola
-Community Repo) repository, you can install Guix with:
-@example
-sudo pacman -S guix
-@end example
-
-For other package managers with a @var{guix} package, you should be able
-to install it like any other package.
-
-The Guix project also provides a shell script, @file{guix-install.sh},
-which automates the binary installation process without use of a foreign
-distro package
-manager@footnote{@uref{https://guix.gnu.org/guix-install.sh}}.
+The
+@uref{https://guix.gnu.org/guix-install.sh, @file{guix-install.sh}}
+shell script automates the binary installation process.
 Use of @file{guix-install.sh} requires Bash, GnuPG, GNU@tie{}tar, wget,
-and Xz.  On systems where @code{systemd} is detected, the tool
-@code{newgidmap} from the @code{uidmap} package is also required.
+and Xz.  On systems where systemd is detected, the tool
+@command{newgidmap} from the @code{uidmap} package is also required.

-The script guides you through the following:
-
-@itemize
-@item Downloading and extracting the binary tarball
-@item Setting up the build daemon
-@item Making the ‘guix’ command available to non-root users
-@item Configuring substitute servers
-@end itemize
-
-As root, run:
+To install Guix on top of your GNU/Linux system, run the following
+commands as root:

@example
-# cd /tmp
-# wget https://guix.gnu.org/guix-install.sh
-# chmod +x guix-install.sh
-# ./guix-install.sh
+cd /tmp
+wget https://guix.gnu.org/guix-install.sh
+chmod +x guix-install.sh
+./guix-install.sh
@end example

-The script to install Guix is also packaged in Parabola (in the pcr
-repository). You can install and run it with:
-@example
-sudo pacman -S guix-installer
-sudo guix-install.sh
-@end example
+When you're done installing Guix, @pxref{Application Setup} for extra
+configuration you might need, and @ref{Getting Started} for your first
+steps!
+
+The script goes through the following steps:
+
+@enumerate
+@item
+Downloading the binary tarball from
+@indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz}
+(where @code{x86_64-linux} can be replaced with @code{i686-linux} for an
+@code{i686} (32-bits) machine already running the kernel Linux, and so
+on---@pxref{GNU Distribution}) and extracting it.
+@item
+Setting up the build daemon (@pxref{Setting Up the Daemon}).
+@item
+Making the @command{guix} command available to non-root users.
+@item
+Configuring substitute servers (@pxref{Official Substitute Servers}).
+@end enumerate

@quotation Note
 By default, @file{guix-install.sh} will configure Guix to download
@@ -837,17 +823,13 @@ To use substitutes from @code{@value{SUBSTITUTE-SERVER-1}},
 For example,

@example
-# guix archive --authorize < \
-     ~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER-1}.pub
-# guix archive --authorize < \
-     ~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER-2}.pub
+guix archive --authorize < \
+   ~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER-1}.pub
+guix archive --authorize < \
+   ~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER-2}.pub
@end example
@end quotation

-When you're done installing Guix, @pxref{Application Setup} for extra
-configuration you might need, and @ref{Getting Started} for your first
-steps!
-
@quotation Note
 The binary installation tarball can be (re)produced and verified simply
 by running the following command in the Guix source tree:
@@ -879,6 +861,16 @@ the @option{--uninstall} flag:
 With @option{--uninstall}, the script irreversibly deletes all the Guix
 files, configuration, and services.

+Some GNU/Linux distributions, such as openSUSE, Alpine and NixOS provide
+Guix through their own package managers.  The version of Guix may be
+older than @value{VERSION} but you can update it afterwards by running
+@command{guix pull}.
+
+We advise system administrators who install Guix, both from the
+installation script or @i{via} the native package manager of their
+foreign distribution, to also regularly read and follow security
+notices, as shown by @command{guix pull}.
+
@node Setting Up the Daemon
@section Setting Up the Daemon

@@ -2157,8 +2149,9 @@ systemctl restart guix-daemon.service

 While this works for @file{guix-install.sh}, it will most likely not
 work if you installed Guix through the package manager of another
-distribution (for instance with sudo apt install guix, pacman -S guix,
-etc) because on many distributions @file{guix-daemon.service} will only
+distribution (for instance with @command{sudo apt install guix},
+@command{pacman -S guix}, or similar commands)
+because on many distributions @file{guix-daemon.service} will only
 run the Guix daemon provided by the distribution.

 Waiting for your distribution to provide security fixes sometimes work,
@@ -4018,9 +4011,12 @@ them in the specified order.  You also need to explicitly authorize the
 public keys of substitute servers to instruct Guix to accept the
 substitutes they sign.

-On Guix System, this is achieved by extending the configuration of the
-@code{guix} service.  @pxref{Service Composition, Service extensions}
-allow users to easily add new configuration information.
+On Guix System, this is achieved by modifying the configuration of the
+@code{guix} service.  Since the @code{guix} service is part of the
+default lists of services, @code{%base-services} and
+@code{%desktop-services}, you can use @code{modify-services} to change
+its configuration and add the URLs and substitute keys that you want
+(@pxref{Service Reference, @code{modify-services}}).

 As an example, suppose you want to fetch substitutes from
@code{guix.example.org} and to authorize the signing key of that server,
@@ -4032,13 +4028,18 @@ configuration will look something like:
 (operating-system
  ;; @dots{}
  (services
-    (cons
-     (simple-service
-      'my-guix-configuration guix-service-type
-      (guix-extension
-        (substitute-urls (list "https://guix.example.org"))
-        (authorized-keys (list (local-file "./key.pub")))))
-     %desktop-services)))
+    ;; Assume we're starting from '%desktop-services'.  Replace it
+    ;; with the list of services you're actually using.
+    (modify-services %desktop-services
+      (guix-service-type config =>
+                        (guix-configuration
+                          (inherit config)
+                          (substitute-urls
+                            (append (list "https://guix.example.org")
+                                    %default-substitute-urls))
+                          (authorized-keys
+                            (append (list (local-file "./key.pub"))
+                                    %default-authorized-guix-keys)))))))
@end lisp

 This assumes that the file @file{key.pub} contains the signing key of
@@ -20694,9 +20695,6 @@ a guix service extension.
@xref{Service Composition}, for more information.

@table @asis
-@item @code{channels} (default: @code{'()})
-A list of objects where each element is a channel record.
-
@item @code{authorized-keys} (default: @code{'()})
 A list of file-like objects where each element contains a public key.

@@ -24870,7 +24868,6 @@ example the @code{windowmaker} or @code{openbox} packages---preferably
 by adding it to the @code{packages} field of your operating system
 definition (@pxref{operating-system Reference, system-wide packages}).

-@anchor{wayland-gdm}
 GDM also supports Wayland: it can itself use Wayland instead of X11 for
 its user interface, and it can also start Wayland sessions.  Wayland
 support is enabled by default.  To disable it, set @code{wayland?} to
@@ -26383,16 +26380,6 @@ special-purpose system interfaces and programs.  This allows backlight
 adjustment helpers, power management utilities, screen lockers, and
 other integrated functionality to work as expected.

-The desktop environments in Guix use the Xorg display server by
-default.  If you'd like to use the newer display server protocol
-called Wayland, you need to enable Wayland support in GDM
-(@pxref{wayland-gdm}).  Another solution is to use the
-@code{sddm-service} instead of GDM as the graphical login manager.
-You should then select the ``GNOME (Wayland)'' session in SDDM@.
-Alternatively you can also try starting GNOME on Wayland manually from a
-TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-run-session
-gnome-session``.  Currently only GNOME has support for Wayland.
-
@defvar gnome-desktop-service-type
 This is the type of the service that adds the @uref{https://www.gnome.org,
 GNOME} desktop environment.  Its value is a @code{gnome-desktop-configuration}
@@ -2,7 +2,7 @@
 # Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
 # Further modified by Tomas Volf <~@wolfsden.cz>.

-htmlxrefversion=2025-11-29.21; # UTC
+htmlxrefversion=2026-01-19.08; # UTC

 # Copyright 2010-2020, 2022 Free Software Foundation, Inc.
 #
@@ -416,7 +416,7 @@ guile-rpc	mono	${GS}/guile-rpc/manual/guile-rpc.html
 guile-rpc	node	${GS}/guile-rpc/manual/html_node/

 GUIX_ROOT = https://guix.gnu.org
-GUIX = ${GUIX_ROOT}/manual
+GUIX = ${GUIX_ROOT}/manual/1.5.0
 guix.de	mono	${GUIX}/de/guix.de.html
 guix.de	node	${GUIX}/de/html_node/
 guix.es	mono	${GUIX}/es/guix.es.html
@@ -5,7 +5,7 @@ include <tunables/guix>

 # There’s no point in confining the guix executable, since it can run
 # any user code and so everything is expected.  We just need to
-# explicitely enable userns for systems with the
+# explicitly enable userns for systems with the
 # kernel.apparmor_restrict_unprivileged_userns sysctl.
 profile guix @{guix_storedir}/{*-guix-command,*-guix-*/bin/guix} flags=(unconfined) {
  userns,
@@ -110,6 +110,7 @@ GNU_URL="https://ftpmirror.gnu.org/gnu/guix/"
 declare -A GPG_SIGNING_KEYS
 GPG_SIGNING_KEYS["civodul"]=3CE464558A84FDC69DB40CFB090B11993D9AEBB5  # ludo
 GPG_SIGNING_KEYS["apteryx"]=27D586A4F8900854329FF09F1260E46482E63562 # maxim
+GPG_SIGNING_KEYS["efraim"]=A28BF40C3E551372662D14F741AAE7DCCA3D8351 # efraim
 PUBLIC_KEYSERVERS="keys.openpgp.org pgpkeys.eu keyserver.ubuntu.com"

 # ------------------------------------------------------------------------------
@@ -777,7 +778,7 @@ sys_create_init_profile()
    cat <<"EOF" > /etc/profile.d/zzz-guix.sh
 # Explicitly initialize XDG base directory variables to ease compatibility
 # with Guix System: see <https://issues.guix.gnu.org/56050#3>.
-export XCURSOR_PATH="${XCURSOR_PATH:-/usr/local/share/icons:/usr/share/icons}"
+export XCURSOR_PATH="${XCURSOR_PATH:-$HOME/.local/share/icons:$HOME/.icons:/usr/local/share/icons:/usr/share/icons}"
 export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
@@ -793,8 +794,8 @@ export PATH="$GUIX_PROFILE/bin${PATH:+:}$PATH"
 # info and man readers.  When INFOPATH is unset, add a trailing colon so Emacs
 # searches 'Info-default-directory-list'.  When MANPATH is unset, add a
 # trailing colon so the system default search path is used.
-export INFOPATH="$GUIX_PROFILE/share/info:$INFOPATH"
-export MANPATH="$GUIX_PROFILE/share/man:$MANPATH"
+export INFOPATH="$GUIX_PROFILE/share/info:${INFOPATH:-}"
+export MANPATH="$GUIX_PROFILE/share/man:${MANPATH:-}"

 # User's default profile, if it exists
 GUIX_PROFILE="$HOME/.guix-profile"
@@ -42,6 +42,26 @@
 (channel-news
 (version 0)

+ (entry (commit "6d4cb99a15da7f4fd55f956c55f4f4aacfcc7742")
+        (title
+         (en "@code{%desktop-services} now includes GDM on AArch64"))
+        (body
+         (en "On Guix System in an operating system configuration, your value for the
+@code{services} field is based on @code{%desktop-services} for desktop
+machines.
+
+The @code{%desktop-services} contains a login manager that is
+architecture-dependent.  Previously, GDM has been used on x86_64 and SDDM on
+other architectures.
+
+Now, GDM is used on all 64-bit architectures.  This affects only AArch64 in
+the end, as other 64-bit architectures aren't mature enough to use
+%desktop-services, yet.
+
+In case you're on AArch64 and you've changed the login manager, you will have
+to adapt your config to remove @code{gdm-service-type} instead of
+@code{sddm-service-type}.")))
+
 (entry (commit "d3b79beaa806452dceaffb8b211b69dc4c346aba")
        (title
         (en "Linux-libre 5.4 no longer supported")
@@ -977,13 +977,14 @@ release."
        #:name "Crypto team"
        #:description
        "Secrets, passwords, cryptography and security related packages."
-        #:scope (list (make-regexp* "^gnu/packages/(.*-|)crypto\\.scm$")
-                      "gnu/packages/gnupg.scm"
-                      "gnu/packages/nettle.scm"
-                      "gnu/packages/password-utils.scm"
-                      "gnu/packages/security-token.scm"
-                      "gnu/packages/ssh.scm"
-                      "gnu/packages/tls.scm")))
+        #:scope (list
+                 "gnu/packages/crypto.scm"
+                 "gnu/packages/gnupg.scm"
+                 "gnu/packages/nettle.scm"
+                 "gnu/packages/password-utils.scm"
+                 "gnu/packages/security-token.scm"
+                 "gnu/packages/ssh.scm"
+                 "gnu/packages/tls.scm")))

 (define-team science
  (team 'science
@@ -187,7 +187,7 @@ configuration.scm."
            (package-arguments guix)))))

 ;; NOTE: Normally, we would use (current-guix), along with url
-;; overriden to the upstream repository to not leak our local checkout.
+;; overridden to the upstream repository to not leak our local checkout.
 ;; But currently, the (current-guix) derivation has to be computed through
 ;; QEMU for systems other than your host system. This takes a lot of time,
 ;; it takes at least half an hour to get the derivations.
@@ -287,6 +287,7 @@ provenance."
             (image
               (inherit base-image)
               (volatile-root? #f)
+               (size (* 20 (expt 1024 3))) ; 20 GiB to have spare space
               (name (string->symbol name))))))))

 (define* (guix-source-tarball)
@@ -22,7 +22,7 @@
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix build-system cargo)
-  #:use-module (gnu packages rust-sources)
+  #:use-module ((gnu packages rust-sources) #:prefix package:)
  #:export (lookup-cargo-inputs))

 ;;;
@@ -8,6 +8,7 @@
 ;;; Copyright © 2023-2024 Herman Rimm <herman@rimm.ee>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 dan <i@dan.games>
+;;; Copyright © 2026 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,7 +65,12 @@
            ((? string?)
             (list #~(install-file (string-append bootloader #$file)
                                   install-dir)))
-            ((? file-like?) (list #~(install-file #$file install-dir)))
+            ((? file-like?)
+             (list #~(mkdir-p install-dir)
+                   #~(copy-file #$file
+                                (string-append install-dir
+                                               "/"
+                                               #$(plain-file-name file)))))
            (#f '()))))
    #~(lambda (bootloader device mount-point)
        (let ((install-dir (string-append mount-point "/boot")))
@@ -132,7 +138,12 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
    ;; starfive_visionfive2.dtb.  We cannot guarantee that users will
    ;; update this U-Boot, so set the FDT explicitly.
    (plain-file "uEnv.txt"
-      "fdtfile=starfive/jh7110-starfive-visionfive-2-v1.3b.dtb~%")))
+                (string-join
+                 (list
+                  "boot_targets=mmc1 nvme0 mmc0 dhcp"
+                  "bootcmd_mmc1=bootflow scan"
+                  "fdtfile=starfive/jh7110-starfive-visionfive-2-v1.3b.dtb")
+                 "\n"))))


 ;;;
@@ -46,7 +46,26 @@
            make-static-device-nodes
            configure-qemu-networking

-            boot-system))
+            boot-system
+
+            linux-console
+
+            linux-console?
+            linux-console-device
+            linux-console-can-read?
+            linux-console-can-write?
+            linux-console-can-unblank?
+            linux-console-enabled?
+            linux-console-preferred?
+            linux-console-primary?
+            linux-console-printk?
+            linux-console-braille?
+            linux-console-safe-when-cpu-offline?
+            linux-console-major
+            linux-console-minor
+            linux-console-virtual?
+
+            read-linux-consoles))

 ;;; Commentary:
 ;;;
@@ -675,4 +694,56 @@ the root file system...\n" root-delay)
              (start-repl)))))
    #:on-error on-error))

+(define-record-type <linux-console>
+  (make-linux-console device can-read? can-write? can-unblank?
+                      enabled? preferred? primary? printk? braille?
+                      safe-when-cpu-offline? major minor virtual?)
+  linux-console?
+  (device linux-console-device)
+  (can-read? linux-console-can-read?)
+  (can-write? linux-console-can-write?)
+  (can-unblank? linux-console-can-unblank?)
+  (enabled? linux-console-enabled?)
+  (preferred? linux-console-preferred?)
+  (primary? linux-console-primary?)
+  (printk? linux-console-printk?)
+  (braille? linux-console-braille?)
+  (safe-when-cpu-offline? linux-console-safe-when-cpu-offline?)
+  (major linux-console-major)
+  (minor linux-console-minor)
+  (virtual? linux-console-virtual?))
+
+(define* (read-linux-consoles #:optional (consoles-file "/proc/consoles"))
+  "Parses CONSOLES-FILE and returns a list of <linux-console> records."
+  (if (not (file-exists? consoles-file))
+      '()
+      (with-input-from-file consoles-file
+        (lambda ()
+          (let ((line-regex (make-regexp
+                             "^([^ ]+)[ ]+(.+)[ ]+([0-9]+):([0-9]+)$"))
+                (virt-regex (make-regexp "^tty[0-9]+$")))
+            (let loop ((line (read-line))
+                       (results '()))
+              (cond
+               ((eof-object? line)
+                (reverse results))
+               ((regexp-exec line-regex line)
+                => (lambda (m)
+                     (let* ((dev      (match:substring m 1))
+                            (flags    (match:substring m 2))
+                            (major    (string->number (match:substring m 3)))
+                            (minor    (string->number (match:substring m 4)))
+                            (virtual? (regexp-exec virt-regex dev))
+                            (has?     (lambda (c)
+                                      (string-any (lambda (f) (char=? f c)) flags))))
+                       (loop (read-line)
+                             (cons (make-linux-console
+                                    dev
+                                    (has? #\R) (has? #\W) (has? #\U) (has? #\E)
+                                    (has? #\C) (has? #\B) (has? #\p) (has? #\b)
+                                    (has? #\a)
+                                    major minor virtual?)
+                                   results)))))
+               (else (loop (read-line) results)))))))))
+
 ;;; linux-boot.scm ends here
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024,2026 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -168,8 +168,10 @@ or #f.  Return #t on success and #f on failure."
                            (const '())))
         (install-command (append `( "guix" "system" "init"
                                     "--fallback"
-                                     ,@(if (target-hurd?)
-                                           '("--target=i586-pc-gnu")
+                                     ,@(if (%current-target-system)
+                                           `(,(string-append
+                                               "--target="
+                                               (%current-target-system)))
                                           '()))
                                  options
                                  (list (%installer-configuration-file)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,7 +27,8 @@
  str)

 (define (kernel->configuration kernel dry-run?)
-  (if (equal? kernel "Hurd")
+  (if (and (string? kernel)
+           (string-prefix? "Hurd" kernel))
      `((kernel %hurd-default-operating-system-kernel)
        ,(comment (G_ ";; \"noide\" disables the gnumach IDE driver, enabling rumpdisk.\n"))
        (kernel-arguments '("noide"))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,23 +23,48 @@
  #:export (run-kernel-page))

 (define (run-kernel-page)
-  (let* ((kernels `(,@(if (target-x86?) '("Hurd") '())
-                    "Linux Libre"))
+  ;; TRANSLATORS: "Hurd" is a proper noun and must not be translated.
+  (let* ((hurd-x86 (G_ "Hurd 32-bit (experimental)"))
+         (hurd-x86_64 (G_ "Hurd 64-bit (highly experimental!)"))
+         (linux-libre "Linux Libre")
+         (kernels (parameterize ((%current-target-system #f))
+                    `(,linux-libre
+                      ,@(cond ((target-x86-64?)
+                               (list hurd-x86 hurd-x86_64))
+                              ((target-x86?)
+                               (list hurd-x86))
+                              (else
+                               '())))))
+         (default (cond ((equal? (%current-target-system) "i586-pc-gnu")
+                         hurd-x86)
+                        ((equal? (%current-target-system) "x86_64-pc-gnu")
+                         hurd-x86_64)
+                        (else
+                         linux-libre)))
         (result
          (run-listbox-selection-page
           #:title (G_ "Kernel")
           #:info-text
+           ;; TRANSLATORS: "Hurd" is a proper noun and must not be translated.
+           ;; TRANSLATORS: "Linux Libre" is a literal and must not be translated.
           (G_ "Please select a kernel.  When in doubt, choose \"Linux Libre\".
+
 The Hurd is offered as a technology preview and development aid; many packages \
-are not yet available in Guix, such as a desktop environment or even a windowing \
-system (X, Wayland).")
+are not yet available in Guix, such as a desktop environment or even a \
+windowing system (X, Wayland).")
           #:listbox-items kernels
           #:listbox-item->text identity
-           #:listbox-default-item "Linux Libre"
+           #:listbox-default-item default
+           #:sort-listbox-items? #f               ;keep Linux first
           #:button-text (G_ "Back")
           #:button-callback-procedure
           (lambda _
             (abort-to-prompt 'installer-step 'abort)))))
-    (when (equal? result "Hurd")
-      (%current-target-system "i586-pc-gnu"))
+    (let ((target (cond ((equal? result hurd-x86)
+                         "i586-pc-gnu")
+                        ((equal? result hurd-x86_64)
+                         "x86_64-pc-gnu")
+                        (else
+                         #f))))
+      (%current-target-system target))
    result))
@@ -27,6 +27,7 @@
  #:use-module (guix i18n)
  #:use-module (srfi srfi-1)
  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-26)
  #:use-module (srfi srfi-34)
  #:use-module (srfi srfi-35)
  #:use-module (ice-9 match)
@@ -112,20 +113,24 @@ network devices were found. Do you want to continue anyway?"))
             full-value
             (+ value 1)))))))

-(define (url-alive? url)
+(define* (url-alive? url #:key (ensure-ok-status? #f))
  (false-if-exception
-   (begin
-     (http-request url)
-     #t)))
+   (let ((response (http-request url)))
+     (or (not ensure-ok-status?)
+         (= (response-code response)
+            200)))))

-(define (common-urls-alive? urls)
+(define* (common-urls-alive? urls #:key (ensure-ok-status? #f))
+  "Return #t if at least some of the given URLS are alive,
+meaning that they do respond to a HTTP request. If ENSURE-OK-STATUS? is
+#t, return #t only if the code is 200."
  (dynamic-wind
    (lambda ()
      (sigaction SIGALRM
        (lambda _ #f))
      (alarm 3))
    (lambda ()
-      (any url-alive?
+      (any (cut url-alive? <> #:ensure-ok-status? ensure-ok-status?)
           urls))
    (lambda ()
      (alarm 0))))
@@ -140,7 +145,9 @@ FULL-VALUE tentatives, spaced by 1 second."
               "https://bordeaux.guix.gnu.org"
               "https://ci.guix.gnu.org"
               "https://guix.gnu.org"
-               "https://gnu.org")))
+               "https://gnu.org")
+              ;; Any HTTP response means the users is online.
+              #:ensure-ok-status? #f))
        (file-exists? "/tmp/installer-assume-online")))

  (let* ((full-value 5))
@@ -173,7 +180,8 @@ Do you want to continue anyway?"))
     (common-urls-alive?
      (list
       "https://bordeaux.guix.gnu.org/nix-cache-info"
-       "https://ci.guix.gnu.org/nix-cache-info"))))
+       "https://ci.guix.gnu.org/nix-cache-info")
+      #:ensure-ok-status? #t)))

  (let* ((full-value 5))
    (run-scale-page
@@ -108,20 +108,23 @@ all data on disk will be lost, are you sure you want to proceed?") item)

 (define (run-label-page button-text button-callback)
  "Run a page asking the user to select a partition table label."
-  ;; Force the GPT label if UEFI is supported.
-  (if (efi-installation?)
-      ((run-label-confirmation-page button-callback) "gpt")
-      (run-listbox-selection-page
-       #:info-text (G_ "Select a new partition table type. \
+        ;; Force the GPT label if UEFI is supported.
+  (cond ((efi-installation?)
+         ((run-label-confirmation-page button-callback) "gpt"))
+        ;; Force the MSDOS label on Hurd.
+        ((target-hurd?)
+         ((run-label-confirmation-page button-callback) "msdos"))
+        (else (run-listbox-selection-page
+               #:info-text (G_ "Select a new partition table type. \
 Be careful, all data on the disk will be lost.")
-       #:title (G_ "Partition table")
-       #:listbox-items '("msdos" "gpt")
-       #:listbox-default-item (if (target-hurd?) "msdos" "gpt")
-       #:listbox-item->text identity
-       #:listbox-callback-procedure
-       (run-label-confirmation-page button-callback)
-       #:button-text button-text
-       #:button-callback-procedure button-callback)))
+               #:title (G_ "Partition table")
+               #:listbox-items '("msdos" "gpt")
+               #:listbox-default-item (if (target-hurd?) "msdos" "gpt")
+               #:listbox-item->text identity
+               #:listbox-callback-procedure
+               (run-label-confirmation-page button-callback)
+               #:button-text button-text
+               #:button-callback-procedure button-callback))))

 (define (run-type-page partition)
  "Run a page asking the user to select a partition type."
@@ -36,11 +36,9 @@
 environments."
  (let ((items (filter desktop-system-service? (%system-services))))
    (run-checkbox-tree-page
-     #:info-text (if (target-hurd?)
-                     (G_ "Currently, none of these is available for the Hurd.")
-                     (G_ "Please select the desktop environment(s) you wish to \
+     #:info-text (G_ "Please select the desktop environment(s) you wish to \
 install.  If you select multiple desktop environments here, you will be able \
-to choose from them later when you log in."))
+to choose from them later when you log in.")
     #:title (G_ "Desktop environment")
     #:items items
     #:selection (map system-service-recommended? items)
@@ -50,6 +48,16 @@ to choose from them later when you log in."))
     (lambda ()
       (abort-to-prompt 'installer-step 'abort)))))

+;; FIXME: all platforms should support %desktop-services and some of the
+;; offered desktop environments. Instead of globally disabling the desktop
+;; page, disable only non-working desktop environments.
+(define (run-desktop-environments-cbt-page/maybe)
+  "Run page with desktop environments, as long as the user is on
+a system that supports them."
+  (if (or (target-hurd?) (target-x86-32?))
+      '()
+      (run-desktop-environments-cbt-page)))
+
 (define (run-networking-cbt-page)
  "Run a page allowing the user to select networking services."
  (let ((items (filter (lambda (service)
@@ -131,7 +139,7 @@ client may be enough for a server.")
       (abort-to-prompt 'installer-step 'abort)))))

 (define (run-services-page)
-  (let ((desktop (run-desktop-environments-cbt-page)))
+  (let ((desktop (run-desktop-environments-cbt-page/maybe)))
    ;; When the user did not select any desktop services, and thus didn't get
    ;; '%desktop-services', offer network management services.
    (append desktop
@@ -1175,6 +1175,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/dhclient-script-resolvconf-support.patch \
  %D%/packages/patches/dicedb-remove-init-from-config-subpkg.patch	\
  %D%/packages/patches/directfb-davinci-glibc-228-compat.patch	\
+  %D%/packages/patches/django-compressor-build-with-beautifulsoup-4.14+.patch	\
  %D%/packages/patches/dkimproxy-add-ipv6-support.patch		\
  %D%/packages/patches/doc++-gcc-14.patch			\
  %D%/packages/patches/docbook-utils-documentation-edits.patch	\
@@ -1208,6 +1209,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch	\
  %D%/packages/patches/einstein-build.patch			\
  %D%/packages/patches/elfutils-tests-ptrace.patch		\
+  %D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch			\
  %D%/packages/patches/elixir-path-length.patch			\
  %D%/packages/patches/elm-ghc9.2.patch	\
  %D%/packages/patches/python-treelib-remove-python2-compat.patch	\
@@ -1247,7 +1249,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/ergodox-firmware-fix-numpad.patch	\
  %D%/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch	\
  %D%/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch	\
+  %D%/packages/patches/erlang-binpp-disable-failing-tests.patch	\
  %D%/packages/patches/erlang-man-path.patch			\
+  %D%/packages/patches/erlang-mochiweb-disable-known-to-fail-tests.patch	\
  %D%/packages/patches/esmini-use-pkgconfig.patch		\
  %D%/packages/patches/esmtp-add-lesmtp.patch		\
  %D%/packages/patches/esound-c99.patch         		\
@@ -1323,7 +1327,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/freeimage-unbundle.patch		\
  %D%/packages/patches/freeimage-CVE-2020-21428.patch		\
  %D%/packages/patches/freeimage-CVE-2020-22524.patch		\
-  %D%/packages/patches/freerdp-3.16.0-rpath.patch		\
  %D%/packages/patches/freesolid-automake.patch			\
  %D%/packages/patches/freesolid-autotools.patch		\
  %D%/packages/patches/freesolid-configure.patch		\
@@ -1682,6 +1685,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
  %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch        \
  %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch       \
+  %D%/packages/patches/librewolf-compare-paths.patch		\
  %D%/packages/patches/librewolf-neuter-locale-download.patch	\
  %D%/packages/patches/librewolf-use-system-wide-dir.patch	\
  %D%/packages/patches/libvirt-add-install-prefix.patch	\
@@ -1692,6 +1696,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/lightdm-vnc-ipv6.patch			\
  %D%/packages/patches/lightdm-vnc-color-depth.patch		\
  %D%/packages/patches/lightdm-vncserver-check.patch		\
+  %D%/packages/patches/linphone-desktop-cmake-belcard.patch	\
+  %D%/packages/patches/linphone-desktop-cmake-find-modules.patch	\
  %D%/packages/patches/localed-xorg-keyboard.patch		\
  %D%/packages/patches/kaldi-ignore-failing-test.patch		\
  %D%/packages/patches/kaldi-openblas-0.3.29-compatibility.patch	\
@@ -1880,6 +1886,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/mpc123-initialize-ao.patch		\
  %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
  %D%/packages/patches/mpg321-gcc-10.patch			\
+  %D%/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch		\
+  %D%/packages/patches/mpv-0.40.0-fix-wayland-cpu-usage.patch	\
  %D%/packages/patches/modglue-fix-build.patch		\
  %D%/packages/patches/modem-manager-fix-test-wrapper.patch	\
  %D%/packages/patches/module-init-tools-moduledir.patch	\
@@ -2209,6 +2217,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/qemu-glibc-2.30.patch 			\
  %D%/packages/patches/qemu-fix-agent-paths.patch 		\
  %D%/packages/patches/qemu-fix-test-virtio-version.patch       \
+  %D%/packages/patches/qemu-disable-aarch64-migration-test.patch	\
  %D%/packages/patches/qrcodegen-cpp-cmake.patch		\
  %D%/packages/patches/qtbase-absolute-runpath.patch		\
  %D%/packages/patches/qtbase-qmake-fix-includedir.patch 	\
@@ -2292,6 +2301,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch	\
  %D%/packages/patches/sbcl-ciel-repl.patch			\
  %D%/packages/patches/sbcl-clml-fix-types.patch		\
+  %D%/packages/patches/sbcl-cl-redis-replace-sbcl-specific-calls.patch	\
  %D%/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch	\
  %D%/packages/patches/sbcl-lack-fix-tests.patch		\
  %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch	\
@@ -2481,6 +2491,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/wmctrl-64-fix.patch			\
  %D%/packages/patches/wmfire-dont-inline-draw-fire.patch	\
  %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch	\
+  %D%/packages/patches/woof-doom-unbundle-spng-miniz.patch	\
  %D%/packages/patches/wordnet-CVE-2008-2149.patch			\
  %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch			\
  %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch			\
@@ -30,13 +30,10 @@
  #:use-module (gnu packages check)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages perl)
-  #:use-module (gnu packages python-build)
  #:use-module (guix packages)
  #:use-module (guix download)
-  #:use-module (guix gexp)
  #: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))

@@ -98,28 +95,33 @@
 (define-public python-pylibacl
  (package
    (name "python-pylibacl")
-    (version "0.7.3")
+    (version "0.6.0")
    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pylibacl" version))
-       (sha256
-        (base32 "08pr5cbipij3j591bihh72r5h14lyrspy24qwmfjsn0c1rcgp7wx"))))
-    (build-system pyproject-build-system)
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pylibacl" version))
+        (sha256
+          (base32
+            "1zyrk2m20p5b6bdwxhrwib273i6i71zyr5hzssbxfqis5qra9848"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'disable-tests
-            (lambda* (#:key outputs inputs #:allow-other-keys)
-              ;; These tests operate on real files, but our tmpfs does not support
-              ;; ACLs.
-              (substitute* "tests/test_acls.py"
-                (("( *)def test_applyto(_extended(_mixed)?)?" match indent)
-                 (string-append indent "@pytest.mark.skip(reason=\"guix\")\n"
-                                match))))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-tests
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             ;; These tests operate on real files, but our tmpfs does not support
+             ;; ACLs.
+             (substitute* "tests/test_acls.py"
+               (("( *)def test_applyto(_extended(_mixed)?)?" match indent)
+                (string-append indent "@pytest.mark.skip(reason=\"guix\")\n"
+                               match)))))
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "pytest" "tests")))))))
    (inputs (list acl))
-    (native-inputs (list python-pytest python-setuptools))
+    (native-inputs (list python-pytest))
    (home-page "https://pylibacl.k1024.org/")
    (synopsis "POSIX.1e @acronym{ACLs, access control lists} for Python")
    (description
@@ -2524,7 +2524,7 @@ system administrator.")
    (inputs
     (append (list coreutils zlib)
             (if (target-hurd?)
-                 '()
+                 (list libxcrypt)
                 (list linux-pam))))
    (home-page "https://www.sudo.ws/")
    (synopsis "Run commands as root")
@@ -300,38 +300,6 @@ barcodes of the modern ECC200 variety.  libdmtx is a shared library, allowing
 C/C++ programs to use its capabilities without restrictions or overhead.")
    (license license:bsd-3)))

-(define-public dmtx-utils
-  (package
-    (name "dmtx-utils")
-    (version "0.7.6")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/dmtx/dmtx-utils/")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        "06m3qncqdlcnmw83n95yrx2alaq6bld320ax26z4ndnla41yk0p4")))
-    (build-system gnu-build-system)
-    (native-inputs (list autoconf automake libtool pkg-config))
-    (inputs (list libdmtx imagemagick libjpeg-turbo))
-    (home-page "https://github.com/dmtx/dmtx-utils/")
-    (synopsis "Utilities for working with Data Matrix barcodes")
-    (description
-     "libdmtx is a software library that enables programs to read and write Data
-Matrix barcodes of the modern ECC200 variety.  This package, dmtx-utils,
-provides command line utilities that allow scripts and command line users to
-use libdmtx functionality.
-
-This package includes the following programs:
-@enumerate
-@item @code{dmtxquery}: Extract information from dmtxread output.
-@item @code{dmtxread}: Scan Data Matrix barcodes.
-@item @code{dmtxwrite}: Create Data Matrix barcodes.
-@end enumerate")
-    (license (list license:lgpl2.1 license:gpl2))))
-
 ;; XXX: qt variant utils are broken: zbarcam-qt fails with segmentation fault.
 (define-public zbar
  (package
@@ -5043,9 +5043,6 @@ astronomy-specific functionality")
       (sha256
        (base32 "062l4bhh1dvsazrlnjc4kr3qj9g3s8qmcs0kqb1libiimy6rdbkk"))))
    (build-system pyproject-build-system)
-    (arguments
-     ;; XXX: This test is flaky, it can fail if the CI system is slow.
-     (list #:test-flags #~(list "-k" "not test_combine_slices_hypot")))
    (native-inputs
     (list python-pytest
           python-pytest-mpl
@@ -4654,21 +4654,21 @@ tempo and pitch of an audio recording independently of one another.")
 (define-public rtmidi
  (package
    (name "rtmidi")
-    (version "6.0.0")
+    (version "5.0.0")
    (source (origin
              (method url-fetch)
-              (uri (string-append "https://caml.music.mcgill.ca/~gary/rtmidi"
+              (uri (string-append "https://www.music.mcgill.ca/~gary/rtmidi"
                                  "/release/rtmidi-" version ".tar.gz"))
              (file-name (string-append "rtmidi-" version ".tar.gz"))
              (sha256
               (base32
-                "0nyvck6qlncbfpplgxspjk77fmi05w78ik0cf8039hj29gvcqq2r"))))
+                "1ff2yfq3k4l209fr71v3w98fpjjv1chs09vkbmxj03lcikahxns8"))))
    (build-system gnu-build-system)
    (inputs
     (list alsa-lib jack-2))
    (native-inputs
     (list autoconf automake libtool pkg-config))
-    (home-page "https://caml.music.mcgill.ca/~gary/rtmidi")
+    (home-page "https://www.music.mcgill.ca/~gary/rtmidi")
    (synopsis "Cross-platform MIDI library for C++")
    (description
     "RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific
@@ -6194,41 +6194,6 @@ the following features:
 ")
    (license license:lgpl3+)))

-(define-public normalize
-  (package
-    (name "normalize")
-    (version "0.7.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "http://download.savannah.gnu.org/releases/normalize/normalize-"
-             version ".tar.gz"))
-       (sha256
-        (base32 "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~(list "CFLAGS=-g -O2 -Wno-error=implicit-function-declaration")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-shell-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "test/Makefile.in"
-                (("/bin/sh")
-                 (search-input-file inputs "/bin/sh"))))))))
-    (inputs (list libmad))
-    (home-page "https://normalize.nongnu.org/")
-    (synopsis "Audio track volume normalizer")
-    (description
-     "@code{normalize} is an audio track normalizer.
-For a collection of tracks with varying volumes, it is able to
-make the loudness consistent between them.  This is helpful
-when making mixtapes, for example.
-It can work with WAV and MP3 files.")
-    (license license:gpl2)))
-
 (define-public lv2-speech-denoiser
  (let ((commit "04cfba929630404f8d4f4ca5bac8d9b09a99152f")
        (revision "1"))
@@ -2039,7 +2039,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_PMCRAID is not set
 # CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_VIRTIO is not set
+CONFIG_SCSI_VIRTIO=m
 # CONFIG_SCSI_DH is not set
 # end of SCSI device support

@@ -574,13 +574,13 @@ rsnapshot uses hard links to deduplicate identical files.")
 (define-public borg
  (package
    (name "borg")
-    (version "1.4.3")
+    (version "1.4.1")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "borgbackup" version))
       (sha256
-        (base32 "07s4jqcv03s98hi6lvqpvmnnhl532qnvv11mjy2xc08rbmsgmfvr"))
+        (base32 "0f9qj05i02aj17lhk97fqyknb1jx3h9xr8d569mhp44xq7qziyxq"))
       (snippet
        #~(begin
            ;; Delete files generated by Cython.  We used to have a regex that
@@ -1209,42 +1209,39 @@ compression parameters used by Gzip.")
 (define-public borgmatic
  (package
    (name "borgmatic")
-    (version "2.0.13")
+    (version "2.0.7")
    (source
     (origin
-       ;; PyPI archive does not contain NEWS file needed for one test.
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://projects.torsion.org/borgmatic-collective/borgmatic")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "borgmatic" version))
       (sha256
-        (base32
-         "05w3j4knhsg4w0a0yrz8c7lvz3vp3nf95ddmql9i8mqknjqddm1v"))))
+        (base32 "01l44ny2zyn7x1hhbvhhhwr12jipcjxl3j1cz13kf6c3bdfwms8y"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'configure
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Set absolute store path to borg.
-              (substitute* "borgmatic/commands/borgmatic.py"
-                (("\\.get\\('local_path', 'borg'\\)")
-                 (string-append ".get('local_path', '"
-                                (search-input-file inputs "bin/borg")
-                                "')")))
-              (substitute* "tests/unit/commands/test_borgmatic.py"
-                (("(module.get_local_path.+ == )'borg'" all start)
-                 (string-append start "'"
-                                (search-input-file inputs "bin/borg")
-                                "'")))))
-          (add-before 'check 'set-path
-            (lambda _
-              ;; Tests require the installed executable.
-              (setenv "PATH"
-                      (string-append #$output "/bin" ":"
-                                     (getenv "PATH"))))))))
+      ;; XXX: all tests fail with error: AttributeError: module
+      ;; '_pytest.runner' has no attribute 'call_runtest_hook'.
+      #:tests? #f
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'configure
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       ;; Set absolute store path to borg.
+                       (substitute* "borgmatic/commands/borgmatic.py"
+                         (("\\.get\\('local_path', 'borg'\\)")
+                          (string-append ".get('local_path', '"
+                                         (search-input-file inputs "bin/borg")
+                                         "')")))
+                       (substitute* "tests/unit/commands/test_borgmatic.py"
+                         (("(module.get_local_path.+ == )'borg'" all start)
+                          (string-append start "'"
+                                         (search-input-file inputs "bin/borg")
+                                         "'")))))
+                   (add-before 'check 'set-path
+                     (lambda _
+                         ;; Tests require the installed executable.
+                         (setenv "PATH"
+                                 (string-append #$output "/bin" ":"
+                                                (getenv "PATH"))))))))
    (native-inputs
     (list python-flexmock
           python-pytest
@@ -1269,7 +1266,7 @@ borgmatic is powered by borg.")
 (define-public vorta
  (package
    (name "vorta")
-    (version "0.11.1")
+    (version "0.10.3")
    ;; The test folder is not included in the PyPI archive.
    (source (origin
              (method git-fetch)
@@ -1279,7 +1276,7 @@ borgmatic is powered by borg.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "16r9ch80i6nfngah634id16fqnmn62ayh60j62zxn5cfivcn3wsq"))))
+                "0b4042a0lpbmwlmbh5559b2x9vr2055w6jjrs7088n45d7rkn4sn"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -226,7 +226,7 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
 (define-public stig
  (package
    (name "stig")
-    (version "0.14.1a0")
+    (version "0.14.0a0")
    (source
     (origin
       (method git-fetch)
@@ -235,18 +235,7 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0196brcasdyn0mx3h2cqlgrx8x9fyv2n7bmx13nj58vnf3y4c1hg"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f ;tests require network access
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'loosen-version-restrictions
-            (lambda _
-              (substitute* "setup.py"
-                (("urwidtrees==1.0.3")
-                 "urwidtrees>=1.0.3")))))))
+        (base32 "1jfcgncva94pyzjifar1l6wlmb7aylg0l4fxljc83rkbj1a2aan0"))))
    (propagated-inputs
     (list python-urwid
           python-urwidtrees
@@ -257,12 +246,20 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
           python-natsort
           python-async-timeout
           python-setproctitle))
+    (arguments
+     (list
+      #:tests? #f ;tests require network access
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'loosen-version-restrictions
+                     (lambda _
+                       (substitute* "setup.py"
+                         (("urwidtrees==1.0.3") "urwidtrees>=1.0.3")))))))
    (inputs (list python))
-    (native-inputs (list python-setuptools))
+    (build-system python-build-system)
    (synopsis "TUI and CLI for the BitTorrent client Transmission")
    (description
-     "Stig is a @acronym{TUI, Text User Interface} and @acronym{CLI, Command
-Line Interface} client for the BitTorrent client Transmission.")
+     "Stig is a @acronym{TUI, Text User Interface} and @acronym{CLI, Command Line
+Interface} client for the BitTorrent client Transmission.")
    (home-page "https://github.com/rndusr/stig")
    (license l:gpl3)))

@@ -540,6 +537,20 @@ focusing on efficiency and scalability.  It runs on embedded devices as well as
 desktops.")
    (license l:bsd-2)))

+(define-public libtorrent-rasterbar-1.2
+  (package
+    (inherit libtorrent-rasterbar)
+    (version "1.2.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://github.com/arvidn/libtorrent/"
+                       "releases/download/v" version "/"
+                       "libtorrent-rasterbar-" version ".tar.gz"))
+       (sha256
+        (base32 "1z5rdynzxcm6wb7v48ssfbwjairbjacb8rjix5fn70fw4668xgyc"))))))
+
 (define-public qbittorrent
  (package
    (name "qbittorrent")
@@ -159,6 +159,9 @@ core computer science concepts such as abstraction in programming,
 metalinguistic abstraction, recursion, interpreters, and modular programming.")
      (license license:cc-by-sa4.0))))

+;; It may be removed after 2025-12-19.
+(define-deprecated/public-alias sicp book-sicp)
+
 (define-public book-sparc
  (package
    (name "book-sparc")
@@ -2,7 +2,6 @@
 ;;; Copyright © 2022 Christopher Rodriguez <yewscion@gmail.com>
 ;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2025 Lee Thompson <lee.p.thomp@gmail.com>
-;;; © 2025 case_lambda <case_lambda@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,71 +36,77 @@
  #:use-module (gnu packages compression))

 (define-public dbqn
-  (package
-    (name "dbqn")
-    (version "0.2.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/dzaima/BQN")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1zy3y9wbmaw0mrd2sp7d1r912gvs9k0mzw5d3drgmbzkbvpd6iq1"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:imported-modules `((guix build ant-build-system)
-                           ,@%default-gnu-imported-modules)
-      #:modules '((guix build gnu-build-system)
-                  ((guix build ant-build-system)
-                   #:prefix ant:)
-                  (guix build utils))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)
-          (replace 'build
-            (lambda _
-              (invoke "./build")))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (if tests?
-                  (invoke "./BQN" "./test/test")
-                  (begin
-                    (display "test suite not run")
-                    (newline)))))
-          (add-after 'install 'reorder-jar-content
-            (assoc-ref ant:%standard-phases
-                       'reorder-jar-content))
-          (add-after 'reorder-jar-content 'generate-jar-indices
-            (assoc-ref ant:%standard-phases
-                       'generate-jar-indices))
-          (add-after 'generate-jar-indices 'strip-jar-timestamps
-            (assoc-ref ant:%standard-phases
-                       'strip-jar-timestamps))
-          (replace 'install
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((dest-jar (string-append #$output "/share/java")))
-                (rename-file "BQN" "dbqn")
-                (substitute* "dbqn"
-                  (("java")
-                   (search-input-file inputs "/bin/java"))
-                  (("BQN.jar")
-                   (string-append dest-jar "/BQN.jar")))
-                (install-file "BQN.jar" dest-jar)
-                (install-file "dbqn"
-                              (string-append #$output "/bin"))))))))
-    (native-inputs (list `(,icedtea-8 "jdk") zip))
-    (inputs (list bash-minimal icedtea-8))
-    (synopsis "BQN implementation based on dzaima/APL")
-    (description
-     "dbqn is a Java implementation of the
+  (let ((commit "88f2b43966a75cc2c382421218eb30003bb16f4a")
+        (revision "1"))
+    (package
+      (name "dbqn")
+      (version (git-version "0.2.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/dzaima/BQN")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "06mzvv7kmandhgwb6jwz3rivsj4ic549sy8afnb5zr6mfn5isyg5"))))
+      (build-system gnu-build-system)
+      (arguments
+       (list
+        #:imported-modules `(,@%default-gnu-imported-modules
+                             (guix build ant-build-system))
+        #:modules `((guix build gnu-build-system)
+                    ((guix build ant-build-system)
+                     #:prefix ant:)
+                    (guix build utils))
+        #:phases #~(modify-phases %standard-phases
+                     (delete 'configure)
+                     (replace 'build
+                       (lambda* _
+                         (invoke "./build")
+                         (chmod "./BQN" #o755)))
+                     (replace 'check
+                       (lambda* (#:key tests? #:allow-other-keys)
+                         (when tests?
+                           (system "./BQN ./test/test"))))
+                     (add-after 'install 'reorder-jar-content
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         (apply (assoc-ref ant:%standard-phases
+                                           'reorder-jar-content)
+                                #:outputs (list outputs))))
+                     (add-after 'reorder-jar-content 'jar-indices
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         (apply (assoc-ref ant:%standard-phases
+                                           'generate-jar-indices)
+                                #:outputs (list outputs))))
+                     (add-after 'jar-indices 'fix-jar-timestamps
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         (apply (assoc-ref ant:%standard-phases
+                                           'reorder-jar-content)
+                                #:outputs (list outputs))))
+                     (replace 'install
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         (let* ((out (assoc-ref outputs "out"))
+                                (dest-bin (string-append out "/bin"))
+                                (dest-jar (string-append out "/share/java")))
+                           (mkdir-p dest-bin)
+                           (mkdir-p dest-jar)
+                           (rename-file "BQN" "dbqn")
+                           (install-file "dbqn" dest-bin)
+                           (install-file "BQN.jar" dest-jar)
+                           (substitute* (string-append dest-bin "/dbqn")
+                             (("BQN.jar")
+                              (string-append dest-jar "/BQN.jar")))))))))
+      (native-inputs (list `(,icedtea-8 "jdk") zip))
+      (inputs (list icedtea-8 bash-minimal))
+      (synopsis "BQN implementation based on dzaima/APL")
+      (description
+       "dbqn is a Java implementation of the
@uref{https://mlochbaum.github.io/BQN/, BQN programming language} that does
 not need to be bootstrapped, based on an earlier Java implementation of APL by
 the same author.")
-    (home-page "https://github.com/dzaima/BQN")
-    (license license:expat)))
+      (home-page "https://github.com/dzaima/BQN")
+      (license license:expat))))

 (define bqn-sources
  ;; Aside from dbqn above, the main bqn repository is used by other
@@ -51,7 +51,6 @@
  #:use-module (guix build-system copy)
  #: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)
@@ -73,7 +72,6 @@
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages gettext)
@@ -468,26 +466,23 @@ language as input.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1rihvlg11nzk70kfzz4i3gi5izcy46w05ismcx04p5j1hlim0brb"))))
-    (build-system pyproject-build-system)
+        (base32
+         "1rihvlg11nzk70kfzz4i3gi5izcy46w05ismcx04p5j1hlim0brb"))))
+    (build-system python-build-system)
    (arguments
     (list
-      #:test-backend #~'unittest
-      #:test-flags #~(list "discover" "-s" "tests" "-p" "*.py")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'unbundle-ply
-            (lambda _
-              (rmdir "pcpp/ply")
-              (substitute* "setup.py"
-                (("'pcpp/ply/ply'")
-                 "")))))))
-    (native-inputs (list python-setuptools))
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'unbundle-ply
+                     (lambda _
+                       (rmdir "pcpp/ply")
+                       (substitute* "setup.py"
+                         (("'pcpp/ply/ply'") "")))))))
+    (native-inputs (list python-pytest))
    (propagated-inputs (list python-ply))
    (home-page "https://github.com/ned14/pcpp")
    (synopsis "C99 preprocessor written in Python")
-    (description
-     "This package provides a C99 preprocessor written in pure Python.")
+    (description "This package provides a C99 preprocessor written in pure
+Python.")
    (license license:bsd-3)))

 (define-public aml
@@ -3165,6 +3165,57 @@ non-technical or business participants in a software project.  Behave uses
 tests written in a natural language style, backed up by Python code.")
    (license license:x11)))

+(define-public python-behave-web-api
+  (package
+    (name "python-behave-web-api")
+    (version "2.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "behave-web-api" version))
+       (sha256
+        (base32
+         "04p5sp6wck3mafj634w1fpvfhxm170l5q3hfb9d06pi71ql606n6"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-dependencies
+           (lambda _
+             (substitute* "setup.py"
+               (("'wheel'") "")                ; We don't use it.
+               (("'ordereddict==1.1'") ""))    ; Python >= 2.7 has it built-in.
+             #t)))))
+    (native-inputs
+     (list python-pytest
+           python-setuptools
+           python-wheel))
+    (propagated-inputs
+     (list behave python-requests))
+    (home-page "https://github.com/jefersondaniel/behave-web-api")
+    (synopsis "Provides testing for JSON APIs with Behave for Python")
+    (description "This package provides testing utility modules for testing
+JSON APIs with Behave.")
+    (license license:expat)))
+
+(define-public python-nose-timer
+  (package
+    (name "python-nose-timer")
+    (version "0.7.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "nose-timer" version))
+        (sha256
+          (base32 "05wzkc88vbzw62pqkvhl33211b90kns0lny70b7qw62rcg4flzk4"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     (list python-nose python-termcolor))
+    (home-page "https://github.com/mahmoudimus/nose-timer")
+    (synopsis "Timer plugin for nosetests")
+    (description "Shows how much time was needed to run individual tests.")
+    (license license:expat)))
+
 (define-public python-freezegun
  (package
    (name "python-freezegun")
@@ -46,7 +46,6 @@
  #:use-module (guix build-system cmake)
  #: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)
@@ -461,40 +460,14 @@ and workspaces that can be used in the compiler environment of your choice.")
       (uri (pypi-uri "cmakelang" version))
       (sha256
        (base32 "0zz6g1ignqanl4ja9f5nrlk5f3mvv7cp5y9yswjd0m06n23jx603"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f        ;no test data in pypi archive
-      #:modules '((guix build pyproject-build-system)
-                  (guix build utils)
-                  (ice-9 textual-ports))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'adjust-setup.py
-            (lambda _
-              (substitute* "setup.py"
-                (("cmakelang/doc/README.rst")
-                 "README.rst"))
-              ;; XXX: setup.py has multiple setup() calls, breaking the 'build
-              ;; phase ; in this case the package is wrong, but conveniently
-              ;; our goal is the first setup() call, so discard what comes from
-              ;; the second one.
-              (rename-file "setup.py" "setup.py.bak")
-              (call-with-input-file "setup.py.bak"
-                (lambda (in)
-                  (call-with-output-file "setup.py"
-                    (lambda (out)
-                      (let loop ((line (get-line in))
-                                 (setup-seen #f))
-                        (unless (or (eof-object? line)
-                                    (and (string-prefix? "setup(" line)
-                                         setup-seen))
-                          (display line out)
-                          (newline out)
-                          (loop (get-line in)
-                                (or setup-seen
-                                    (string-prefix? "setup(" line))))))))))))))
-    (native-inputs (list python-setuptools))
+    (build-system python-build-system)
+    (arguments (list #:tests? #f        ;no test data in pypi archive
+                     #:phases #~(modify-phases %standard-phases
+                                  (add-after 'unpack 'adjust-setup.py
+                                    (lambda _
+                                      (substitute* "setup.py"
+                                        (("cmakelang/doc/README.rst")
+                                         "README.rst")))))))
    (inputs (list python-jinja2 python-pyyaml python-six))
    (home-page "https://github.com/cheshirekow/cmake_format/")
    (synopsis "Language tools for CMake (format, lint, etc.)")
@@ -1670,6 +1670,27 @@ SunMD5, sha1crypt, NT, bsdicrypt, bigcrypt, and descrypt.")
    (home-page "https://github.com/besser82/libxcrypt")
    (license license:lgpl2.1)))

+(define-public libxcrypt-without-failure-tokens
+  ;; This version of libxcrypt is used for guile-2.2.4, which is used in Guix
+  ;; v1.0.0 and thus needs to be supported for guix time-machine.
+  ;;
+  ;; Guile uses the 'crypt' hashing function that used to be provided by glibc,
+  ;; but was moved to libxcrypt around glibc 2.39.  However, the crypt function
+  ;; in libxcrypt works differently for invalid salt values: libxcrypt returnns
+  ;; the failure token "*0" for (crypt "pass" "$X$abc"), where glibc raised
+  ;; "Invalid argument" (EINVAL).  The --disable-failure-tokens flag lets
+  ;; libxcrypt behave in the same way as glibc.
+  ;;
+  ;; Guile 2.2.4 explicitly checks for the glibc behavior of crypt, and thus
+  ;; needs libxcrypt to be compiled with --disable-failure-tokens.
+  (hidden-package
+   (package/inherit libxcrypt
+     (name "libxcrypt-without-failure-tokens")
+     (arguments
+      (substitute-keyword-arguments (package-arguments libxcrypt)
+        ((#:configure-flags flags #~'())
+         #~(cons* "--disable-failure-tokens" #$flags)))))))
+
 (define-public keychain
  (package
    (name "keychain")
@@ -4345,53 +4345,26 @@ framework.")
 (define-public python-sqlalchemy-utils
  (package
    (name "python-sqlalchemy-utils")
-    (version "0.42.1")
+    (version "0.38.3")
    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/kvesteri/sqlalchemy-utils")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0ny1p352p0dlgrf9fnmzj7ld1rga5zj698qpla1kdaliwwh6xawn"))))
-    (build-system pyproject-build-system)
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "SQLAlchemy-Utils" version))
+        (sha256
+         (base32 "0k8z0mjhvdv302kn0nhci8b2dgw4cn2akprsf37ma1540ykgp6lz"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-flags
-      ;; XXX: These tests require additional inputs.
-      #~(list "--deselect=tests/test_views.py::TestMySqlTrivialView"
-              "--deselect=tests/functions/test_database.py::\
-TestDatabasePostgresPg8000::test_create_and_drop"
-              "--deselect=tests/functions/test_database.py::\
-TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'start-postgresql
-            (lambda* (#:key inputs tests? #:allow-other-keys)
-              (when tests?
-                (setenv "TZDIR" (search-input-directory inputs
-                                                        "share/zoneinfo"))
-                (let ((dbdir (string-append (getcwd) "/../pgdir")))
-                  (setenv "SQLALCHEMY_UTILS_TEST_POSTGRESQL_USER"
-                          "nixbld")
-                  (invoke "initdb" "-D" dbdir)
-                  (invoke "pg_ctl" "-D" dbdir
-                          "-o" (string-append "-k " dbdir)
-                          "-l" (string-append dbdir "/db.log")
-                          "start")
-	          (invoke "psql" "-h" dbdir "-d" "postgres"
-                          "-c" "CREATE DATABASE sqlalchemy_utils_test;"))))))))
-    (propagated-inputs (list python-six python-sqlalchemy))
+     '(#:tests? #f)) ; FIXME: Many tests require a running database server.
+       ;; #:phases
+       ;; (modify-phases %standard-phases
+       ;;   (replace 'check
+       ;;     (lambda _
+       ;;       (zero? (system* "py.test" "sqlalchemy_utils" "tests")))))
+    (propagated-inputs
+     (list python-six python-sqlalchemy))
    (native-inputs
-     (list postgresql
-           python-dateutil
-           python-flexmock
-           python-psycopg2
-           python-pytest
-           python-pytz
-           python-setuptools
-           tzdata-for-tests))
+     (list python-dateutil python-flexmock python-psycopg2 python-pytest
+           python-pytz))
    (home-page "https://github.com/kvesteri/sqlalchemy-utils")
    (synopsis "Various utility functions for SQLAlchemy")
    (description
@@ -4493,23 +4466,19 @@ SQLAlchemy Database Toolkit for Python.")
  (package
    (name "python-sqlite-fts4")
    (version "1.0.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/simonw/sqlite-fts4")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "05c69n4nrc9srkbih1q1wxlw6n9mb3dm7ysb47ipqjn3rp1aif11"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-setuptools))
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "sqlite-fts4" version))
+              (sha256
+               (base32
+                "034kx0ac556sywy1p4qcrc36l24w3q0xwswqv2z9s3k8yvm5xc3q"))))
+    (build-system python-build-system)
+    (native-inputs (list python-pytest))
    (home-page "https://github.com/simonw/sqlite-fts4")
    (synopsis "Python functions for working with SQLite FTS4 search")
-    (description
-     "This package provides custom SQLite functions written in Python for
-ranking documents indexed using the SQLite's FTS4 full text search
-extension.")
+    (description "This package provides custom SQLite functions written
+in Python for ranking documents indexed using the SQLite's FTS4 full
+text search extension.")
    (license license:asl2.0)))

 (define-public python-sqlite-utils
@@ -4702,41 +4671,18 @@ libraries with SQLALchemy.")
 (define-public python-psycopg2
  (package
    (name "python-psycopg2")
-    (version "2.9.11")
+    (version "2.9.6")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/psycopg/psycopg2")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "psycopg2" version))
       (sha256
-        (base32 "04l2yzbl15nrw1pcjfkqycvqn6h9phcdh1xx9ynfy3dzfscq5ly5"))))
-    (build-system pyproject-build-system)
+        (base32 "04chl9f7v7k1zssa40pmk06jvpyqiss2lpjq50dq69nqix0mhlgi"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'start-postgresql
-            (lambda* (#:key inputs tests? #:allow-other-keys)
-              (when tests?
-                (setenv "TZDIR" (search-input-directory inputs
-                                                        "share/zoneinfo"))
-                (let ((dbdir (string-append (getcwd) "/../pgdir")))
-                  (setenv "PSYCOPG2_TESTDB_USER" "nixbld")
-                  (setenv "PSYCOPG2_TESTDB_HOST" dbdir)
-                  (invoke "initdb" "-D" dbdir)
-                  (invoke "pg_ctl" "-D" dbdir
-                          "-o" (string-append "-k " dbdir)
-                          "-l" (string-append dbdir "/db.log")
-                          "start")
-	          (invoke "psql" "-h" dbdir "-d" "postgres"
-                          "-c" "CREATE DATABASE psycopg2_test;"))))))))
-    (native-inputs
-     (list postgresql
-           python-pytest
-           python-setuptools
-           tzdata-for-tests))
+     ;; Tests would require a postgresql database "psycopg2_test"
+     ;; and a running postgresql database management service.
+     '(#:tests? #f)) ; TODO re-enable after providing a test-db.
    (inputs
     (list postgresql)) ; libpq
    (home-page "https://www.psycopg.org/")
@@ -4758,16 +4704,14 @@ libraries with SQLALchemy.")
              (sha256
               (base32
                "1pkx7nj1mhacwpna7ldzqfqxd1xg8826600r0bs9ad1h93f429yh"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
-     (list
-      #:tests? #f                  ;run for psycopg below
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; This module requires 'psycopg', however psycopg needs this
-          ;; for its tests.  Disable sanity check to break the cycle.
-          (delete 'sanity-check))))
-    (native-inputs (list python-setuptools))
+     (list #:tests? #f                  ;run for psycopg below
+           #:phases
+           #~(modify-phases %standard-phases
+               ;; This module requires 'psycopg', however psycopg needs this
+               ;; for its tests.  Disable sanity check to break the cycle.
+               (delete 'sanity-check))))
    (home-page "https://www.psycopg.org/")
    (synopsis "Connection pooler for psycopg")
    (description
@@ -4878,49 +4822,23 @@ from a SQLAlchemy model (or directly from the database).")
 (define-public yoyo-migrations
  (package
    (name "yoyo-migrations")
-    (version "9.0.0")
+    (version "8.2.0")
    (source
     (origin
+       ;; We use the upstream repository, as the tests are not included in the
+       ;; PyPI releases.
       (method hg-fetch)
       (uri (hg-reference
             (url "https://hg.sr.ht/~olly/yoyo")
             (changeset (string-append "v" version "-release"))))
       (file-name (string-append name "-" version "-checkout"))
       (sha256
-        (base32 "0bn4n043y0n4dh7axwavfims2krap5dcmdaxswbadzmis3a4hxyb"))))
-    (build-system pyproject-build-system)
+        (base32 "1al030ix0w63hr4s3mqry6s0mlqdj8p242pdqks06br7c25nx3yj"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'start-postgresql
-            (lambda* (#:key inputs tests? #:allow-other-keys)
-              (when tests?
-                (delete-file "test_databases.ini")
-                (call-with-output-file "test_databases.ini"
-                  (lambda (port)
-                    (format port "[DEFAULT]
-postgresql = postgresql://nixbld@/yoyo_test~%")))
-                (setenv "TZDIR" (search-input-directory inputs
-                                                        "share/zoneinfo"))
-                (let ((dbdir (string-append (getcwd) "/../pgdir")))
-                  (setenv "PGHOST" dbdir)
-                  (setenv "PGUSER" "nixbld")
-                  (invoke "initdb" "-D" dbdir)
-                  (invoke "pg_ctl" "-D" dbdir
-                          "-o" (string-append "-k " dbdir)
-                          "-l" (string-append dbdir "/db.log")
-                          "start")
-	          (invoke "psql" "-h" dbdir "-d" "postgres"
-                          "-c" "CREATE DATABASE yoyo_test;"))))))))
-    (native-inputs
-     (list postgresql
-           python-freezegun
-           python-psycopg2
-           python-pytest
-           python-setuptools
-           tms
-           tzdata-for-tests))
+     ;; XXX: Tests require a connection to some pgsql database and psycopg
+     ;; fails to connect to it.
+     '(#:tests? #f))
    (propagated-inputs
     (list python-sqlparse python-tabulate python-importlib-metadata))
    (home-page "https://ollycope.com/software/yoyo/latest/")
@@ -5613,7 +5531,7 @@ algorithm implementations.")
  (package
    (inherit apache-arrow)
    (name "python-pyarrow")
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     (list
      ;; XXX: Test data is distributed separately in
@@ -5623,6 +5541,7 @@ algorithm implementations.")
      #:tests? #f
      #:phases
      #~(modify-phases %standard-phases
+          (delete 'build) ; XXX the build is performed again during the install phase
          (add-after 'unpack 'enter-source-directory
            (lambda _ (chdir "python")))
          (add-after 'enter-source-directory 'set-version
@@ -5666,8 +5585,7 @@ __version_tuple__ = version_tuple = (~a)~%" version version-tuple))))))
           python-cython
           python-pytest
           python-pytest-runner
-           python-setuptools-scm
-           python-setuptools))
+           python-setuptools-scm))
    (outputs '("out"))
    (home-page "https://arrow.apache.org/docs/python/")
    (synopsis "Python bindings for Apache Arrow")
@@ -5753,31 +5671,16 @@ and @code{intake-parquet}.  It supports the following compression algorithms:
 (define-public python-crate
  (package
    (name "python-crate")
-    (version "2.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/crate/crate-python")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0kk84wf7awgspdijycvhkbqvm5llp3wmwxa9n4w3qda861xn6krb"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      #~(list "--ignore=tests/testing/test_layer.py" ; Requires crate binary.
-              "--ignore=tests/client/test_http.py"))) ; XXX: fails collection.
-    (native-inputs
-     (list python-orjson
-           python-pytest
-           python-pytz
-           python-setuptools
-           python-sqlalchemy
-           python-verlib2
-           tzdata-for-tests))
-    (propagated-inputs (list python-urllib3))
+    (version "0.23.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "crate" version))
+              (sha256
+               (base32
+                "0ngmlvi320c5gsxab0s7qgq0ck4jdlcwvb6lbjhnfprafdp56vvx"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     (list python-urllib3))
    (home-page "https://github.com/crate/crate-python")
    (synopsis "CrateDB Python client")
    (description
@@ -116,23 +116,13 @@ clients.")
 (define-public xandikos
  (package
    (name "xandikos")
-    (version "0.3.0")
+    (version "0.2.12")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "xandikos" version))
-       (sha256
-        (base32 "10j7qmwcrwql4ah6q8si3nf1ljwrx99w8ipiy85bzjd3qz2vackj"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-backend #~'unittest
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'check-setup
-            (lambda _
-              (setenv "XANDIKOSPATH" (mkdtemp "/tmp/xandikospath-XXXXXX")))))))
-    (native-inputs (list python-setuptools))
+       (sha256 (base32 "0x6g5s9pkippxg429r9agp3w0xsid2vv1h45wfc3xzdfvgj6ygsr"))))
+    (build-system python-build-system)
    (propagated-inputs
     (list python-aiohttp
           python-defusedxml
@@ -141,6 +131,13 @@ clients.")
           python-jinja2
           python-multidict
           python-vobject))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              (setenv "XANDIKOSPATH" (mkdtemp "/tmp/xandikospath-XXXXXX")))))))
    (home-page "https://www.xandikos.org/")
    (synopsis "Lightweight CalDAV/CardDAV server")
    (description
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014-2016, 2018, 2021, 2024, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016-2018, 2020-2023, 2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
-;;; Copyright © 2017-2019, 2021, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017, 2018, 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -411,17 +411,17 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
 (define-public grammalecte
  (package
    (name "grammalecte")
-    (version "2.3.0")
+    (version "2.1.1")
    (source
     (origin
       (method url-fetch/zipbomb)
-       (uri (string-append "https://grammalecte.net/zip/"
+       (uri (string-append "https://grammalecte.net/grammalecte/zip/"
                           "Grammalecte-fr-v" version ".zip"))
       (sha256
-        (base32 "0kv8h0116sfcrqnpd3jv2b098ychda7v27fciq1phxw50jbj395a"))))
+        (base32 "076jv3ywdgqqzg92bfbagc7ypy08xjq5zn4vgna6j9350fkfqhzn"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:test-backend #~'unittest))
+     (list #:tests? #f)) ;no tests provided with the project
    (native-inputs
     (list python-setuptools))
    (home-page "https://grammalecte.net")
@@ -855,7 +855,7 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
              (sha256
               (base32
                "1ji5sq9jf0p44982zkb5dj2d3mrpy675k0mkyg3r17q5syz0wbia"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     (list
      #:tests? #f ;XXX: root access is required, see: <scripts/tests/test.sh>
@@ -970,31 +970,24 @@ reformatted.  It can recover lost files from at least:
    (license license:gpl2+)))

 (define-public pydf
-  (let ((commit "af38bb3b7aacbcc32271e6dafa8b8b0a77ffead8")
-        (revision "0"))
-    (package
-      (name "pydf")
-      (version (git-version "15" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/garabik/pydf")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "18ljigg8zm9pc3qg3alpyh3n4a4f1wcza4p36cchjn2vd4466jf4"))))
-      (build-system pyproject-build-system)
-      (arguments (list #:tests? #f)) ; No tests.
-      (native-inputs (list python-setuptools))
-      (home-page "http://kassiopeia.juls.savba.sk/~garabik/software/pydf/")
-      (synopsis "Colourised @command{df} clone")
-      (description
-       "All-singing, all-dancing, fully colourised @command{df} clone written
-in Python.  It displays the amount of disk space available on the mounted file
-systems, using different colours for different types of file systems.  Output
-format is completely customizable.")
-      (license license:public-domain))))
+  (package
+    (name "pydf")
+    (version "12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pydf" version))
+       (sha256
+        (base32
+         "0f8ly8xyp93i2hm9c0qjqd4y86nz73axw2f09z01mszwmg1sfivz"))))
+  (build-system python-build-system)
+  (home-page "http://kassiopeia.juls.savba.sk/~garabik/software/pydf/")
+  (synopsis "Colourised @command{df} clone")
+  (description "All-singing, all-dancing, fully colourised @command{df} clone
+written in Python.  It displays the amount of disk space available on the
+mounted file systems, using different colours for different types of file
+systems.  Output format is completely customizable.")
+  (license license:public-domain)))

 (define-public f3
  (package
@@ -695,16 +695,16 @@ them do this.")
 (define-public python-django-allauth
  (package
    (name "python-django-allauth")
-    (version "65.9.0")
+    (version "65.7.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-              (url "https://codeberg.org/allauth/django-allauth")
+             (url "https://github.com/pennersr/django-allauth")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "03a7175748533rw6h3grfpv86i3qb31ixw0kb2kj90gc77sh1sw2"))))
+        (base32 "1k5b3x7pdysb21vbqx7pxi9cm72yj057mm1clg19ymiqj4kq8yfl"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -740,7 +740,7 @@ them do this.")
           python-pytest-asyncio
           python-pytest-django
           python-setuptools))
-    (home-page "https://codeberg.org/allauth/django-allauth")
+    (home-page "https://github.com/pennersr/django-allauth")
    (synopsis "Set of Django applications addressing authentication")
    (description
     "Integrated set of Django applications addressing authentication,
@@ -253,10 +253,10 @@ management tool.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0m5ifgxdhcf7yci0ncgnxjas879sksrf3im0fahs573g268farz9"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    ;; Integration tests need a running Docker daemon.
    (arguments (list #:tests? #f))
-    (native-inputs (list python-setuptools))
+    (native-inputs '())
    (inputs (modify-inputs (package-inputs python-docker)
              (prepend python-six)
              (delete "python-urllib3")))
@@ -264,9 +264,6 @@ management tool.")
     (modify-inputs (package-propagated-inputs python-docker)
       (prepend python-docker-pycreds python-urllib3-1.26)))))

-;; Needed for old v1 of docker-compose; remove once Docker is updated to a
-;; more recent version which has the command "docker compose" built-in, see:
-;; <https://codeberg.org/guix/guix/milestone/30347>.
 (define-public python-dockerpty
  (package
    (name "python-dockerpty")
@@ -278,11 +275,9 @@ management tool.")
       (sha256
        (base32
         "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:tests? #f)) ; XXX: Requires outdated python-expects
+    (build-system python-build-system)
    (native-inputs
-     (list python-setuptools python-six))
+     (list python-six))
    (home-page "https://github.com/d11wtq/dockerpty")
    (synopsis "Python library to use the pseudo-TTY of a Docker container")
    (description "Docker PTY provides the functionality needed to operate the
@@ -303,7 +298,7 @@ client.")
       (sha256
        (base32
         "1dq9kfak61xx7chjrzmkvbw9mvj9008k7g8q7mwi4x133p9dk32c"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    ;; TODO: Tests require running Docker daemon.
    (arguments
     (list
@@ -315,7 +310,6 @@ client.")
              (substitute* "setup.py"
                ((", < 6")
                 "")))))))
-    (native-inputs (list python-setuptools))
    (inputs
     (list python-cached-property
           python-distro
@@ -581,10 +581,7 @@ calendars, equations, and other features as extensions of Markdown syntax.")
                 (replace 'build
                   (lambda _
                     (invoke #$(cc-for-target)
-                             "-O2" "-g"
-                             ;; XXX: Relax gcc 14 strictness.
-                             "-Wno-int-conversion"
-                             "-o" "stddoc" "stddoc.c")
+                             "-O2" "-g" "-o" "stddoc" "stddoc.c")
                     (with-input-from-file "stddoc.c"
                       (lambda _
                         (with-output-to-file "stddoc.c.html"
@@ -66,7 +66,6 @@
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #: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 qt)
@@ -89,7 +88,6 @@
  #:use-module (guix build-system cmake)
  #: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)
@@ -378,48 +376,47 @@ to open the application in a web browser, for offline usage.")
       (uri (list
             ;; XXX: Upstream does not exist anymore.
             ;; (string-append "http://www.bipede.fr/downloads/logiciels/"
-             ;; "ToutEnClic-" version "-src.zip")
-             (string-append "https://archive.org/download/tout-en-clic-"
-                            version "-src/ToutEnClic-" version "-src.zip")))
+             ;;                "ToutEnClic-" version "-src.zip")
+             (string-append "https://archive.org/download/tout-en-clic-" version
+                            "-src/ToutEnClic-" version "-src.zip")))
       (sha256
        (base32 "0xg24p925rl5bfqsq3jb2lrkidb0f3kbmay5iyxxmjsn3ra0blyh"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
-     (list
-      #:tests? #f ;no tests
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'build)
-          (replace 'install
-            (lambda _
-              (let ((share (string-append #$output "/share/toutenclic"))
-                    (bin (string-append #$output "/bin"))
+     `(#:tests? #f                      ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (share (string-append out "/share/toutenclic"))
+                    (pixmaps (string-append out "/share/pixmaps"))
+                    (doc (string-append out "share/doc/" ,name "-" ,version))
+                    (bin (string-append out "/bin"))
                    (executable "toutenclic"))
-                ;; Install icon.
-                (install-file "toutenclic.png"
-                              (string-append #$output "/share/pixmaps"))
-                ;; Move files into "share/" directory.
-                (for-each (lambda (f)
-                            (install-file f share))
-                          (find-files "." "\\.py$"))
-                ;; Install documentation.
-                (install-file "ToutEnClic.pdf"
-                              (string-append #$output "share/doc/"
-                                             #$name "-" #$version))
-                ;; Create executable in "bin/".
-                (mkdir-p bin)
-                (with-directory-excursion bin
-                  (symlink (string-append share "/" executable ".py")
-                           executable)))))
-          (add-after 'install 'create-desktop-file
-            (lambda _
-              (let ((applications (string-append #$output "/share/applications")))
-                (mkdir-p applications)
-                (call-with-output-file (string-append applications
-                                                      "/toutenclic.desktop")
-                  (lambda (file)
-                    (format file
-                     "[Desktop Entry]~@
+               ;; Install icon.
+               (install-file "toutenclic.png" pixmaps)
+               ;; Move files into "share/" directory.
+               (for-each (lambda (f) (install-file f share))
+                         (find-files "." "\\.py$"))
+               ;; Install documentation.
+               (install-file "ToutEnClic.pdf" doc)
+               ;; Create executable in "bin/".
+               (mkdir-p bin)
+               (with-directory-excursion bin
+                 (symlink (string-append share "/" executable ".py")
+                          executable)))))
+         (add-after 'install 'create-desktop-file
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (applications (string-append out "/share/applications")))
+               (mkdir-p applications)
+               (call-with-output-file
+                   (string-append applications "/toutenclic.desktop")
+                 (lambda (file)
+                   (format file
+                           "[Desktop Entry]~@
                            Name=ToutEnClic~@
                            Comment=For schooling without difference~@
                            Exec=~a/bin/toutenclic~@
@@ -427,16 +424,18 @@ to open the application in a web browser, for offline usage.")
                            Terminal=false~@
                            Icon=toutenclic~@
                            Type=Application~%"
-                     #$output)))))))))
-    (native-inputs (list unzip python-setuptools))
-    (inputs (list python-pyqt))
+                           out)))))))))
+    (native-inputs
+     (list unzip))
+    (inputs
+     (list python-pyqt))
    (synopsis "School tools for physically disabled children")
-    (description
-     "ToutEnClic is intended to facilitate the schooling of physically
-disabled children in ordinary schools.  It is both a multi-page virtual
-exercise book and a kit including pencil, scissors, glue, ruler, compass,
-protractor and square.  A virtual keyboard is also available if the child does
-not have any other specialized device.")
+    (description "ToutEnClic is intended to facilitate the schooling
+of physically disabled children in ordinary schools.  It is both
+a multi-page virtual exercise book and a kit including pencil,
+scissors, glue, ruler, compass, protractor and square.  A virtual
+keyboard is also available if the child does not have any other
+specialized device.")
    (home-page "https://bipede.fr/contrib/")
    (license license:gpl3)))

@@ -1005,7 +1004,7 @@ learning for programming languages.")
 (define-public mazo
  (package
    (name "mazo")
-    (version "1.2.1")
+    (version "1.1.0")
    (source
     (origin
       (method git-fetch)
@@ -1014,37 +1013,43 @@ learning for programming languages.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0mwhd8y3xs57rbaarpi1ams5i0kndizdpns4ym7dmnnn7s9g1xq8"))))
-    (build-system pyproject-build-system)
+        (base32 "14nk3qsj6lg7wp2ws8lxhb4hyjnczvw1cn9f3m466dkkfimp7ygf"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'build)
-          (replace 'check
-            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-              (when tests?
-                (setenv "HOME" (getcwd))
-                (invoke "python3" "manage.py" "test"))))
-          (replace 'install
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (let* ((bin (string-append #$output "/bin"))
-                     (script (string-append bin "/mazo"))
-                     (share (string-append #$output "/share"))
-                     (help (string-append share "/help/C/mazo")))
-                (mkdir-p help)
-                (mkdir-p bin)
-                (copy-file "mazo.py" script)
-                (chmod script #o555)
-                (install-file "icons/mazo.svg"
-                              (string-append share
-                                             "/icons/hicolor/scalable/apps"))
-                (install-file "lugare.ulkeva.Mazo.desktop"
-                              (string-append share "/applications"))
-                (copy-recursively "help/C/mazo" help)
-                (copy-recursively "mazo"
-                                  (string-append (site-packages inputs outputs)
-                                                 "/mazo"))))))))
+     `(#:use-setuptools? #f
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build)
+         (replace 'check
+           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+             (when tests?
+               (let* ((out (assoc-ref outputs "out"))
+                      (home (string-append out "/tmp")))
+                 (add-installed-pythonpath inputs outputs)
+                 (setenv "HOME" home)
+                 (invoke "python3" "manage.py" "test")))))
+         (replace 'install
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (script (string-append bin "/mazo"))
+                    (share (string-append out "/share"))
+                    (help (string-append share "/help/C/mazo"))
+                    (icons (string-append
+                            share
+                            "/icons/hicolor/scalable/apps"))
+                    (apps (string-append share "/applications"))
+                    (site (string-append
+                           (site-packages inputs outputs)
+                           "/mazo")))
+               (mkdir-p help)
+               (mkdir-p bin)
+               (copy-file "mazo.py" script)
+               (chmod script #o555)
+               (install-file "icons/mazo.svg" icons)
+               (install-file "lugare.ulkeva.Mazo.desktop" apps)
+               (copy-recursively "help/C/mazo" help)
+               (copy-recursively "mazo" site)))))))
    (native-inputs
     (list python-django
           python-django-cleanup
@@ -1066,9 +1071,8 @@ learning for programming languages.")
           yelp))
    (home-page "https://luis-felipe.gitlab.io/mazo/")
    (synopsis "Memorize concepts using multimedia flash cards")
-    (description
-     "Mazo is a learning application that helps you memorize simple concepts
-using multimedia flash cards and spaced reviews.")
+    (description "Mazo is a learning application that helps you memorize
+simple concepts using multimedia flash cards and spaced reviews.")
    (license license:public-domain)))

 (define-public hardv
@@ -737,110 +737,6 @@ used in the declarative section of design units.")
      (native-inputs
       '()))))

-(define-public klayout
-  (package
-    (name "klayout")
-    (version "0.30.5")
-    (source
-     (origin (method git-fetch)
-             (uri (git-reference
-                    (url "https://github.com/KLayout/klayout")
-                    (commit (string-append "v" version))))
-             (file-name (git-file-name name version))
-             (sha256
-              (base32
-               "1ixl8wzpiaw6frb28x9y9jy3fvhjclmn4xl77i72rs37rf4i2a2s"))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:install-plan
-      #~'(("output/klayout" "bin/")
-          ("output/" "bin/" #:include-regexp ("strm.*"))
-          ("output/" "lib/" #:include-regexp ("lib.*\\.so.*"))
-          ("output/pymod" "lib/"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'patch-build-script ;; ensure reproducibility
-            (lambda _
-              (substitute* "build.sh"
-                (("KLAYOUT_VERSION_DATE=\"\\$KLAYOUT_VERSION_DATE\"")
-                 "KLAYOUT_VERSION_DATE=1970-01-01"))))
-          (add-after 'patch-build-script 'disable-failing-tests
-            (lambda _
-              (substitute* "src/tl/unit_tests/unit_tests.pro"
-                ;; These need internet connection.
-                (("  tlWebDAVTests\\.cc")
-                 "# tlWebDAVTests.cc \\")
-                (("  tlGitTests\\.cc")
-                 "# tlGitTests.cc \\")
-                (("  tlHttpStreamTests\\.cc")
-                 "# tlHttpStreamTests.cc \\")
-                ;; The threaded tests are reportedly flaky.
-                (("  tlThreadedWorkersTests\\.cc")
-                 "# tlThreadedWorkersTests\\.cc \\"))
-              (substitute* "src/rba/rba.pro"
-                ;; There are issues of non-detereminism involved with Ruby's GC
-                ;; implementation. https://github.com/KLayout/klayout/issues/2251
-                (("SUBDIRS = rba unit_tests")
-                 "SUBDIRS = rba")
-                (("unit_tests.depends += rba")
-                 ""))))
-          (add-after 'disable-failing-tests 'build
-            (lambda _
-              (invoke "bash" "build.sh"
-                      "-prefix" "output"
-                      "-option"
-                      (string-append "-j" (number->string (parallel-job-count))))))
-          (add-after 'install 'patch-elfs
-            (lambda _
-              (let* ((lib (string-append #$output "/lib"))
-                     (layout-lib (string-append lib "/lay_plugins"))
-                     (db-lib (string-append lib "/db_plugins"))
-                     (bin (string-append #$output "/bin"))
-                     (executables (filter executable-file? (find-files #$output)))
-                     (ut-runner "build-release/ut_runner")
-                     (unit-tests (cons* ut-runner
-                                        (find-files "build-release" "\\.ut")))
-                     (patchem (lambda (elf)
-                                (when (not (string-suffix? ".py" elf))
-                                  (invoke "patchelf" "--add-rpath" lib elf)
-                                  (invoke "patchelf" "--add-rpath" layout-lib elf)
-                                  (invoke "patchelf" "--add-rpath" db-lib elf)))))
-                (map patchem executables)
-                (map patchem unit-tests)
-                (patchem ut-runner))))
-          (add-after 'patch-elfs 'check-after-install
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (with-directory-excursion "build-release"
-                  (mkdir "testtmp")
-                  (setenv "TESTTMP" "testtmp")
-                  (setenv "TESTSRC" "..")
-                  (setenv "LD_LIBRARY_PATH" ".")
-                  (setenv "QT_QPA_PLATFORM" "offscreen")
-                  (setenv "HOME" "/tmp/home") ;; Fontconfig needs a writable cache.
-                  (invoke "./ut_runner"))))))))
-    (native-inputs (list perl python qtsvg ruby tcl))
-    (inputs
-     (list bash-minimal
-           libgit2
-           patchelf
-           qt5compat
-           qtbase
-           qtmultimedia
-           qtsvg
-           qttools))
-    (home-page "https://www.klayout.de")
-    (synopsis "Mask layout editor")
-    (description "KLayout is @acronym{EDA, Electronic Design Automation}
-software.  It is a scriptable @acronym{VLSI, Very Large Scale Integration}
-layout editor used for visualizing and editing mask data, transcoding between
-different file formats (GDSII and OASIS), executing @acronym{DRC, Design rule
-checking}, @acronym{LVS, Layout Versus Schematic} verification, and drawing of
-chip cross-sections basked on mask data.")
-    ;; The license version will be clarified with the next version bump.
-    (license license:gpl3+)))
-
 (define-public libngspice
  ;; Note: The ngspice's build system does not allow us to build both the
  ;; library and the executables in one go.  Thus, we have two packages.
@@ -163,7 +163,6 @@
 ;;; Copyright @ 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright @ 2025 Nik Gaffney <nik@fo.am>
 ;;; Copyright © 2025 Untrusem <mysticmoksh@riseup.net>
-;;; Copyright © 2025 case_lambda <case_lambda@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -312,7 +311,6 @@
  #:use-module (gnu packages ocaml)
  #:use-module (gnu packages erlang)
  #:use-module (gnu packages search)
-  #:use-module (gnu packages ssh)
  #:use-module (gnu packages statistics)
  #:use-module (gnu packages libcanberra)
  #:use-module (gnu packages telegram)
@@ -715,33 +713,6 @@ files, provide Age encrypted authentication information out of
@file{.authinfo.age}, open/edit/save Age encrypted files via Tramp...")
    (license license:gpl3+)))

-(define-public emacs-balanced-windows
-  (let ((commit "1da5354ad8a9235d13928e2ee0863f3642ccdd13")
-        (revision "0"))
-    (package
-      (name "emacs-balanced-windows")
-      (version (git-version "1.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-            (url "https://github.com/wbolster/emacs-balanced-windows")
-            (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1hsjg48jlfi6lc6izp9xcfqvxj7c0ivjrfsr2q3yv3s1iy2fz37l"))))
-      (build-system emacs-build-system)
-      (arguments (list #:tests? #f)) ;there are no tests
-      (home-page "https://github.com/wbolster/emacs-balanced-windows/")
-      (synopsis "Automatically balance Emacs windows")
-      (description
-       "This Emacs package provides a global minor mode to automatically
-balance windows (keeping them roughly the same size) whenever the window
-configuration changes, e.g. after splitting or deleting a window.")
-      (license license:bsd-3))))
-
 (define-public emacs-bookmark-plus
  (package
    (name "emacs-bookmark-plus")
@@ -11301,11 +11272,11 @@ not hang at all.")
    (license license:gpl3+)))

 (define-public emacs-elastic-modes
-  (let ((commit "c577e8921a4d9bd77742729707152bc557fae3e2")
-        (revision "2"))
+  (let ((commit "ea49bb03b78cb9fd17655990223e3095f137a3ce")
+        (revision "1"))
    (package
      (name "emacs-elastic-modes")
-      (version (git-version "1.0.0" revision commit))
+      (version "1.0.0")
      (source (origin
                (method git-fetch)
                (uri (git-reference
@@ -11314,7 +11285,7 @@ not hang at all.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "0r40g7zgz9072x74qbnv8lmql0gajsz2p8b8jckmgyniakmln69v"))))
+                  "1dkigkjw4i9nz5rl0dnic16ljdnp5cyz2xic3hc2myqnjlqnc6z6"))))
      (build-system emacs-build-system)
      (arguments (list #:tests? #false)) ;no tests
      (propagated-inputs (list emacs-dash))
@@ -22809,91 +22780,6 @@ window (using the fringe, by default), allows you to jump between the hunks
 and revert them selectively.")
    (license license:gpl3+)))

-(define-public emacs-difftastic
-  ;; No releases or tags.
-  (let ((commit "5a23176610b7181f52b7088cbdf1d2a95691b27e")
-        (revision "0"))
-    (package
-      (name "emacs-difftastic")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/pkryger/difftastic.el/")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "0nl1kcaxgq67338knfhmxxmxl5npsvjvvs3z7s8m5z4wpknsn1rd"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:test-command
-        #~(list "emacs" "--batch"
-                "-l" "test/difftastic.t.el"
-                "-l" "test/difftastic-bindings.t.el"
-                "-f" "ert-run-tests-batch-and-exit")
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-before 'check 'unpack-el-mock
-              (lambda _
-                (install-file
-                 (string-append
-                  #$(this-package-native-input "el-mock") "/el-mock.el")
-                 ".")))
-            ;; 11/435 tests fail.
-            (add-before 'check 'skip-failing-tests
-              (lambda _
-                (let ((skip-tests
-                       `("-forge-pullreq-show-diff-args:buffer-post-object"
-                         "-forge-pullreq-show-diff-args:current-topic"
-                         ,(string-append
-                           "-forge-pullreq-show-diff-args"
-                           ":new-pullreq-with-base-and-head")
-                         "-forge-pullreq-show-diff-args:single-prefix-argument"
-                         "-magit-diff-buffer-file:no-file"
-                         "-forge-pullreq-show-diff-args:triple-prefix-argument"
-                         "forge-create-pulreq-show-diff:basic"
-                         "forge-pullreq-show-diff:basic"
-                         "forge-pullreq-show-diff:double-prefix-arg"
-                         "forge-pullreq-show-diff:single-prefix-arg"
-                         "forge-pullreq-show-diff:triple-prefix-arg")))
-                  (substitute* "test/difftastic.t.el"
-                    (("\\(ert-deftest difftastic-([a-z:-]*) \\(\\)" all test)
-                     (if (member test skip-tests)
-                         (string-append all "(skip-unless nil)")
-                         all))))))
-            (add-after 'unpack 'substitute-python-path
-              (lambda* (#:key inputs #:allow-other-keys)
-                (emacs-substitute-variables "difftastic.el"
-                  ("difftastic-executable"
-                   (search-input-file inputs "/bin/difft"))))))))
-      (inputs
-       (list difftastic))
-      (propagated-inputs
-       (list emacs-compat emacs-magit))
-      (native-inputs
-       (list
-        ;; This package uses a custom version of el-mock for the tests.
-        (origin
-          (method git-fetch)
-          (uri (git-reference
-                 (url "https://github.com/pkryger/el-mock.el")
-                 (commit "8fb750784faf07445033441bd86485fecfdb9413")))
-          (file-name "el-mock")
-          (sha256
-           (base32
-            "1qbcj952hrrpr26rh8q77vf5i35nzkbsrqdvj7rrc307dp0n2gsv")))))
-      (home-page "https://github.com/pkryger/difftastic.el/")
-      (synopsis "Wrapper interface for @code{difft} command line tool")
-      (description
-       "This package integrates @code{difftastic} structural diff tool into
-Emacs.  It automatically displays @code{difftastic} output within Emacs using
-faces from the user theme, ensuring consistency with overall coding
-environment.")
-      (license license:gpl3+))))
-
 (define-public emacs-diminish
  ;; XXX: Upstream did not tag last release.
  (let ((commit "fd486ef76e4c1d8211ae337a43b8bba106d4bca7")
@@ -38904,44 +38790,6 @@ global minor mode whose purpose is to automatically feed TRAMP sub-processes
 with passwords for paths matching regexps.")
      (license license:gpl3+))))

-(define-public emacs-ssh-tunnels
-  ;; There are no tags or releases upstream.
-  (let ((commit "5010d779edef33f869065231b99d74723c9c7eaf")
-        (revision "0"))
-    (package
-      (name "emacs-ssh-tunnels")
-      (version (git-version "1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/death/ssh-tunnels")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "15pwgc9s7f5fjmx2savjrpwr6qcpp0s9iy0y10abpy63np4krc62"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f                     ;no tests
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'set-ssh-location
-              (lambda* (#:key inputs #:allow-other-keys)
-                (emacs-substitute-variables "ssh-tunnels.el"
-                  ("ssh-tunnels-program"
-                   (search-input-file inputs "/bin/ssh"))))))))
-      (inputs (list openssh))
-      (propagated-inputs (list emacs-helm))
-      (home-page "https://github.com/death/ssh-tunnels")
-      (synopsis "Manipulate @code{ssh} tunnels from Emacs")
-      (description "This package provides an Emacs interface to modify,
-run and kill @code{ssh} tunnels.  It lets customise descriptions of the
-tunnels configurations, and includes an @code{emacs-helm} interface to modify
-and act on tunnels.")
-      (license license:expat))))
-
 (define-public emacs-eacl
  (package
    (name "emacs-eacl")
@@ -43654,8 +43502,8 @@ org-mode templates.")
    (license license:gpl3+)))

 (define-public emacs-org-glossary
-  (let ((commit "97827bc323765a5f70213c62800bed50d75c2822")
-        (revision "1"))
+  (let ((commit "1b9b7fd3d1e6c214c34463e568daaba6df00ec27")
+        (revision "0"))
    (package
      (name "emacs-org-glossary")
      (version (git-version "0.0.1" revision commit))
@@ -43667,7 +43515,7 @@ org-mode templates.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0qd1ikc602nnhhm0czv4gn9b1g4jqhjbnnz93ba2pjimgssmb58w"))))
+          (base32 "09mg8aqxamnxx8kpdyk074wf2wkm4rx62z7q66azw70hjr1ggwa3"))))
      (build-system emacs-build-system)
      (arguments
       (list
@@ -45666,35 +45514,27 @@ buffer.")
    (license license:gpl3+)))

 (define-public emacs-setup
-  ;; No tagged releases; this commit reflects the version bump on the source
-  (let ((commit "5a69dab9bb79d8bebaaa9bc14795cbaafd1c2423"))
-    (package
-      (name "emacs-setup")
-      (version "1.5.0")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://codeberg.org/pkal/setup.el")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1pa5k36pkgvp8als0ngxgy17x0gja9j26qydw3wwawkslssl5kbx"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ; No tests.
-      (home-page "https://codeberg.org/pkal/setup.el")
-      (synopsis "Helpful configuration macro")
-      (description
-       "The @code{setup} macro simplifies repetitive configuration patterns,
-by providing context-sensitive local macros in @code{setup} bodies.  These
-macros can be mixed with regular elisp code without any issues, allowing for
-flexible and terse configurations.  The list of local macros can be extended
-by the user via @code{setup-define}.  A list of currently known local macros
-are documented in the docstring for @code{setup}.")
-      (license license:gpl3+))))
+  (package
+    (name "emacs-setup")
+    (version "1.5.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://elpa.gnu.org/packages/setup-"
+                            version ".tar"))
+        (sha256
+          (base32 "184g3kd9caxyhwq41w94spkjs1j45vblg4sqfb5h5pqb5h9p95n5"))))
+    (build-system emacs-build-system)
+    (home-page "https://git.sr.ht/~pkal/setup")
+    (synopsis "Helpful configuration macro")
+    (description
+"The @code{setup} macro simplifies repetitive configuration patterns, by
+providing context-sensitive local macros in @code{setup} bodies.  These macros
+can be mixed with regular elisp code without any issues, allowing for
+flexible and terse configurations.  The list of local macros can be
+extended by the user via @code{setup-define}.  A list of currently known
+local macros are documented in the docstring for @code{setup}.")
+    (license license:gpl3+)))

 (define-public emacs-tomelr
  (package
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013-2017, 2019, 2021-2022, 2025 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
@@ -464,22 +464,19 @@ editor (console only)")
                          (string-append (getenv "LIBRARY_PATH")
                                         ":" libgccjit-libdir)))))
            (add-after 'unpack 'patch-compilation-driver
-              (lambda* (#:key inputs #:allow-other-keys)
+              (lambda _
                (substitute* "lisp/emacs-lisp/comp.el"
                  (("\\(defcustom native-comp-driver-options nil")
                   (format
                    #f "(defcustom native-comp-driver-options '(~@{~s~^ ~})"
                    (string-append
-                     "-B" (dirname (search-input-file inputs "/bin/nm")))
+                     "-B" #$(this-package-input "binutils") "/bin/")
                    (string-append
-                     "-B" (dirname (search-input-file inputs "/lib/libc.so")))
+                     "-B" #$(this-package-input "glibc") "/lib/")
                    (string-append
-                     "-B" (dirname (search-input-file inputs "/lib/libgccjit.so")))
+                     "-B" #$(this-package-input "libgccjit") "/lib/")
                    (string-append
-                     "-B" (string-append
-                           (dirname
-                            (search-input-file inputs "/lib/libgccjit.so"))
-                           "/gcc")))))))
+                     "-B" #$(this-package-input "libgccjit") "/lib/gcc/"))))))
            (add-after 'build 'build-trampolines
              (lambda* (#:key make-flags #:allow-other-keys)
                (apply invoke "make" "trampolines" make-flags)))
@@ -501,7 +498,11 @@ editor (console only)")
    (inputs
     (modify-inputs (package-inputs emacs-minimal)
       (prepend gnutls
+                ;; To "unshadow" ld-wrapper in native builds
+                (make-ld-wrapper "ld-wrapper" #:binutils binutils)
                ;; For native compilation
+                binutils
+                (libc-for-target)
                libgccjit

                ;; Avoid Emacs's limited movemail substitute that retrieves POP3
@@ -91,7 +91,6 @@
  #:use-module (gnu packages graphics)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages image)
-  #:use-module (gnu packages image-processing)
  #:use-module (gnu packages kde-frameworks)
  #:use-module (gnu packages libedit)
  #:use-module (gnu packages libusb)
@@ -110,12 +109,9 @@
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages serialization)
  #:use-module (gnu packages qt)
-  #:use-module (gnu packages robotics)
  #:use-module (gnu packages sdl)
  #:use-module (gnu packages sphinx)
-  #:use-module (gnu packages stb)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages textutils)
@@ -3729,165 +3725,6 @@ hardware states and PS2 system memory.  This allows you to play PS2 games on
 your PC, with many additional features and benefits.")
    (license license:gpl3+)))

-(define-public rpcs3
-  ;; NB: When updating to a new release, don't forget to check if any more
-  ;; libraries can be linked dynamically, and to update the commits for any
-  ;; specialized sources included in native-inputs so that they match the
-  ;; sub-modules in ./3rdparty.
-  (package
-    (name "rpcs3")
-    (version "0.0.38")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/RPCS3/rpcs3")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0dwrfjs9b3ldwyn68nmyf0qip4hm1w8c3picdl3zk7z76j7rrhal"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:configure-flags
-      #~(list
-         ;; -fexceptions is needed to compile part of yaml-cpp.
-         "-DCMAKE_CXX_FLAGS=-fexceptions"
-         ;; "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native,
-         ;; which is useful for local builds, but not good for packages."
-         "-DUSE_NATIVE_INSTRUCTIONS=OFF"
-         "-DWITH_LLVM=ON"
-         "-DBUILD_LLVM=OFF"
-         "-DSTATIC_LINK_LLVM=OFF"
-         "-DUSE_FAUDIO=ON"
-         "-DUSE_LIBEVDEV=ON"
-         "-DUSE_DISCORD_RPC=OFF"
-         "-DUSE_VULKAN=ON"
-         "-DUSE_PRECOMPILED_HEADERS=OFF"
-         "-DUSE_SDL=ON"
-         "-DUSE_SYSTEM_CUBEB=ON"
-         "-DUSE_SYSTEM_CURL=ON"
-         "-DUSE_SYSTEM_FAUDIO=ON"
-         "-DUSE_SYSTEM_FFMPEG=ON"
-         "-DUSE_SYSTEM_FLATBUFFERS=ON"
-         "-DUSE_SYSTEM_GLSLANG=ON"
-         "-DUSE_SYSTEM_HIDAPI=ON"
-         "-DUSE_SYSTEM_LIBPNG=ON"
-         "-DUSE_SYSTEM_LIBUSB=ON"
-         "-DUSE_SYSTEM_MINIUPNPC=ON"
-         "-DUSE_SYSTEM_OPENAL=ON"
-         "-DUSE_SYSTEM_OPENCV=ON"
-         "-DUSE_SYSTEM_PUGIXML=ON"
-         "-DUSE_SYSTEM_RTMIDI=ON"
-         "-DUSE_SYSTEM_SDL=ON"
-         "-DUSE_SYSTEM_VULKAN_MEMORY_ALLOCATOR=ON"
-         "-DUSE_SYSTEM_WOLFSSL=ON"
-         "-DUSE_SYSTEM_ZLIB=ON"
-         "-DUSE_SYSTEM_ZSTD=ON"
-         "-DBUILD_RPCS3_TESTS=ON"
-         "-DRUN_RPCS3_TESTS=ON"
-         ;; "Choose whether to enable GameMode features or not."
-         ;; Off, for now, because GameMode requires systemd to work.
-         "-DUSE_GAMEMODE=OFF")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'add-some-submodules
-            ;; TODO: Remove as many of these as possible.
-            (lambda* (#:key inputs #:allow-other-keys)
-              (with-directory-excursion "3rdparty"
-                (rmdir "fusion/fusion")
-                (symlink (string-append
-                          (search-input-directory inputs "Fusion") "/../")
-                         "fusion/fusion")
-                (rmdir "SoundTouch/soundtouch")
-                (symlink (dirname
-                          (search-input-file inputs "soundtouch.pc.in"))
-                         "SoundTouch/soundtouch")
-                (rmdir "asmjit/asmjit")
-                (symlink (string-append
-                          (search-input-directory inputs "src/asmjit")
-                          "/../../")
-                         "asmjit/asmjit")
-                (rmdir "yaml-cpp/yaml-cpp")
-                (symlink (dirname
-                          (search-input-file inputs "yaml-cpp.pc.in"))
-                         "yaml-cpp/yaml-cpp")
-                (rmdir "stblib/stb")
-                (symlink (dirname
-                          (search-input-file inputs "stb_c_lexer.h"))
-                         "stblib/stb")))))))
-    (inputs
-     (append
-      (list cubeb
-            curl
-            eudev
-            faudio
-            ;; RPCS3 v0.0.38 uses symbols that are deprecated in ffmpeg 8.
-            ;; See https://github.com/RPCS3/rpcs3/issues/17461
-            ffmpeg-6
-            flatbuffers
-            glew
-            glslang
-            glu
-            hidapi
-            jack-2
-            libevdev
-            libglvnd
-            libpng
-            libusb-next
-            llvm-18
-            mesa
-            miniupnpc-next
-            openal
-            opencv
-            pugixml-next
-            pulseaudio
-            qtbase
-            qtmultimedia
-            qtsvg
-            rtmidi
-            sdl3
-            spirv-tools
-            vulkan-loader
-            wayland
-            wolfssl-for-rpcs3
-            zlib
-            `(,zstd "lib"))))
-    (native-inputs
-     (list
-      googletest
-      pkg-config
-      vulkan-memory-allocator
-      (package-source asmjit)
-      (package-source fusion)
-      (package-source stb)
-      (origin
-        (file-name "rpcs3-soundtouch-source")
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/RPCS3/soundtouch")
-               (commit "3982730833b6daefe77dcfb32b5c282851640c17")))
-        (sha256
-         (base32 "07q514mx69jkrz7i58c45iwj3zql88vdsa1sah7immwr1005i91y")))
-      (origin
-        (file-name "rpcs3-yaml-cpp-source")
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/RPCS3/yaml-cpp")
-               (commit "456c68f452da09d8ca84b375faa2b1397713eaba")))
-        (sha256
-         (base32 "0spp91yz1bvr9dljc7zgjf2sqw49d8b9yinlncykjwzxm7ap7jys")))))
-    (home-page "https://rpcs3.net/")
-    (synopsis "PlayStation 3 emulator")
-    (description "RPCS3 is an emulator and debugger for the Sony
-@acronym{PS3,PlayStation 3}.")
-    (license
-     (list license:gpl2                 ;core, pine_server.h
-           license:bsd-3                ;FindWayland.cmake, FindFFMPEG.cmake
-           ;;flow_layout.h, sse2neon.h, unordered_dense.h, ffx_fsr1.h,
-           ;;ffx_a.h, bcdec.hpp, LUrlParser.h, khrplatform.h
-           license:expat))))
-
 (define-public gens-gs
  (package
    (name "gens-gs")
@@ -4420,19 +4420,11 @@ G-codes to binary and vice versa.")
                 (lambda _
                   (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp"
                     (("#include <libigl/igl/qslim.h>")
-                      "#include <igl/qslim.h>"))))
-               (add-after 'install 'wrap-program
-                 (lambda _
-                   (wrap-program (string-append #$output "/bin/prusa-slicer")
-                     ;; For GtkFileChooserDialog.
-                     `("GSETTINGS_SCHEMA_DIR" =
-                       (,(string-append #$(this-package-input "gtk+")
-                                        "/share/glib-2.0/schemas")))))))))
+                      "#include <igl/qslim.h>")))))))
    (native-inputs
     (list pkg-config catch2-3.8))
    (inputs
-     (list bash-minimal
-           boost-1.83
+     (list boost-1.83
           cereal
           cgal
           curl
@@ -392,56 +392,50 @@ embedded systems.")
 (define-public python-efl
  (package
    (name "python-efl")
-    (version "1.26.1")
+    (version "1.26.0")
    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://download.enlightenment.org/rel/bindings/"
-                           "python/python-efl-" version ".tar.xz"))
-       (sha256
-        (base32 "1mr80vgbcs03rs5lbmg8pxj8hifkrzrwdrw01plik2h729z3knyw"))
-       (modules '((guix build utils)))
-       ;; Remove files generated by Cython
-       (snippet
-        '(begin
-           (for-each (lambda (file)
-                       (let ((generated-file
-                              (string-append (string-drop-right file 3) "c")))
-                         (when (file-exists? generated-file)
-                           (delete-file generated-file))))
-                     (find-files "efl" "\\.pyx$"))
-           (delete-file "efl/eo/efl.eo_api.h")))))
-    (build-system pyproject-build-system)
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://download.enlightenment.org/rel/bindings/"
+                            "python/python-efl-" version ".tar.xz"))
+        (sha256
+         (base32
+          "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"))
+        (modules '((guix build utils)))
+        ;; Remove files generated by Cython
+        (snippet
+         '(begin
+            (for-each (lambda (file)
+                        (let ((generated-file
+                                (string-append (string-drop-right file 3) "c")))
+                          (when (file-exists? generated-file)
+                            (delete-file generated-file))))
+                      (find-files "efl" "\\.pyx$"))
+            (delete-file "efl/eo/efl.eo_api.h")))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-flags
-      #~(list "tests"
-              ;; These tests try to connect to the internet.
-              "--ignore=tests/ecore/test_09_file_download.py"
-              "--ignore=tests/ecore/test_11_con.py"
-              ;; The above test ignorance probably breaks this one.
-              "--deselect=tests/ecore/test_08_exe.py::TestExe::testInit"
-              ;; This test requires access to a running Xorg server,
-              ;; /var/lib/dbus and /etc.
-              "--ignore=tests/dbus/test_01_basics.py"
-              ;; XXX: RuntimeWarning: Setting standard icon failed
-              "--ignore=tests/elementary/test_02_image_icon.py")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-flags
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((include-dir (search-input-directory inputs
-                                                         "include/dbus-1.0")))
-                (setenv "CFLAGS" (string-append "-I" include-dir)))))
-          (add-before 'check 'configure-tests
-            (lambda _
-              (setenv "HOME" "/tmp")))))) ;needed by tests
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'build
+           (lambda _
+             (setenv "ENABLE_CYTHON" "1")
+             (invoke "python" "setup.py" "build")))
+        (add-before 'build 'set-flags
+          (lambda _
+            (setenv "CFLAGS"
+                    (string-append "-I" (assoc-ref %build-inputs "python-dbus")
+                                   "/include/dbus-1.0"))))
+        (add-before 'check 'set-environment
+          (lambda _
+            ;; Some tests require write access to HOME.
+            (setenv "HOME" "/tmp")
+            ;; These tests try to connect to the internet.
+            (delete-file "tests/ecore/test_09_file_download.py")
+            (delete-file "tests/ecore/test_11_con.py"))))))
    (native-inputs
-     (list pkg-config
-           python-cython-0
-           python-pytest
-           python-setuptools))
-    (inputs (list efl python-dbus python-packaging))
+     (list pkg-config python-cython-0))
+    (inputs
+     (list efl python-dbus python-packaging))
    (home-page "https://www.enlightenment.org/")
    (synopsis "Python bindings for EFL")
    (description
@@ -692,25 +692,3 @@ as well as those for Chinese dialects.  It has the ability to compose phrases
 and sentences intelligently and provide very accurate traditional Chinese
 output.")
    (license license:lgpl2.1+)))
-
-(define-public fcitx5-hangul
-  (package
-    (name "fcitx5-hangul")
-    (version "5.1.7")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/fcitx/fcitx5-hangul")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "02lkbwg25jr4hazjyxcy69midfsmxc0ksbdrfwbmqcfa3kz5d9gb"))))
-    (build-system cmake-build-system)
-    (native-inputs (list extra-cmake-modules pkg-config gettext-minimal))
-    (inputs (list fcitx5 libhangul))
-    (home-page "https://github.com/fcitx/fcitx5-hangul")
-    (synopsis "Hangul support for Fcitx5")
-    (description
-     "This package provides the Hangul (Korean) input method engine for Fcitx5.")
-    (license license:lgpl2.1+)))
@@ -719,34 +719,34 @@ from a mounted file system.")
    (home-page "http://www.gphoto.org/proj/gphotofs/")
    (license license:gpl2+)))

-(define bcachefs-tools-rust-target
+(define (bcachefs-tools-rust-target)
  (platform-rust-target (lookup-platform-by-target-or-system
                         (or (%current-target-system)
                             (%current-system)))))

-(define bcachefs-tools-target/release
-  (string-append "target/" bcachefs-tools-rust-target "/release"))
+(define (bcachefs-tools-target/release)
+  (string-append "target/" (bcachefs-tools-rust-target) "/release"))

-(define bcachefs-tools-cargo-args
+(define (bcachefs-tools-cargo-args)
  ;; Distinct from -MAKE-FLAGS for use with ‘cargo test’ in 'check.
  #~(list "--release"
-          (string-append "--target=" #$bcachefs-tools-rust-target)))
+          (string-append "--target=" #$(bcachefs-tools-rust-target))))

 ;; XXX We want to share common make flags across different packages & phases,
 ;; but the cargo-build-system doesn't allow #:make-flags.
-(define bcachefs-tools-make-flags
+(define (bcachefs-tools-make-flags)
  ;; These result of these flags should be as minimal as possible.
  ;; Enable any optional features in the bcachefs-tools package instead.
  #~(list (string-append "CARGO_BUILD_ARGS="
-                         (string-join #$bcachefs-tools-cargo-args " "))
+                         (string-join #$(bcachefs-tools-cargo-args) " "))
          (string-append "CC=" #$(cc-for-target))
          (string-append "PKG_CONFIG=" #$(pkg-config-for-target))))

-(define bcachefs-tools-make-install-flags
+(define (bcachefs-tools-make-install-flags)
  #~(cons* (string-append "PREFIX=" #$output)
           "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
           "PKGCONFIG_UDEVRULESDIR=$(PREFIX)/lib/udev/rules.d"
-           #$bcachefs-tools-make-flags))
+           #$(bcachefs-tools-make-flags)))

 (define bcachefs-tools-minimal
  ;; This ‘minimal’ package is not *that* minimal, and not different enough to
@@ -782,7 +782,7 @@ from a mounted file system.")
                              (number->string (parallel-job-count))
                              "1")
                     (string-append "VERSION=" #$version)
-                     #$bcachefs-tools-make-flags)))
+                     #$(bcachefs-tools-make-flags))))
          (add-before 'install 'patch-install
            ;; ‘make install’ hard-codes target/release/bcachefs, which is
            ;; incorrect when passing --target, as required to cross-compile or
@@ -790,11 +790,11 @@ from a mounted file system.")
            (lambda _
              (substitute* "Makefile"
                (("target/release")
-                 #$bcachefs-tools-target/release))))
+                 #$(bcachefs-tools-target/release)))))
          (replace 'install
            (lambda _
              (apply invoke "make" "install"
-                     #$bcachefs-tools-make-install-flags))))))
+                     #$(bcachefs-tools-make-install-flags)))))))
    (native-inputs
     (list pkg-config))
    (inputs
@@ -851,7 +851,7 @@ performance and other characteristics.")
                (define bcachefs
                  (or (false-if-exception (search-input-file native-inputs
                                                             "sbin/bcachefs"))
-                      (string-append #$bcachefs-tools-target/release
+                      (string-append #$(bcachefs-tools-target/release)
                                     "/bcachefs")))

                (define (output-completions shell file)
@@ -905,16 +905,16 @@ performance and other characteristics.")
                                "1")
                       (string-append "VERSION="
                                      #$(package-version this-package))
-                       #$bcachefs-tools-make-flags)))
+                       #$(bcachefs-tools-make-flags))))
            (replace 'check
              (lambda* (#:key tests? #:allow-other-keys)
                (when tests?
-                  (apply invoke "cargo" "test" #$bcachefs-tools-cargo-args))))
+                  (apply invoke "cargo" "test" #$(bcachefs-tools-cargo-args)))))
            (replace 'install
              (lambda _
                (apply invoke "make" "install"
                       (string-append "PREFIX=" #$output)
-                       #$bcachefs-tools-make-install-flags)))))))
+                       #$(bcachefs-tools-make-install-flags))))))))
    (inputs (modify-inputs (package-inputs bcachefs-tools-minimal)
              (prepend `(,eudev "static")
                       `(,keyutils "static")
@@ -354,14 +354,14 @@ Accounting.")
 (define-public homebank
  (package
    (name "homebank")
-    (version "5.9.6")
+    (version "5.9.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://www.gethomebank.org/public/sources"
                                  "/homebank-" version ".tar.gz"))
              (sha256
               (base32
-                "0ymp7qj6im1cl66lbf9q2r8dgav3dagbhbipskg8zcgj0kz0ncph"))))
+                "1gwzj3x3rnd3f5z1fzvrl740zhpnxjcsbxlmabwgkw22l6226i4c"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     (list pkg-config intltool))
@@ -1257,6 +1257,29 @@ of Bitcoin BIP-0039.")
 Ledger Blue/Nano S.")
    (license license:asl2.0)))

+(define-public python-btchip-python
+  (package
+    (name "python-btchip-python")
+    (version "0.1.32")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "btchip-python" version))
+        (sha256
+          (base32
+            "0mcg3gfd0qk8lhral3vy9cfd4pii9kzs42q71pf6b3y0c70y1x9l"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; those require PyQt4
+    (propagated-inputs
+      (list python-ecdsa python-hidapi))
+    (home-page "https://github.com/LedgerHQ/btchip-python")
+    (synopsis "Python library to communicate with Ledger Nano dongle")
+    (description
+      "This package provides a Python library to communicate with Ledger
+Nano dongle.")
+    (license license:asl2.0)))
+
 (define-public python-trezor
  (package
    (name "python-trezor")
@@ -44,7 +44,6 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix download)
@@ -79,7 +78,6 @@
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages qt)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages swig)
@@ -492,31 +490,29 @@ Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
  (package
    (name "me-cleaner")
    (version "1.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/corna/me_cleaner")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"))
-       (file-name (git-file-name name version))))
-    (build-system pyproject-build-system)
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/corna/me_cleaner")
+                     (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"))
+              (file-name (git-file-name name version))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:tests? #f ; No tests.
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'install-documentation
-            (lambda _
-              (install-file "man/me_cleaner.1"
-                            (string-append #$output "/share/man/man1")))))))
-    (native-inputs (list python-setuptools))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-documentation
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (man (string-append out "/share/man/man1")))
+               (install-file "man/me_cleaner.1" man)
+               #t))))))
    (home-page "https://github.com/corna/me_cleaner")
    (synopsis "Intel ME cleaner")
-    (description
-     "This package provides tools for disabling Intel ME as far as possible
-(it only edits ME firmware image files).")
+    (description "This package provides tools for disabling Intel
+ME as far as possible (it only edits ME firmware image files).")
    (license license:gpl3+)

    ;; This is an Intel thing.
@@ -576,61 +576,6 @@ intended to be optimally legible for readers who are partially visually impaired
 all characters maximally distinguishable from one another.")
      (license license:silofl1.1))))

-(define-public font-atkinson-hyperlegible-next
-  (let ((commit "7925f50f649b3813257faf2f4c0b381011f434f1")
-        (revision "0"))
-    (package
-      (name "font-atkinson-hyperlegible-next")
-      (version (git-version "2.001" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url
-                "https://github.com/googlefonts/atkinson-hyperlegible-next/")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "01m59xl35xvjv07d0qwli1czgfjg2wfgv676xi71is2rirh1y71f"))))
-      (build-system font-build-system)
-      (home-page "https://www.brailleinstitute.org/freefont/")
-      (synopsis
-       "Typeface designed to increase legibility for low vision readers")
-      (description
-       "Atkinson Hyperlegible Next is an improvement of the typeface Atkinson
-Hyperlegible, including new characters, improved glyphs, and improved kerning.
-Additionally, the two previous weights has increased to six, all in upright
-and italic, allowing for greater flexibility in use.")
-      (license license:silofl1.1))))
-
-(define-public font-atkinson-hyperlegible-mono
-  (let ((commit "154d50362016cc3e873eb21d242cd0772384c8f9")
-        (revision "0"))
-    (package
-      (name "font-atkinson-hyperlegible-mono")
-      (version (git-version "2.001" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url
-                "https://github.com/googlefonts/atkinson-hyperlegible-next-mono/")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0bdhp70zniqnj14raw9krb034zrvvxhzimzqys713p8ksrndck2p"))))
-      (build-system font-build-system)
-      (home-page "https://www.brailleinstitute.org/freefont/")
-      (synopsis
-       "Monospace typeface designed to increase legibility for low vision readers")
-      (description
-       "Atkinson Hyperlegible Mono is an entirely new typeface inspired by
-Atkinson Hyperlegible.  The characters in a monospace typeface all occupy the
-same width, allowing for them to be scanned quickly in table-based and coding
-environments.  The glyphs in Atkinson Hyperlegible Mono are newly created for
-this variation, and unique to the typeface.")
-      (license license:silofl1.1))))
-
 (define-public font-lato
  (package
    (name "font-lato")
@@ -38,7 +38,6 @@
 ;;; Copyright © 2025 Arnaud Lechevallier <arnaud.lechevallier@free.fr>
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
-;;; Copyright © 2025 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -570,78 +569,38 @@ types (revolute, prismatic, wheel, etc.).")
    (license license:zlib)))

 (define-public python-anvil-parser
-  ;; Github project does not have tags.
-  (let ((commit "91a7eda55f0fb55a948d1072896430c29d906809")
+  (let ((commit "27544bb41f035617be130a209a84371cbaf837cc")
        (revision "0"))
  (package
    (name "python-anvil-parser")
-    (version (git-version "0.10.6" revision commit))
+    (version (git-version "0.9.0" revision commit))
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://github.com/0xTiger/anvil-parser2")
+             (url "https://github.com/0xTiger/anvil-parser")
             (commit commit)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "16j7kv6v782nz1fafkxkb7v2vpwfhpi1a66ak04xawg9h1fz7vkc"))))
-    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-pytest python-setuptools))
+        (base32 "196nli36pz4sllx1m8jlys661hgbxhcxr2c4545fqb4nd27hhwy7"))))
+    (build-system python-build-system)
    (propagated-inputs (list python-frozendict python-nbt))
-    (home-page "https://github.com/0xTiger/anvil-parser2")
+    (home-page "https://github.com/0xTiger/anvil-parser")
    (synopsis "Anvil file format parser")
    (description "This package provides an Anvil file format parser.")
    (license license:expat))))

-;;~4MiB of test files.
-(define python-nbt-testdata
-  (file-union
-   "python-nbt-testdata"
-   (list
-    (let ((file "Sample_World.tar.gz"))
-      `(,file
-        ,(origin
-           (method url-fetch)
-           (uri (string-append
-                 "https://github.com/twoolie/NBT/files/13199373/"
-                 file))
-           (sha256
-            (base32
-             "1s58g5zicx8ghdai2qix2aqq0fc675vfajica4h78c397crwjrl9"))))))))
-
 (define-public python-nbt
  (package
    (name "python-nbt")
    (version "1.5.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/twoolie/NBT")
-              (commit (string-append "version-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1a3mj7c18m1n5iqzwwvvlk7n65kxp3xbmccsqyap36apwpbbxyd9"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      #~(list "tests/regiontests.py" "tests/nbttests.py")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'fake-download
-            ;; Fake the download of the test tarball.
-            (lambda _
-              (substitute*
-                  "tests/downloadsample.py"
-                (("tar_file = .*")
-                 (string-append
-                  "tar_file = '"
-                  #+python-nbt-testdata
-                  "/Sample_World.tar.gz'"))))))))
-    (native-inputs
-     (list python-pytest python-setuptools))
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "NBT" version))
+              (sha256
+               (base32
+                "1i9ncrzy5zcfnxzkh2j31n9ayzxfncckzwa6fkz9vjq5fq9v4fys"))))
+    (build-system python-build-system)
    (home-page "https://github.com/twoolie/NBT")
    (synopsis "Named Binary Tag reader and writer")
    (description
@@ -1990,43 +1949,6 @@ programming languages.")
 visual novel engine, explaining all of its features.")
    (license license:expat)))

-(define-public rpatool
-  ;; XXX: No releases or version tags, see:
-  ;; <https://codeberg.org/shiz/rpatool/issues/28>.
-  (let ((revision "0")
-        (commit "74f26d5dfdd645483e02552aa766ca447ad6b191"))
-    (package
-      (name "rpatool")
-      (version (git-version "0.8" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://codeberg.org/shiz/rpatool")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "10dm8bak0dm84d1ciwzw6jd5y64invddlmcdnawnpp7jn3wrg1jb"))))
-      (build-system pyproject-build-system)
-      (arguments
-       (list
-        #:tests? #f ;no tests
-        #:phases
-        #~(modify-phases %standard-phases
-            (delete 'build)
-            (replace 'install
-              (lambda _
-                (install-file "rpatool"
-                              (string-append #$output "/bin")))))))
-      (home-page "https://codeberg.org/shiz/rpatool")
-      (synopsis "Tool to work with Ren'Py archives")
-      (description
-       "@samp{rpatool} is a simple tool allowing you to create, modify and
-extract @url{https://www.renpy.org/,Ren'Py} Archive files
-(@code{.rpa}/@code{.rpi}).  Currently, only writing RPAv2/RPAv3 archives is
-supported.")
-      (license license:wtfpl2))))
-
 (define-public python-pyxel
  ;; Note to updaters: Use commit and revision even if you're bumping
  ;; to a release, as upstream is known to "reuse" tags.
@@ -2172,40 +2094,36 @@ robust and compatible with many systems and operating systems.")
    (license license:zlib)))

 (define-public mc2mt
-  ;; No tags in the repository.
  (let ((commit "039dbc26466a430e03c646dc5a9bd0822637a87a")
        (revision "0"))
-    (package
-      (name "mc2mt")
-      (version (git-version "0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/listia/mc2mt")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1vnaznwgm87x0n5dp14363p2h54lpzalynrrd6lbs6wgrqq7fq9i"))
-         (patches (search-patches "mc2mt-add-packaging-support.patch"))
-         (modules '((guix build utils)))))
-      (build-system pyproject-build-system)
-      (arguments
-       (list
-        #:tests? #f ; no tests
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'patch-code
-              (lambda* _
-                (substitute* "mc2mtlib/argument_parser.py"
-                  (("mineclone2") "mineclone")))))))
-      (native-inputs (list python-pytest python-setuptools))
-      (propagated-inputs (list python-anvil-parser))
-      (synopsis "Minecraft to Minetest world converter")
-      (description "@code{mc2mt} is a Minecraft to Minetest world converter.
+  (package
+    (name "mc2mt")
+    (version (git-version "0.1" revision commit))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/listia/mc2mt")
+             (commit commit)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vnaznwgm87x0n5dp14363p2h54lpzalynrrd6lbs6wgrqq7fq9i"))
+       (patches (search-patches "mc2mt-add-packaging-support.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            (substitute* "mc2mtlib/argument_parser.py"
+              (("mineclone2") "mineclone"))))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools))
+    (propagated-inputs (list python-anvil-parser))
+    (arguments
+     (list #:tests? #f)) ; no tests
+    (synopsis "Minecraft to Minetest world converter")
+    (description "@code{mc2mt} is a Minecraft to Minetest world converter.
 It can convert worlds from Minecraft 1.9 and later.")
-      (home-page "https://github.com/listia/mc2mt")
-      (license license:expat))))
+    (home-page "https://github.com/listia/mc2mt")
+    (license license:expat))))

 (define-public mygui
  (package
@@ -1544,7 +1544,7 @@ practise.")
 (define-public doom-runner
  (package
    (name "doom-runner")
-    (version "1.9.1")
+    (version "1.8.3")
    (source
     (origin
       (method git-fetch)
@@ -1553,13 +1553,10 @@ practise.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "19jq5cj6rc8d5ghd9321a2f3v0b7z928990d7dj6ynyhkpcj769p"))
-       (modules '((guix build utils)))
-       (snippet #~(delete-file-recursively "Screenshots")))) ;Save 1.4MiB.
+        (base32 "0rpywq95zy9w0wj1262x4rf84c52wg1rgf0by549qph6fybn34rn"))))
    (build-system qt-build-system)
    (arguments
     (list
-      #:qtbase qtbase
      #:tests? #f                       ;no tests
      #:modules '((guix build qt-build-system)
                  ((guix build gnu-build-system) #:prefix gnu:)
@@ -1568,37 +1565,37 @@ practise.")
      #~(modify-phases %standard-phases
          (replace 'configure
            (lambda _
+              (substitute* "DoomRunner.pro"
+                (("/usr")
+                 #$output))
              (invoke "qmake" "DoomRunner.pro" "-spec" "linux-g++"
-                      "\"CONFIG+=release\""
-                      (string-append "INSTALL_DIR=" #$output))))
+                      "\"CONFIG+=release\"")))
          (replace 'build (assoc-ref gnu:%standard-phases 'build))
          (replace 'install (assoc-ref gnu:%standard-phases 'install))
          (add-after 'install 'install-xdg
            (lambda _
-              (with-directory-excursion #$output
-                (install-file "DoomRunner" "bin/")
-                (delete-file "DoomRunner"))
              (with-directory-excursion "Install/XDG"
                (install-file "DoomRunner.desktop"
-                              (string-append #$output "/share/applications"))
-                (install-file "io.github.Youda008.DoomRunner.appdata.xml"
-                              (string-append #$output "/share/metainfo"))
-                (for-each
-                 (lambda (size)
-                   (let ((filename (simple-format #f "DoomRunner.~sx~s.png"
-                                                  size size)))
-                     (chmod filename #o444)
-                     (install-file
-                      filename
-                      (simple-format #f "~a/share/icons/hicolor/~sx~s/apps"
-                                     #$output size size))))
-                 '(16 24 32 48 64 128))))))))
+                              (string-append #$output
+                                             "/share/applications"))
+                (let ((install-icon
+                       (lambda (size)
+                         (install-file (simple-format
+                                        #f "DoomRunner.~sx~s.png"
+                                        size size)
+                                       (simple-format
+                                        #f "~a/share/icons/hicolor/~sx~s/apps"
+                                        #$output size size)))))
+                  (for-each install-icon
+                            '(16 24 32 48 64 128)))))))))
    (home-page "https://github.com/Youda008/DoomRunner")
    (synopsis "Launcher for Doom engine games")
-    (description "Doom Runner is yet another launcher of common Doom source
-ports (e.g.  GZDoom, Zandronum, PrBoom) with a graphical user interface.  It
-is written in C++ and Qt, and it is designed around the idea of presets for
-various multi-file modifications to allow one-click switching between them.")
+    (description
+     "Doom Runner is yet another launcher of common Doom source ports (like
+GZDoom, Zandronum, PrBoom, ...) with graphical user interface.  It is
+written in C++ and Qt, and it is designed around the idea of presets
+for various multi-file modifications to allow one-click switching
+between them and minimize any repetitive work.")
    (license license:gpl3)))

 (define-public falltergeist
@@ -9238,7 +9235,7 @@ original.")
 (define-public woof-doom
  (package
    (name "woof-doom")
-    (version "15.3.0")
+    (version "15.2.0")
    (source
     (origin
       (method git-fetch)
@@ -9247,29 +9244,22 @@ original.")
             (commit (string-append "woof_" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0ki7wqjhqhjxci04aksh9m8m35gi2db89475v79rjzdgk00b3mqv"))
+        (base32 "04c7hm4jnr9aiz6w4520zww6b7j86qv9xaf87hdv48cjc9sp2ljk"))
       (modules '((guix build utils)))
       (snippet '(begin
                   (with-directory-excursion "third-party"
                     (delete-file-recursively "miniz")
                     (delete-file-recursively "yyjson")
-                     (delete-file-recursively "spng")
-                     (substitute* "CMakeLists.txt"
-                       (("add_library\\(miniz.+")
-                        "find_package(miniz REQUIRED)")
-                       (("target_.+\\(miniz.+$") "")
-                       (("add_library\\(spng.+")
-                        "find_package(PkgConfig)
-pkg_search_module(spng REQUIRED spng)")
-                       (("target_.+\\(spng.+$") "")))
+                     (delete-file-recursively "spng"))
                   (delete-file-recursively "win32")
                   (substitute* (find-files "src" ".")
-                     (("miniz.h") "miniz/miniz.h"))))))
+                     (("miniz.h") "miniz/miniz.h"))))
+       (patches (search-patches "woof-doom-unbundle-spng-miniz.patch"))))
    (build-system cmake-build-system)
    (arguments
     (list
      #:tests? #f)) ;'demotest' requires internet access.
-    (native-inputs (list pkg-config python))
+    (native-inputs (list python))
    (inputs (list libebur128
                  libsndfile
                  libxmp
@@ -9280,8 +9270,8 @@ pkg_search_module(spng REQUIRED spng)")
                  spng
                  yyjson
                  fluidsynth))
-    (home-page "https://fabiangreffrath.github.io/woof/")
-    (synopsis "MBF-lineage Doom source port")
+    (home-page "https://github.com/fabiangreffrath/woof")
+    (synopsis "MBF-style Doom source port targeted at modern systems")
    (description
     "Woof! is a continuation of the MBF lineage of Doom source ports, with
 modern features such as dynamic resolution scaling, uncapped framerates,
@@ -9294,6 +9284,7 @@ UMAPINFO, DEHEXTRA, and DSDHacked specifictions.")
     (list (license:non-copyleft
            "https://bitbucket.org/jpommier/pffft/src/master/pffft.h"
            "FFTPACK license")
+           license:bsd-2
           license:bsd-3
           license:cc-by3.0
           license:cc0
@@ -205,7 +205,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
 (define-public gpxsee
  (package
    (name "gpxsee")
-    (version "15.6")
+    (version "13.22")
    (source
     (origin
       (method git-fetch)
@@ -214,7 +214,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0kfbx7vv740fkx96v3m1gywl0mdfs3mxq84hmipjksm59qi4s3yy"))))
+        (base32 "15m5rqky2fwsq5n6x531350x39wwhpv1hz56m1yfaxj7acxhb2p5"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -428,17 +428,21 @@ graphs in Graphviz's DOT language, written in pure Python.")
              (sha256
               (base32
                "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     (list
-      ;; tests: 57 passed, 1 deselected
-      #:test-flags
-      ;; The test_semicolon test fails for unknown reason, see:
-      ;; <https://github.com/kjellmf/dot2tex/issues/94>.
-      #~(list "--deselect=tests/test_dot2tex.py::MultipleStatements::test_semicolon")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "pytest" "-vv" "tests"
+                        ;; The test_semicolon test fails for unknown reason
+                        ;; (see:
+                        ;; https://github.com/kjellmf/dot2tex/issues/94).
+                        "-k" "not test_semicolon")))))))
    (native-inputs
     (list python-pytest
-           python-setuptools
           (texlive-local-tree
            (list texlive-pgf
                  texlive-preview
@@ -465,35 +469,28 @@ This approach allows:
 (define-public gprof2dot
  (package
    (name "gprof2dot")
-    (version "2025.04.14")
+    (version "2021.02.21")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-              (url "https://github.com/jrfonseca/gprof2dot")
-              (commit version)))
+             (url "https://github.com/jrfonseca/gprof2dot")
+             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0yil32pbcarwsfmhgn2zhldjj985v9p80f2yi2shkaxzfc4w6zwi"))))
-    (build-system pyproject-build-system)
+        (base32
+         "1jjhsjf5fdi1fkn7mvhnzkh6cynl8gcjrygd3cya5mmda3akhzic"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-backend #~'custom
-      #:test-flags
-      #~(list "tests/test.py"
-              "--python=bash"
-              "--max-acceptable=0"
-              (string-append "--gprof2dot=" #$output "/bin/gprof2dot"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'pre-tests
-            ;; Prevent irrelevant errors that cause test output mismatches:
-            ;; ‘Fontconfig error: No writable cache directories’
-            (lambda _
-              (setenv "XDG_CACHE_HOME" "/tmp"))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "tests/test.py")))))))
    (native-inputs
-     (list graphviz
-           python-setuptools))
+     (list graphviz))
    (home-page "https://github.com/jrfonseca/gprof2dot")
    (synopsis "Generate a dot graph from the output of several profilers")
    (description "This package provides a Python script to convert the output
@@ -1030,7 +1030,7 @@ invocations."))))
 (define-public guile-dsv
  (package
    (name "guile-dsv")
-    (version "0.8.1")
+    (version "0.8.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1039,7 +1039,7 @@ invocations."))))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0hpdl2x0lp0dqpx23l29a45lvn5c2qpd4bzrl8d46vm4nraqi7aa"))))
+                "0mc4najwji8144xzhpnrljrmh7m9iiykf3bp3lzksrwqyhz8np2k"))))
    (build-system gnu-build-system)
    (native-inputs (list autoconf
                         automake
@@ -1053,28 +1053,29 @@ invocations."))))
    (inputs (list bash-minimal guile-3.0))
    (propagated-inputs (list guile-lib guile-smc))
    (arguments
-     (list #:modules `(((guix build guile-build-system)
-                        #:select (target-guile-effective-version))
-                       ,@%default-gnu-modules)
-           #:imported-modules `((guix build guile-build-system)
-                                ,@%default-gnu-imported-modules)
-           #:phases #~(modify-phases %standard-phases
-                        (delete 'strip)
-                        (add-after 'install 'wrap-program
-                          (lambda* (#:key inputs #:allow-other-keys)
-                            (let* ((bin (string-append #$output "/bin"))
-                                   (guile-lib (assoc-ref inputs "guile-lib"))
-                                   (version (target-guile-effective-version))
-                                   (scm (string-append "/share/guile/site/" version))
-                                   (go (string-append "/lib/guile/" version
-                                                      "/site-ccache")))
-                              (wrap-program (string-append bin "/dsv")
-                                `("GUILE_LOAD_PATH" prefix
-                                  (,(string-append #$output scm)
-                                   ,(string-append guile-lib scm)))
-                                `("GUILE_LOAD_COMPILED_PATH" prefix
-                                  (,(string-append #$output go)
-                                   ,(string-append guile-lib go))))))))))
+     `(#:modules (((guix build guile-build-system)
+                   #:select (target-guile-effective-version))
+                  ,@%default-gnu-modules)
+       #:imported-modules ((guix build guile-build-system)
+                           ,@%default-gnu-imported-modules)
+       #:phases (modify-phases %standard-phases
+                  (delete 'strip)
+                  (add-after 'install 'wrap-program
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out "/bin"))
+                             (guile-lib (assoc-ref inputs "guile-lib"))
+                             (version (target-guile-effective-version))
+                             (scm (string-append "/share/guile/site/" version))
+                             (go (string-append "/lib/guile/" version
+                                                "/site-ccache")))
+                        (wrap-program (string-append bin "/dsv")
+                          `("GUILE_LOAD_PATH" prefix
+                            (,(string-append out scm) ,(string-append
+                                                        guile-lib scm)))
+                          `("GUILE_LOAD_COMPILED_PATH" prefix
+                            (,(string-append out go) ,(string-append guile-lib
+                                                       go))))) #t)))))
    (home-page "https://github.com/artyom-poptsov/guile-dsv")
    (synopsis "DSV module for Guile")
    (description
@@ -335,18 +335,21 @@ without requiring the source code to be rewritten.")
            (files '("lib/guile/2.2/site-ccache")))))))

 (define-public guile-2.2.4
-  ;; This has no dependencies, but is used in (guix quirks).
+  ;; guile-2.2.4 has no dependents, but is used in (guix quirks).
  ;; Do not remove!
  (package
    (inherit guile-2.2)
-   (version "2.2.4")
-   (source (origin
-             (inherit (package-source guile-2.2))
-             (uri (string-append "mirror://gnu/guile/guile-" version
-                                 ".tar.xz"))
-             (sha256
-              (base32
-               "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))))
+    (version "2.2.4")
+    (source
+     (origin
+       (inherit (package-source guile-2.2))
+       (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz"))
+       (sha256
+        (base32 "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))
+    ;; libxcrypt-without-failure-tokens uses --disable-failure-tokens, which is
+    ;; necessary for the "crypt: glibc EINVAL"  test of guile-2.2.4.
+    (inputs (modify-inputs (package-inputs guile-2.2)
+              (replace "libxcrypt" libxcrypt-without-failure-tokens)))))

 (define-public guile-3.0
  ;; This is the latest Guile stable version.
@@ -88,69 +88,6 @@
    (description "This package provides JSON support for Hare.")
    (license license:mpl2.0)))

-(define-public hare-lex
-  (package
-    (name "hare-lex")
-    (version "0.25.2.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~stacyharper/hare-lex")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "06jlkb1q8ybr6yx56c6ikxv5ywz44k04dpwxcc796cnpzpkgqlyf"))))
-    (build-system hare-build-system)
-    (supported-systems %hare-supported-systems)
-    (home-page "https://git.sr.ht/~stacyharper/hare-lex")
-    (synopsis "General purpose lexical tokenization machinery for Hare")
-    (description "This module provides a general purpose lexer machine for Hare.")
-    (license license:mpl2.0)))
-
-(define-public hare-irc
-  (package
-    (name "hare-irc")
-    (version "0.25.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~sircmpwn/hare-irc")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0ani8prdwjsfh8iqn5kfmkiim9ihl8dvbr28g69c037f6gbdb08v"))))
-    (build-system hare-build-system)
-    (supported-systems %hare-supported-systems)
-    (home-page "https://sr.ht/~sircmpwn/hare-irc")
-    (synopsis "IRC client protocol implementation for Hare")
-    (description "This package provides an implementation of the IRC client
-protocol for Hare programs, based on the @url{ircdocs.horse} specifications.")
-    (license license:mpl2.0)))
-
-(define-public hare-scfg
-  (package
-    (name "hare-scfg")
-    (version "0.25.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~chrisppy/hare-scfg")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1nj9gqvnvmwh3j39rj1h856p5qzghv5in01rxi4x74mqirl5q2ch"))))
-    (build-system hare-build-system)
-    (supported-systems %hare-supported-systems)
-    (home-page "https://git.sr.ht/~chrisppy/hare-scfg")
-    (synopsis "Hare library for a simple configuration file format")
-    (description "This package provides a Hare library for parsing
-@uref{https://git.sr.ht/~emersion/scfg, scfg}, a simple configuration file
-format with one directive per line.")
-    (license license:mpl2.0)))
-
 (define-public hare-ssh
  (package
    (name "hare-ssh")
@@ -172,28 +109,6 @@ format with one directive per line.")
 and agent protocols in pure Hare.")
    (license license:mpl2.0)))

-(define-public hare-template
-  (package
-    (name "hare-template")
-    (version "0.25.2.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~stacyharper/hare-template")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0mfg3ijfmii7vag1cgvr0n76hd7cic6vdf37gd05c5ilnb31ial6"))))
-    (build-system hare-build-system)
-    (inputs (list hare-lex))
-    (supported-systems %hare-supported-systems)
-    (home-page "https://git.sr.ht/~stacyharper/hare-template")
-    (synopsis "Templating tool and library for Hare")
-    (description "This package aims to offer a good and simple templating
-system for Hare, using code generation.")
-    (license license:mpl2.0)))
-
 (define-public hare-gi
  (package
    (name "hare-gi")
@@ -306,23 +221,3 @@ language.")
    (description "This package is a set of gtk-layer-shell bindings for the Hare
 language.")
    (license license:mpl2.0)))
-
-(define-public hare-xml
-  (package
-    (name "hare-xml")
-    (version "0.25.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~sircmpwn/hare-xml")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1h216z59piz1g7a0iiy1qic1wj8lbajw3mw5zw9nid0bz2vx81b0"))))
-    (build-system hare-build-system)
-    (supported-systems %hare-supported-systems)
-    (home-page "https://git.sr.ht/~sircmpwn/hare-xml")
-    (synopsis "XML support for Hare")
-    (description "This package provides XML support for Hare.")
-    (license license:mpl2.0)))
@@ -36,6 +36,7 @@
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cross-base)
+  #:use-module (gnu packages crypto)
  #:use-module (gnu packages disk)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages gawk)
@@ -594,6 +595,7 @@ exec ${system}/rc \"$@\"
    (inputs
     `(("libgcrypt" ,libgcrypt)                  ;for /hurd/random
       ("libdaemon" ,libdaemon)                  ;for /bin/console --daemonize
+       ("libxcrypt" ,libxcrypt)                  ;for password hashing
       ("unifont" ,unifont)
       ("libpciaccess" ,libpciaccess-static)

@@ -41,7 +41,6 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix utils)
  #:use-module (gnu packages)
@@ -71,7 +70,6 @@
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-check)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages python-web)
@@ -1175,11 +1173,15 @@ and does not rely on an online service.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2"))))
-    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f)) ; No tests
-    (propagated-inputs (list python-tinycss2 python-pygobject))
-    (native-inputs (list gettext-minimal python-setuptools))
+        (base32
+         "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; No tests
+    (propagated-inputs
+     (list python-tinycss2 python-pygobject))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)))
    (home-page "https://github.com/openSUSE/IBus-Theme-Tools")
    (synopsis "Tool for IBus Themes")
    (description "IBus Theme Tools can extract IBus-specific settings from
@@ -856,14 +856,14 @@ due to its architecture which automatically parallelises the image workflows.")
 (define-public gmic
  (package
    (name "gmic")
-    (version "3.6.5")
+    (version "3.5.5")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://gmic.eu/files/source/gmic_"
                           version ".tar.gz"))
       (sha256
-        (base32 "16hncbj7isxcw5al3zf62n8iwpsvbnmfclihdbgq4fnwci6yb1q9"))))
+        (base32 "1wyzq5g8kfnglb5l8ipzh6lhf4667vmcd88gd9vf55fdnvdrjygp"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -3,7 +3,7 @@
 ;;; Copyright © 2013, 2015, 2016, 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2025 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2014, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
 ;;; Copyright © 2014, 2017 John Darrington <jmd@gnu.org>
@@ -2891,25 +2891,12 @@ GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
       #:modules ((guix build python-build-system)
                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
                  (guix build utils))
-       ;; XXX: Tests are not discovered.
-       #:tests? #false
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'python3.11-compatibility
           (lambda _
             (substitute* "setup.py"
-               (("\"rU\"") "\"r\"")
-               (("test_suite='tests'.*") ""))
-             (substitute* "setup.cfg"
-               (("install-") "install_"))
-             ;; This file makes Python confuse it for a module, so we rename
-             ;; it.
-             (rename-file "lib/xml.py" "lib/xmlo.py")
-             (substitute* (find-files "." "\\.py$")
-               (("lib.xml") "lib.xmlo"))
-             ;; This procedure has been removed.
-             (substitute* "lib/gettext_setup.py"
-               (("c = gettext.bind_textdomain_codeset.*") "c = True\n"))))
+               (("\"rU\"") "\"r\""))))
         (add-after 'install 'glib-or-gtk-wrap
           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
         (add-after 'install 'wrap-program
@@ -2917,10 +2904,6 @@ GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
             (let* ((out (assoc-ref outputs "out"))
                    (gdk-pixbuf (assoc-ref inputs "gdk-pixbuf"))
                    (gtk+ (assoc-ref inputs "gtk+")))
-               ;; This is replaced with an invalid shebang.
-               (substitute* (string-append out "/bin/mypaint")
-                 (("#!python")
-                  (string-append "#!" (which "python3"))))
               (wrap-program (string-append out "/bin/mypaint")
                 `("GI_TYPELIB_PATH" ":" prefix
                   (,(getenv "GI_TYPELIB_PATH")))))))
@@ -48,6 +48,8 @@
    (build-system gnu-build-system)
    (arguments
     (list
+      #:tests? (and (not (%current-target-system))
+                    (not (target-arm32?)))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'delete-thp-test
@@ -1475,7 +1475,7 @@ you login.")
      #:test-exclude
      (string-append "("
                     (string-join
-                         '(;; Fails on an Apple M1 (aarch64) with the following error:
+                         `(;; Fails on an Apple M1 (aarch64) with the following error:
                           ;; TestColorspaces::roundtripConversion fails
                           "kwin-testColorspaces"

@@ -1517,7 +1517,9 @@ you login.")
                           "kwin-testFractionalRepaint"
                           "kwin-testDrmLegacy"
                           "kwin-testInputCapture"
-                           "kwin-testMockDrm")
+                           "kwin-testMockDrm"
+                           "kwin-testSecurityContext"
+                           "kwin-testXwaylandSelection")
                         "|")
                     ")")
      #:phases
@@ -2187,11 +2189,17 @@ the KDE Plasma 6 desktop.")
    (arguments
     (list #:qtbase qtbase
           #:test-exclude
+           ;; The tst_calibrationtool test fails on aarch64 due to floating-point
+           ;; precision: QMatrix4x4 comparison fails with tiny differences
+           ;; (1.11759e-08 instead of exact 0).
           (string-append "("
-                          (string-join '("positionertest"
+                          (string-join `("positionertest"
                                         "kcm-keyboard-keyboard_memory_\
 persister_test"
-                                         "foldermodeltest")
+                                         "foldermodeltest"
+                                         ,@(if (target-aarch64?)
+                                               '("tst_calibrationtool")
+                                               '()))
                                       "|")
                          ")")
           #:phases
@@ -870,7 +870,7 @@ noun phrases, verb phrases, etc.).")
 (define-public praat
  (package
    (name "praat")
-    (version "6.4.49")
+    (version "6.4.47")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -879,7 +879,7 @@ noun phrases, verb phrases, etc.).")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1h49ffxjrc3pxamm0b77n6jirl5pp9xm09fvb16mx1qwr0cnzi2q"))))
+                "0iyzdmgb56w80lgd4kb1cw9a0skxfbwj00q25idz7mkjij522fhi"))))
    (build-system gnu-build-system)
    (arguments
     (list #:make-flags #~(list (string-append "CC="
@@ -4,7 +4,6 @@
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
 ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
-;;; Copyright © 2025 Luca Di Sera <disera.luca@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -140,9 +139,6 @@ interactive and automated theorem proving.")
              (substitute* "src/lean.mk.in"
               (("SHELL = /usr/bin/env bash")
                "SHELL = bash"))
-              (substitute* "src/stdlib.make.in"
-               (("/usr/bin/env bash")
-                "bash"))
              (setenv "SHELL" "bash -euo pipefail")))
          (replace 'check
            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
@@ -92,20 +92,6 @@
 devices on various operating systems.")
    (license license:lgpl2.1+)))

-(define-public libusb-next
-  (package
-    (inherit libusb)
-    (name "libusb-next")
-    (version "1.0.29")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/libusb/libusb/"
-                           "releases/download/v" version
-                           "/libusb-" version ".tar.bz2"))
-       (sha256
-        (base32 "118alz1rzqp6qaq486wn5hygs27qnc38rm4vxb69a4wd1yazqxsr"))))))
-
 (define-public libusb-compat
  (package
    (name "libusb-compat")
@@ -48,7 +48,6 @@
 ;;; Copyright © 2025 Junker <dk@junkeria.club>
 ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
-;;; Copyright © 2025 vga <v@vgz.li>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17172,40 +17171,6 @@ Lisp.")
 (define-public ecl-flute
  (sbcl-package->ecl-package sbcl-flute))

-(define-public sbcl-fmt
-  (let ((commit "91a29ec31e317bd6bd67d693acebc1d50bf0ac5e")
-        (revision "0"))
-    (package
-      (name "sbcl-fmt")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/mmontone/fmt")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp"))))
-      (build-system asdf-build-system/sbcl)
-      (native-inputs (list sbcl-fiveam sbcl-local-time))
-      (inputs (list sbcl-alexandria))
-      (home-page "https://github.com/mmontone/fmt")
-      (synopsis "Extensible text formatting facility for Common Lisp using
-s-expressions")
-      (description
-       "@code{fmt} provides an alternative to the Common Lisp @code{format}
-function by utilizing s-expressions for formatting directives instead
-of control strings.")
-      (license license:expat))))
-
-(define-public cl-fmt
-  (sbcl-package->cl-source-package sbcl-fmt))
-
-;; TODO: Not reproducible.
-;; (define-public ecl-fmt
-;;   (sbcl-package->ecl-package sbcl-fmt))
-
 (define-public sbcl-fn
  (let ((commit "8d8587d03a7b5e26b306fc90018e385d9e5acc2c")
        (revision "1"))
@@ -7,7 +7,7 @@
 ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2021-2025 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2021-2026 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
@@ -1126,6 +1126,10 @@ Library.")
              (srfi srfi-26)
              ,@modules)
            modules))
+       ;; TODO: Figure out why some tests fail on powerpc64le-linux.
+       ((#:tests? current-test-config #t)
+        (and current-test-config
+             (not (target-ppc64le?))))
       ((#:configure-flags cf #~'())
        (if (%current-target-system)
            ;; Use a newer version of llvm-tblgen and add the new
@@ -2543,17 +2543,20 @@ data by providing clean labels during training.")
 (define-public python-cma
  (package
    (name "python-cma")
-    (version "4.4.1")
+    (version "4.2.0")
    (source (origin
              (method url-fetch)
              (uri (pypi-uri "cma" version))
              (sha256
               (base32
-                "1n17shbcmy7h7k105ar9yhj2zmgykx1wv9fhwd5kbwrcypa221mz"))))
+                "17wv4r80av3cpr3dqad7jf7bwnjahk4bgagqlkqxjp8zfmg60s0q"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:test-backend #~'custom
-           #:test-flags #~'("cma/test.py")))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (invoke "python" "-m" "cma.test")))))))
    (native-inputs (list python-pytest python-setuptools))
    (propagated-inputs (list python-numpy))
    (home-page "https://github.com/CMA-ES/pycma")
@@ -3737,6 +3740,31 @@ in a fast and accurate way.")
     (list python-numpy python-scipy))
    (synopsis "Python interface for the XGBoost library")))

+(define-public python-iml
+  (package
+    (name "python-iml")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "iml" version))
+       (sha256
+        (base32
+         "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs
+     (list python-ipython python-numpy python-pandas python-scipy))
+    (native-inputs
+     (list python-nose python-setuptools))
+    (home-page "https://github.com/interpretable-ml/iml")
+    (synopsis "Interpretable Machine Learning (iML) package")
+    (description "Interpretable ML (iML) is a set of data type objects,
+visualizations, and interfaces that can be used by any method designed to
+explain the predictions of machine learning models (or really the output of
+any function).  It currently contains the interface and IO code from the Shap
+project, and it will potentially also do the same for the Lime project.")
+    (license license:expat)))
+
 (define-public gloo
  (let ((version "0.0.0")                         ; no proper version tag
        (commit "54cbae0d3a67fa890b4c3d9ee162b7860315e341")
@@ -326,14 +326,14 @@ completely independent from the extension API.")
 (define-public mailutils
  (package
    (name "mailutils")
-    (version "3.21")
+    (version "3.20")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/mailutils/mailutils-"
                                 version ".tar.xz"))
             (sha256
              (base32
-               "1sgmgslmifs8kpi4y2gjw4c7z0xfhhxdnxxwzmsnd3cvd7f1wz74"))
+               "0ag8d9fafzyjk53iyknzvb82risv1jf4wgnann5ii9fx3smzmwx8"))
             (patches
              (search-patches "mailutils-variable-lookup.patch"))))
    (build-system gnu-build-system)
@@ -1341,67 +1341,86 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
      (license license:bsd-3))))

 (define-public mu
-  (package
-    (name "mu")
-    (version "1.12.14")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/djcb/mu")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "188l9h2smmq6x16l9kjbjk4rbyxgz552kiwr3j1y981cl0nndli2"))))
-    (build-system meson-build-system)
-    (native-inputs
-     (list pkg-config
-           emacs                      ; TODO: use emacs-minimal next release
-           gnupg                      ; for tests
-           tzdata-for-tests           ; for tests
-           texinfo))
-    (inputs
-     (list glib gmime guile-3.0 xapian readline python))
-    (arguments
-     (list
-      #:modules '((guix build meson-build-system)
-                  (guix build emacs-utils)
-                  ((guix build guile-build-system)
-                   #:select (target-guile-effective-version))
-                  (guix build utils))
-      #:imported-modules `(,@%meson-build-system-modules
-                           (guix build guile-build-system)
-                           (guix build emacs-utils))
-      #:configure-flags
-      #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'fix-ffi
-            (lambda _
-              (substitute* (find-files #$output "mu\\.scm")
-                (("\"libguile-mu\"")
-                 (format #f "\"~a/lib/libguile-mu\"" #$output)))))
-          (add-after 'install 'install-emacs-autoloads
-            (lambda _
-              (emacs-generate-autoloads
-               "mu4e"
-               (string-append #$output
-                              "/share/emacs/site-lisp/mu4e"))))
-          (add-after 'install 'wrap-executable
-            (lambda _
-              (let* ((bin (string-append #$output "/bin"))
-                     (version (target-guile-effective-version))
-                     (scm (string-append #$output "/share/guile/site/" version)))
-                (wrap-program (string-append bin "/mu")
-                  `("GUILE_LOAD_PATH" ":" prefix (,scm)))))))))
-    (home-page "https://www.djcbsoftware.nl/code/mu/")
-    (synopsis "Quickly find emails")
-    (description
-     "Mu is a tool for dealing with e-mail messages stored in the
+  ;; this commit fixes nondeterministic test failing the build
+  ;; revert back to a tagged release next time
+  ;; <https://github.com/djcb/mu/commit/46f91ab7b7641caac992a41264ac41a76c001c87>
+  (let ((commit "46f91ab7b7641caac992a41264ac41a76c001c87")
+        (revision "1"))
+    (package
+      (name "mu")
+      (version (git-version "1.12.13" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/djcb/mu")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1dbadvpl0fwy975f4i58rq7n85gfjhv92lcdmkv1w3h1mjn2v0sd"))))
+      (build-system meson-build-system)
+      (native-inputs
+       (list pkg-config
+             emacs-minimal
+             gnupg                      ; for tests
+             tzdata-for-tests           ; for tests
+             texinfo))
+      (inputs
+       (list glib gmime guile-3.0 xapian readline python))
+      (arguments
+       (list
+        #:modules '((guix build meson-build-system)
+                    (guix build emacs-utils)
+                    ((guix build guile-build-system)
+                     #:select (target-guile-effective-version))
+                    (guix build utils))
+        #:imported-modules `(,@%meson-build-system-modules
+                             (guix build guile-build-system)
+                             (guix build emacs-utils))
+        #:configure-flags
+        #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output))
+        #:phases
+        #~(modify-phases %standard-phases
+            ;; This phase can be removed in the next major release of mu.
+            ;; <https://github.com/djcb/mu/commit/f237a2b9905475fb95da6a04e318d10cab61ddeb>
+            ;; <https://github.com/djcb/mu/commit/fc4d5b01a703e8c8cc390cfea135f08d3b45ccab>
+            (add-after 'unpack 'patch-bin-references
+              (lambda _
+                (substitute* '("guile/tests/test-mu-guile.cc"
+                               "mu/tests/test-mu-query.cc")
+                  (("/bin/sh") (which "sh")))
+                (substitute* '("lib/tests/bench-indexer.cc"
+                               "lib/utils/mu-utils-file.cc"
+                               "lib/utils/mu-test-utils.cc")
+                  (("/bin/rm") (which "rm")))
+                (substitute* '("lib/mu-maildir.cc")
+                  (("/bin/mv") (which "mv")))))
+            (add-after 'install 'fix-ffi
+              (lambda _
+                (substitute* (find-files #$output "mu\\.scm")
+                  (("\"libguile-mu\"")
+                   (format #f "\"~a/lib/libguile-mu\"" #$output)))))
+            (add-after 'install 'install-emacs-autoloads
+              (lambda _
+                (emacs-generate-autoloads
+                 "mu4e"
+                 (string-append #$output
+                                "/share/emacs/site-lisp/mu4e"))))
+            (add-after 'install 'wrap-executable
+              (lambda _
+                (let* ((bin (string-append #$output "/bin"))
+                       (version (target-guile-effective-version))
+                       (scm (string-append #$output "/share/guile/site/" version)))
+                  (wrap-program (string-append bin "/mu")
+                    `("GUILE_LOAD_PATH" ":" prefix (,scm)))))))))
+      (home-page "https://www.djcbsoftware.nl/code/mu/")
+      (synopsis "Quickly find emails")
+      (description
+       "Mu is a tool for dealing with e-mail messages stored in the
 Maildir format.  Mu's purpose in life is to help you to quickly find the
 messages you need; in addition, it allows you to view messages, extract
 attachments, create new maildirs, and so on.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))

 (define-public alot
  (package
@@ -3840,13 +3840,13 @@ ASCII text files using Gmsh's own scripting language.")
 (define-public veusz
  (package
    (name "veusz")
-    (version "4.2")
+    (version "4.1")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "veusz" version))
       (sha256
-        (base32 "1vc5zmjzhjkmfy2417xs8h1bix8xyd0gvikskp3k3qgf9wz22a4g"))))
+        (base32 "0idg249sg367rxp69nwpsib5dwb0bbznb8hak004573ygc7dmd5k"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -61,7 +61,6 @@
  #:use-module (gnu packages xiph)
  #:use-module (gnu packages pulseaudio)
  #:use-module (gnu packages linux)               ;alsa-lib
-  #:use-module (gnu packages textutils)           ;utfcpp
  #:use-module (gnu packages video)               ;ffmpeg
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -282,24 +281,6 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.")
    ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1.
    (license (list license:lgpl2.1 license:mpl1.1))))

-(define-public taglib-next
-  (package
-    (inherit taglib)
-    (name "taglib")
-    (version "2.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/taglib/taglib")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0m1xyjsg6a8p4prn1xr1g29zsxqr7606cv3cblgjgxkb1dk26fx7"))))
-    (inputs
-     (list utfcpp
-           zlib))))
-
 (define-public minimp3
  ;; The latest commit is used as there is no release.
  (let ((commit   "afb604c06bc8beb145fecd42c0ceb5bda8795144")
@@ -763,36 +744,39 @@ fingerprinting library and the Acoustid API.")
 (define-public python-pytaglib
  (package
    (name "python-pytaglib")
-    (version "3.1.0")
+    (version "1.4.6")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/supermihi/pytaglib")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pytaglib" version))
       (sha256
-        (base32 "178vvc0rq932w9hmzb1cxlzhzfs5npibrpx41r0zidmhcpv4gr03"))))
-    (build-system pyproject-build-system)
+        (base32
+         "0li970qslfymz4vk1wrij2nfqw3l15cpc3fjjci48mpvg17gbnhn"))
+       ;; Delete file generated by Cython.
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (delete-file "src/taglib.cpp")))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; Ensure that the Cython file is regenerated.
-          (add-after 'unpack 'setup-environment
-            (lambda _
-              (setenv "PYTAGLIB_CYTHONIZE" "1"))))))
+     '(#:phases
+       (modify-phases %standard-phases
+         ;; Ensure that the Cython file is regenerated.
+         (add-after 'unpack 'setup-environment
+           (lambda _
+             (setenv "PYTAGLIB_CYTHONIZE" "1"))))))
    (native-inputs
-     (list python-cython
-           python-pytest
-           python-setuptools))
+     (list python-cython python-pytest))
    (inputs
-     (list taglib-next))
-    (home-page "https://github.com/supermihi/pytaglib")
-    (synopsis "Python bindings for taglib")
+     (list taglib))
+    (home-page
+     "https://github.com/supermihi/pytaglib")
+    (synopsis
+     "Python bindings for taglib")
    (description
-     "This package is a Python audio tagging library.  It is cross-platform,
- works with all Python versions, and is very simple to use yet fully featured.")
+     "This package is a Python audio tagging library.  It is
+cross-platform, works with all Python versions, and is very
+simple to use yet fully featured.")
    (license license:gpl3)))

 (define-public wavbreaker
@@ -58,7 +58,6 @@
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages icu4c)
-  #:use-module (gnu packages kde-frameworks)
  #:use-module (gnu packages libusb)
  #:use-module (gnu packages lua)
  #:use-module (gnu packages readline)
@@ -525,25 +524,16 @@ MPRIS 2 support.")
 (define-public cantata
  (package
    (name "cantata")
-    (version "3.4.0")
+    (version "3.3.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                     (url "https://github.com/nullobsi/cantata")
-                     (commit (string-append "v" version))))
+                    (url "https://github.com/nullobsi/cantata")
+                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1hjq73w5lnh2gj51bnaqym0lds82zzlwjr2ndz2m8xrcv2w2q0lg"))
-              (modules '((guix build utils)))
-              (snippet
-               #~(begin
-                   (with-directory-excursion "3rdparty"
-                     (for-each delete-file-recursively
-                               '("karchive"
-                                 "kcategorizedview"
-                                 "qtsingleapplication")))
-                   (delete-file-recursively "support/fonts")))))
+                "0x5bm8s9cl68ybdv37w65kjlxyz40s42ddyf0cv4351vxxiiyng2"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f)) ; No test suite
@@ -553,13 +543,16 @@ MPRIS 2 support.")
     (list avahi
           eudev
           ffmpeg
-           karchive
-           kitemviews
           libcddb
           libcdio-paranoia
+           libmusicbrainz
+           libebur128
+           libmtp
+           mpg123
           qtbase
           qtmultimedia
           qtsvg
+           taglib
           zlib))
    (synopsis "Graphical MPD Client")
    (description "Cantata is a graphical client for the Music Player Daemon
@@ -1569,50 +1569,6 @@ between different versions of ØMQ.")
 files contain direct mappings of the abstractions provided by the ØMQ C API.")
    (license license:expat)))

-(define-public libcoap
-  (package
-    (name "libcoap")
-    (version "4.3.5a")
-    (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/obgm/libcoap")
-                      (commit (string-append "v" version))))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "078bi6i6115wyhx9qssh30kf5ziv8sn7ch5fg31rf7qr7pypbfxa"))))
-    (outputs (list "out" "doc"))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-       #:configure-flags
-       #~(list "--enable-tests"
-               "--with-openssl")
-       #:phases
-       #~(modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "./tests/testdriver")))))))
-    (native-inputs (list asciidoc
-                         autoconf
-                         automake
-                         doxygen
-                         libtool
-                         pkg-config
-                         which))
-    (inputs (list cunit openssl))
-    (home-page "https://libcoap.net/")
-    (synopsis "Implementation of the CoAP application protocol")
-    (description
-      "This package provides a C implementation of a lightweight
-application-protocol for devices that are constrained their resources such as
-computing power, RF range, memory, bandwidth, or network packet sizes.  This
-protocol, @acronym{CoAP, Constrained Application Protocol}, is standardized by
-the IETF as @url{https://www.rfc-editor.org/rfc/rfc7252, RFC 7252}.")
-    (license license:bsd-2)))
-
 (define-public libnatpmp
  ;; Install the latest commit as it provides a pkg-config (.pc) file.
  (let ((base-version "20230423")
@@ -27,7 +27,6 @@
  #:use-module (guix licenses)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
-  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (gnu packages)
  #:use-module (gnu packages check)
@@ -49,28 +48,30 @@
 (define-public python-scrape-schema-recipe
  (package
    (name "python-scrape-schema-recipe")
-    (version "0.2.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/micahcochran/scrape-schema-recipe")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1yrqawnxp1k9ps0c920qjbbaxpmz3cf8bzyjs1kimvlxym78b614"))))
-    (build-system pyproject-build-system)
+    (version "0.2.0")
+    ;; The PyPI archive lacks a VERSION file as well as the test suite.
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/micahcochran/scrape-schema-recipe")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "044c6qwhb4c710ksgiw29cd0qcp84h1m4y8yr2g4c8vdlm3kkqh5"))))
+    (build-system python-build-system)
    (arguments
     (list
      #:phases
      #~(modify-phases %standard-phases
-          (add-before 'check 'configure-tests
+          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
                (substitute* "test_scrape.py"
                  (("DISABLE_NETWORK_TESTS = False")
-                   "DISABLE_NETWORK_TESTS = True"))))))))
-    (native-inputs (list python-pytest python-setuptools))
+                   "DISABLE_NETWORK_TESTS = True"))
+                (invoke "pytest" "-vv")))))))
+    (native-inputs (list python-pytest))
    (propagated-inputs
     (list python-extruct
           python-importlib-resources
@@ -100,20 +101,32 @@ in the @url{https://schema.org/Recipe} format.")
          (base32
           "08fbw6zp32ws6w9czwy2sqc9c9izlkglsskshj2114d0l79z4gj8"))
         (patches (search-patches "gourmet-sqlalchemy-compat.patch"))))
-      (build-system pyproject-build-system)
+      (build-system python-build-system)
      (arguments
       (list
-        #:test-flags
-        ;; XXX: Some tests in deeper directories or otherwise discovered by
-        ;; Pytest are broken.
-        #~(list "--ignore-glob=gourmet/tests/**/*.py")
+        #:modules `((guix build utils)
+                    (guix build python-build-system)
+                    (ice-9 ftw)
+                    (srfi srfi-26))
        #:phases
        #~(modify-phases %standard-phases
-            (add-before 'check 'configure-tests
+            (add-before 'check 'prepare-x
+              ;; Both the tests and the sanity-check phase need an X server to
+              ;; succeed.
              (lambda _
-                (setenv "HOME" "/tmp") ;needed by tests
                (system "Xvfb &")
                (setenv "DISPLAY" ":0")))
+            (replace 'check
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (setenv "HOME" "/tmp") ;needed by tests
+                  (apply invoke "pytest" "-vv"
+                         ;; XXX: This is needed because some tests in deeper
+                         ;; directories or otherwise discovered by Pytest are
+                         ;; broken.
+                         (map (cut string-append "gourmet/tests/" <>)
+                              (scandir "gourmet/tests"
+                                       (cut string-prefix? "test_" <>)))))))
            (add-after 'install 'install-dekstop-file-and-icons
              (lambda _
                (define share (string-append #$output "/share"))
@@ -125,7 +138,6 @@ in the @url{https://schema.org/Recipe} format.")
       (list python-dogtail
             python-pytest
             python-selenium
-             python-setuptools
             xorg-server-for-tests))
      (inputs
       (list gtk+
@@ -42,7 +42,6 @@
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-science)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages ruby)
@@ -269,22 +268,18 @@ pocl.")
 (define-public python-pytools
  (package
    (name "python-pytools")
-    (version "2025.2.5")
+    (version "2021.2.7")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/inducer/pytools")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pytools" version))
       (sha256
-        (base32 "1sym2vbkw068ldkjqi3qj1dkbvd047bk5ir028qqbv0g7z3dwk31"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:tests? #f)) ;Tests depend on packages not present in Guix.
-    (native-inputs (list python-hatchling))
-    (propagated-inputs (list python-appdirs python-numpy))
-    (home-page "https://github.com/inducer/pytools")
+        (base32 "1yyr4k6sqx859gjhc02633l2vxwdnj6m2f5blmf7dgq0gzzgcf05"))))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ; Tests depend on packages not present in Guix.
+    (propagated-inputs
+     (list python-appdirs python-numpy))
+    (home-page "https://pypi.org/project/pytools/")
    (synopsis "Assorted tools for Python")
    (description
     "Pytools is a bag of things that are ``missing'' from the Python standard
@@ -258,10 +258,9 @@ data analysis, data mining and data visualization.")
       (uri (pypi-uri "serverfiles" version))
       (sha256
        (base32 "1qgbzgnaxj4wsp2rdas53qxsh0j7xpibq25w6lviwyaqwwrgq42y"))))
-    (build-system pyproject-build-system)
-    (arguments (list #:test-backend #~'unittest))
-    (native-inputs (list python-setuptools))
-    (propagated-inputs (list python-requests))
+    (build-system python-build-system)
+    (propagated-inputs
+     (list python-requests))
    (home-page "https://github.com/biolab/serverfiles")
    (synopsis "Utility to access files on a HTTP server and store them locally")
    (description
@@ -197,8 +197,8 @@
  ;; Latest version of Guix, which may or may not correspond to a release.
  ;; Note: the 'update-guix-package.scm' script expects this definition to
  ;; start precisely like this.
-  (let ((version "1.5.0rc1")
-        (commit "2d4ed08662714ea46cfe0b41ca195d1ef845fd1b")
+  (let ((version "1.5.0")
+        (commit "230aa373f315f247852ee07dff34146e9b480aec")
        (revision 0))
    (package
      (name "guix")
@@ -215,7 +215,7 @@
                      (commit commit)))
                (sha256
                 (base32
-                  "0z1ixlkzsaj978nh57179871xkzbf8zsf10xkcfs2647iznkx7az"))
+                  "00398yxjhq9pa03knkjjrih4vc4n5xg9xjykiscndr4c84qhj3zy"))
                (file-name (string-append "guix-" version "-checkout"))))
      (build-system gnu-build-system)
      (arguments
@@ -1,76 +0,0 @@
-Upstream status: https://gitlab.com/wavexx/gnus-desktop-notify.el/-/merge_requests/15
-
-From 905e7ea41560783ec723aa0167911ba050f91789 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-Date: Mon, 16 Jun 2025 09:24:07 +0900
-Subject: [PATCH] Revert to use the notifications library by default.
-
-The alert library project itself mentions that:
-
-  For desktop notifications, the notifications package that is
-  installed with emacs, provides a probably better alternative for
-  most users.
-
-and it appears true, as by default `alert' simply print notification
-messages to the `*Messages*' buffer, which is not exactly a desktop
-notification.
-
-* gnus-desktop-notify.el (require): Require notifications first,
-falling back to alert.
-(gnus-desktop-notify-function): Test for the notifications feature
-first.  Mention `notifications' is the default in its doc.
---
- gnus-desktop-notify.el | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/gnus-desktop-notify.el b/gnus-desktop-notify.el
-index 97e65f3..a12e444 100644
--- a/gnus-desktop-notify.el
-+++ b/gnus-desktop-notify.el
-@@ -26,6 +26,11 @@
- 
- ;;; Change Log:
- 
-+;; 1.5:
-+;; * Revert to use the `notifications' library by default if
-+;;   available.  The `alert' library doesn't do anything useful in its
-+;;   default configuration.
-+;;
- ;; 1.4:
- ;; * Use `alert' package by default if available (`gnus-desktop-notify-alert').
- ;;
-@@ -83,8 +88,8 @@
- (require 'format-spec)
- (require 'gnus-group)
- 
-(unless (require 'alert nil t)
-  (require 'notifications nil t))
-+(unless (require 'notifications nil t)
-+  (require 'alert nil t))
- 
- (declare-function alert "alert")
- (declare-function notifications-notify "notifications")
-@@ -96,8 +101,8 @@
-   :group 'gnus)
- 
- (defcustom gnus-desktop-notify-function
-  (cond ((featurep 'alert)         'gnus-desktop-notify-alert)
-        ((featurep 'notifications) 'gnus-desktop-notify-dbus)
-+  (cond ((featurep 'notifications) 'gnus-desktop-notify-dbus)
-+        ((featurep 'alert)         'gnus-desktop-notify-alert)
-         (t                         'gnus-desktop-notify-send))
-   "Notification backend used when a group receives new messages.
- The backend is passed the notification content as a single,
-@@ -109,8 +114,8 @@ or fallback to the generic `gnus-desktop-notify-send' otherwise.
- 
- The following functions are available (whose documentation see):
- 
-+`gnus-desktop-notify-dbus':  Use the `notifications' library (default).
- `gnus-desktop-notify-alert': Use the `alert' library.
-`gnus-desktop-notify-dbus':  Use the `notifications' library.
- `gnus-desktop-notify-send':  Call the `notify-send' program.
- `gnus-desktop-notify-exec':  Call a customizable program."
-   :type 'function)
-- 
-GitLab
-
@@ -1,37 +0,0 @@
-Upstream-status: https://gitlab.com/wavexx/gnus-desktop-notify.el/-/merge_requests/16
-
-diff --git a/README.rst b/README.rst
-index 4cacdcb..150a2c2 100644
--- a/README.rst
-+++ b/README.rst
-@@ -18,7 +18,7 @@ new messages are received. For basic usage, to be used in conjunction with
- 
-   (require 'gnus-desktop-notify)
-   (gnus-desktop-notify-mode)
-  (gnus-demon-add-scanmail)
-+  (gnus-demon-add-rescan)
- 
- into your ``.gnus`` file. The default is to use alert_ if available, which
- works on every operating system and allows the user to customize the
-@@ -52,7 +52,7 @@ follows:
-   (setq gnus-desktop-notify-function 'gnus-desktop-notify-exec
- 	gnus-desktop-notify-exec-program "growlnotify -a Emacs.app -m")
-   (gnus-desktop-notify-mode)
-  (gnus-demon-add-scanmail)
-+  (gnus-demon-add-rescan)
- 
- 
- Advanced setup
-diff --git a/gnus-desktop-notify.el b/gnus-desktop-notify.el
-index 97e65f3..3153807 100644
--- a/gnus-desktop-notify.el
-+++ b/gnus-desktop-notify.el
-@@ -50,7 +50,7 @@
- ;;
- ;; (require 'gnus-desktop-notify)
- ;; (gnus-desktop-notify-mode)
-;; (gnus-demon-add-scanmail)
-+;; (gnus-demon-add-rescan)
- ;;
- ;; into your ``.gnus`` file. The default is to use `alert' if available, which
- ;; works on every operating system and allows the user to customize the
@@ -1,21 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Date: 2025-07-17
-License: Apache Software License 2.0
-
-diff -ru orig/FreeRDP/cmake/ConfigureRPATH.cmake FreeRDP/cmake/ConfigureRPATH.cmake
--- orig/FreeRDP/cmake/ConfigureRPATH.cmake	2025-07-17 10:42:17.557667810 +0200
-+++ FreeRDP/cmake/ConfigureRPATH.cmake	2025-07-17 11:32:13.692935801 +0200
-@@ -15,10 +15,10 @@
-     option(WITH_ADD_PLUGIN_TO_RPATH "Add extension and plugin path to RPATH" OFF)
-     if(WITH_ADD_PLUGIN_TO_RPATH)
-       set(CFG_INSTALL_RPATH
-          "\$ORIGIN/../${FREERDP_EXTENSION_REL_PATH}:\$ORIGIN/../${FREERDP_PLUGIN_PATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/.."
-+          "\$ORIGIN/../${FREERDP_EXTENSION_REL_PATH}:\$ORIGIN/../${FREERDP_PLUGIN_PATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../.."
-       )
-     else()
-      set(CFG_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
-+      set(CFG_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../..")
-     endif()
-   endif()
- endif(APPLE)
-Only in FreeRDP/: LIBS
@@ -1,52 +0,0 @@
-Forwarded here: https://lists.gnu.org/archive/html/jami/2024-01/msg00003.html
-
-From 20a1702d881b381979d31c456f1b8cf5e0f728ad Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-Date: Sun, 7 Jan 2024 16:40:41 -0500
-Subject: [PATCH] configure.ac: Expand AC_CONFIG_FILES to fix a race.
-
-The commands apparently run for each file listed, or something
-similar, leading to:
-
-  configure: creating ./config.status
-  config.status: creating test/agent/Makefile
-  chmod: cannot access 'test/agent/pre-inst-env': No such file or directory
-  chmod: cannot access 'test/agent/scenarios/bulk-calls/run-scenario': No such file or directory
-  config.status: creating test/agent/pre-inst-env
-  chmod: cannot access 'test/agent/scenarios/bulk-calls/run-scenario': No such file or directory
-
-* configure.ac [ENABLE_AGENT]: Separate AC_CONFIG_FILES uses per file.
-
-Series-to: jami@gnu.org
-Series-postfix: daemon
-Change-Id: Ib283955b73540248e09bf31ef44ef3d178b216fa
---
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index cdea5ff1c..2ab96d817 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -61,11 +61,11 @@ AC_ARG_ENABLE([agent],
-     [Build agent]))
- AM_CONDITIONAL([ENABLE_AGENT], [test "x$enable_agent" = "xyes"])
- AM_COND_IF([ENABLE_AGENT],
-           [AC_CONFIG_FILES([test/agent/Makefile
-                             test/agent/pre-inst-env:test/agent/build-aux/pre-inst-env.in
-                             test/agent/scenarios/bulk-calls/run-scenario],
-                            [chmod +x test/agent/pre-inst-env
-                             chmod +x test/agent/scenarios/bulk-calls/run-scenario])])
-+  [AC_CONFIG_FILES([test/agent/Makefile])
-+   AC_CONFIG_FILES([test/agent/pre-inst-env:test/agent/build-aux/pre-inst-env.in],
-+                   [chmod +x test/agent/pre-inst-env])
-+   AC_CONFIG_FILES([test/agent/scenarios/bulk-calls/run-scenario],
-+                   [chmod +x test/agent/scenarios/bulk-calls/run-scenario])])
- 
- AC_ARG_ENABLE([tracepoints], AS_HELP_STRING([--enable-tracepoints], [Enable tracepoints]))
- 
-
-base-commit: e246fb2e090c9b3de55e2d455eee5a6f05a5b286
-- 
-2.41.0
-
@@ -1,144 +0,0 @@
-Upstream-status: <https://review.jami.net/c/jami-daemon/+/31504>
-
-diff --git a/bin/dbus/dbuscallmanager.hpp b/bin/dbus/dbuscallmanager.hpp
-index b79e0cd6f..918d8bc30 100644
--- a/bin/dbus/dbuscallmanager.hpp
-+++ b/bin/dbus/dbuscallmanager.hpp
-@@ -23,7 +23,7 @@ class DBusCallManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::CallMana
- {
- public:
-     DBusCallManager(sdbus::IConnection& connection)
-        : AdaptorInterfaces(connection, "/cx/ring/Ring/CallManager")
-+        : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/CallManager"))
-     {
-         registerAdaptor();
-         registerSignalHandlers();
-diff --git a/bin/dbus/dbusconfigurationmanager.hpp b/bin/dbus/dbusconfigurationmanager.hpp
-index a6bb8e4e9..895c7690d 100644
--- a/bin/dbus/dbusconfigurationmanager.hpp
-+++ b/bin/dbus/dbusconfigurationmanager.hpp
-@@ -33,7 +33,7 @@ public:
-                                            std::vector<std::map<std::string, std::string>>,
-                                            std::map<std::string, int32_t>>;
-     DBusConfigurationManager(sdbus::IConnection& connection)
-        : AdaptorInterfaces(connection, "/cx/ring/Ring/ConfigurationManager")
-+        : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/ConfigurationManager"))
-     {
-         registerAdaptor();
-         registerSignalHandlers();
-diff --git a/bin/dbus/dbusinstance.hpp b/bin/dbus/dbusinstance.hpp
-index d45c033e1..184fd2c7d 100644
--- a/bin/dbus/dbusinstance.hpp
-+++ b/bin/dbus/dbusinstance.hpp
-@@ -28,7 +28,7 @@ class DBusInstance : public sdbus::AdaptorInterfaces<cx::ring::Ring::Instance_ad
- {
- public:
-     DBusInstance(sdbus::IConnection& connection)
-        : AdaptorInterfaces(connection, "/cx/ring/Ring/Instance")
-+        : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/Instance"))
-     {
-         registerAdaptor();
-     }
-diff --git a/bin/dbus/dbuspluginmanagerinterface.hpp b/bin/dbus/dbuspluginmanagerinterface.hpp
-index c063a9903..132674e9f 100644
--- a/bin/dbus/dbuspluginmanagerinterface.hpp
-+++ b/bin/dbus/dbuspluginmanagerinterface.hpp
-@@ -23,7 +23,7 @@ class DBusPluginManagerInterface : public sdbus::AdaptorInterfaces<cx::ring::Rin
- {
- public:
-     DBusPluginManagerInterface(sdbus::IConnection& connection)
-        : AdaptorInterfaces(connection, "/cx/ring/Ring/PluginManagerInterface")
-+        : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/PluginManagerInterface"))
-     {
-         registerAdaptor();
-         registerSignalHandlers();
-diff --git a/bin/dbus/dbuspresencemanager.hpp b/bin/dbus/dbuspresencemanager.hpp
-index ca8ba7f2a..27b93eee4 100644
--- a/bin/dbus/dbuspresencemanager.hpp
-+++ b/bin/dbus/dbuspresencemanager.hpp
-@@ -23,7 +23,7 @@ class DBusPresenceManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::Pres
- {
- public:
-     DBusPresenceManager(sdbus::IConnection& connection)
-        : AdaptorInterfaces(connection, "/cx/ring/Ring/PresenceManager")
-+        : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/PresenceManager"))
-     {
-         registerAdaptor();
-         registerSignalHandlers();
-diff --git a/bin/dbus/dbusvideomanager.hpp b/bin/dbus/dbusvideomanager.hpp
-index 7fbca2492..96f73e99b 100644
--- a/bin/dbus/dbusvideomanager.hpp
-+++ b/bin/dbus/dbusvideomanager.hpp
-@@ -23,7 +23,7 @@ class DBusVideoManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::VideoMa
- {
- public:
-     DBusVideoManager(sdbus::IConnection& connection)
-        : AdaptorInterfaces(connection, "/cx/ring/Ring/VideoManager")
-+        : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/VideoManager"))
-     {
-         registerAdaptor();
-         registerSignalHandlers();
-diff --git a/bin/dbus/main.cpp b/bin/dbus/main.cpp
-index ee8a349cc..4d7adc95e 100644
--- a/bin/dbus/main.cpp
-+++ b/bin/dbus/main.cpp
-@@ -180,7 +180,7 @@ main(int argc, char *argv [])
-     }
- 
-     try {
-        connection = sdbus::createSessionBusConnection("cx.ring.Ring");
-+        connection = sdbus::createSessionBusConnection(sdbus::ServiceName("cx.ring.Ring"));
-         DBusCallManager callManager(*connection);
-         DBusConfigurationManager configurationManager(*connection);
-         DBusInstance instanceManager(*connection);
-diff --git a/configure.ac b/configure.ac
-index 66e52ee62..68de32497 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -420,7 +420,7 @@ AC_ARG_WITH([dbus],
-   [],
-   [with_dbus=yes])
- AS_IF([test "x$with_dbus" = "xyes"],
-  [PKG_CHECK_MODULES(SDBUSCPP, [sdbus-c++],,
-+  [PKG_CHECK_MODULES(SDBUSCPP, [sdbus-c++ >= 2.0.0],,
-      AC_MSG_ERROR([sdbus-c++ not found]))
- 
-    AC_CONFIG_FILES([bin/dbus/Makefile])
-diff --git a/contrib/src/sdbus-cpp/SHA512SUMS b/contrib/src/sdbus-cpp/SHA512SUMS
-index a48ebec1c..009d0b81b 100644
--- a/contrib/src/sdbus-cpp/SHA512SUMS
-+++ b/contrib/src/sdbus-cpp/SHA512SUMS
-@@ -1 +1 @@
-dab2c4d9a5ea6d626672a5a6ee6f3490c60c6fdd160769801a4d6b4cf3df4983fad57ff0230132a5d637ec78a55993200ce217fa89461016e101865cc2777d7d  sdbus-cpp-1.2.0.tar.gz
-+4247d49f0d5231e2768c0c96fa9c266bbcc340292c9c3d748f9c37ff992b82301faea798300f916e9a5c992d77adfe56186866c91a4c7d4157750ff09ba5a047  sdbus-cpp-2.1.0.tar.gz
-diff --git a/contrib/src/sdbus-cpp/rules.mak b/contrib/src/sdbus-cpp/rules.mak
-index 397d18d3b..d00fa97ca 100644
--- a/contrib/src/sdbus-cpp/rules.mak
-+++ b/contrib/src/sdbus-cpp/rules.mak
-@@ -1,4 +1,4 @@
-SDBUS_CPP_VERSION := 1.2.0
-+SDBUS_CPP_VERSION := 2.1.0
- SDBUS_CPP_URL := https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v$(SDBUS_CPP_VERSION).tar.gz
- 
- ifdef HAVE_LINUX
-@@ -7,17 +7,14 @@ PKGS += sdbus-cpp
- endif
- endif
- 
-ifeq ($(call need_pkg,"sdbus-c++ >= 1.2.0"),)
-+ifeq ($(call need_pkg,"sdbus-c++ >= 2.0.0"),)
- PKGS_FOUND += sdbus-cpp
- endif
- 
- SDBUS_CPP_CMAKECONF := -D CMAKE_BUILD_TYPE=Release \
-                        -D BUILD_SHARED_LIBS=OFF \
-                       -D BUILD_CODE_GEN=ON \
-                       -D BUILD_LIBSYSTEMD=OFF \
-                       -D BUILD_TESTS=OFF \
-                       -D BUILD_EXAMPLES=OFF \
-                       -D BUILD_DOC=OFF
-+                       -D SDBUSCPP_BUILD_CODEGEN=ON \
-+                       -D SDBUSCPP_BUILD_DOCS=OFF
- 
- $(TARBALLS)/sdbus-cpp-$(SDBUS_CPP_VERSION).tar.gz:
- 	$(call download,$(SDBUS_CPP_URL))
@@ -77,7 +77,7 @@ index 0000000..cf9a70d
 +[project]
 +name = 'mc2mt'
 +version = '0.1'
-+dependencies = ['anvil-parser2']
+dependencies = ['anvil-parser']
 +
 +[project.scripts]
 +mc2mt = 'mc2mtlib:mc2mt.mc2mt'
@@ -0,0 +1,40 @@
+Patch obtained from https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
+See https://github.com/mpv-player/mpv/issues/16176 for discussion. Next version
+of mpv will have this fixed, but upstream is not planning to release a patch
+release.
+
+From 26b29fba02a2782f68e2906f837d21201fc6f1b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
+Date: Fri, 28 Mar 2025 19:12:01 +0100
+Subject: [PATCH] demux_mkv: fix compilation after deprecated definitions
+ removal
+
+See: https://github.com/FFmpeg/FFmpeg/commit/822432769868da325ba03774df1084aa78b9a5a0
+---
+ demux/demux_mkv.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
+index 135edcc23d82b..cc7ce3e98f4f6 100644
+--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
+@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
+             // [0x30..0x37] are component tags utilized for
+             // non-mobile captioning service ("profile A").
+             if (component_tag >= 0x30 && component_tag <= 0x37)
+-                lav->profile = FF_PROFILE_ARIB_PROFILE_A;
+                lav->profile = AV_PROFILE_ARIB_PROFILE_A;
+             break;
+         case 0x0012:
+             // component tag 0x87 signifies a mobile/partial reception
+             // (1seg) captioning service ("profile C").
+             if (component_tag == 0x87)
+-                lav->profile = FF_PROFILE_ARIB_PROFILE_C;
+                lav->profile = AV_PROFILE_ARIB_PROFILE_C;
+             break;
+         }
+-        if (lav->profile == FF_PROFILE_UNKNOWN)
+        if (lav->profile == AV_PROFILE_UNKNOWN)
+             MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n",
+                     component_tag, data_component_id);
+     }
@@ -0,0 +1,34 @@
+Upstream-status: https://github.com/mpv-player/mpv/pull/16140
+
+From d20ded876d27497d3fe6a9494add8106b507a45c Mon Sep 17 00:00:00 2001
+From: llyyr <llyyr.public@gmail.com>
+Date: Fri, 28 Mar 2025 15:34:33 +0530
+Subject: [PATCH] clipboard-wayland: prevent reading from hung up fd
+
+This causes mpv to use up 100% of a core if there's an offer for a
+mime_type that mpv doesn't accept with ext_data_control clipboard
+backend.
+---
+ player/clipboard/clipboard-wayland.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/player/clipboard/clipboard-wayland.c b/player/clipboard/clipboard-wayland.c
+index c4a5e50472..bd8ac35af2 100644
+--- a/player/clipboard/clipboard-wayland.c
+++ b/player/clipboard/clipboard-wayland.c
+@@ -348,6 +348,12 @@ static bool clipboard_wayland_dispatch_events(struct clipboard_wayland_priv *wl,
+     if (fds[1].revents & POLLIN)
+         return false;
+ 
+    if (fds[2].revents & (POLLERR | POLLHUP | POLLNVAL))
+        destroy_offer(wl->selection_offer);
+
+    if (fds[3].revents & (POLLERR | POLLHUP | POLLNVAL))
+        destroy_offer(wl->primary_selection_offer);
+
+     if (fds[2].revents & POLLIN)
+         get_selection_data(wl, wl->selection_offer, false);
+ 
+-- 
+2.51.0
+
@@ -0,0 +1,24 @@
+This patch disables the 'migration-test' on AArch64, as it fails on some
+devices like this:
+
+stderr:
+qemu-system-aarch64: KVM does not support GICv3 emulation
+Broken pipe
+../../tests/qtest/libqtest.c:200: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
+
+(test program exited with status code -6)
+
+TAP parsing error: Too few tests run (expected 61, got 0)
+
+--- a/tests/qtest/meson.build     2026-01-16 21:53:16.945167915 +0100
+++ b/tests/qtest/meson.build 2026-01-16 21:52:55.313191080 +0100
+@@ -266,8 +266,7 @@
+   qtests_cxl +                                                                                  \
+   ['arm-cpu-features',
+    'numa-test',
+-   'boot-serial-test',
+-   'migration-test']
+   'boot-serial-test']
+ 
+ qtests_s390x = \
+   qtests_filter + \
@@ -0,0 +1,26 @@
+Unbundle spng, miniz
+*** a/third-party/CMakeLists.txt
+--- b/third-party/CMakeLists.txt
+@@ -4,20 +4,13 @@
+ target_woof_settings(md5)
+ target_include_directories(md5 INTERFACE md5)
+ 
+-add_library(miniz STATIC miniz/miniz.c)
+-target_woof_settings(miniz)
+-target_compile_definitions(miniz PRIVATE MINIZ_NO_TIME)
+-target_include_directories(miniz INTERFACE miniz)
+find_package(miniz)
+ 
+ add_library(pffft STATIC pffft/pffft.c)
+ target_woof_settings(pffft)
+ target_include_directories(pffft INTERFACE pffft)
+ 
+-add_library(spng STATIC spng/spng.c)
+-target_woof_settings(spng)
+-target_compile_definitions(spng PRIVATE SPNG_USE_MINIZ INTERFACE SPNG_STATIC)
+-target_include_directories(spng INTERFACE spng)
+-target_link_libraries(spng miniz)
+find_package(spng)
+ 
+ if(NOT yyjson_FOUND)
+     add_library(yyjson STATIC yyjson/yyjson.c)
@@ -590,7 +590,7 @@ photographic equipment.")
 (define-public darktable
  (package
    (name "darktable")
-    (version "5.4.0")
+    (version "5.2.1")
    (source
     (origin
       (method url-fetch)
@@ -598,7 +598,7 @@ photographic equipment.")
             "https://github.com/darktable-org/darktable/releases/"
             "download/release-" version "/darktable-" version ".tar.xz"))
       (sha256
-        (base32 "05ivr9ma83k6zlkyklhrxs1kmq3ry428hgf3177layfjg3mbmw1b"))))
+        (base32 "04gfcislcq2wymfqcir5bpwqfarcz5gynkn3ajyffj9rx6damw82"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -189,7 +189,7 @@ it.")
 (define-public trealla
  (package
    (name "trealla")
-    (version "2.88.3")
+    (version "2.88.1")
    (source
     (origin
       (method git-fetch)
@@ -198,7 +198,7 @@ it.")
         (url "https://github.com/trealla-prolog/trealla")
         (commit (string-append "v" version))))
       (sha256
-        (base32 "07wa3sxig64zq317jmisf43z9wzpx7jrlv78vl84lrn0gxmfa5lq"))
+        (base32 "1dim7y3ylm9mclabmcd4nc19hwg7hfgm02vw94jdwpwh6zh77aph"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (native-inputs
@@ -64,9 +64,7 @@
  #:use-module (gnu packages cmake)
  #:use-module (gnu packages nss)
  #:use-module (gnu packages check)
-  #:use-module (gnu packages databases)
  #:use-module (gnu packages django)
-  #:use-module (gnu packages docker)
  #:use-module (gnu packages jupyter)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages mpi)
@@ -92,7 +90,6 @@
  #:use-module (guix download)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
-  #:use-module (guix hg-download)
  #:use-module (guix packages)
  #:use-module (guix utils))

@@ -2259,13 +2256,10 @@ are too large to conveniently hard-code them in the tests.")
       (uri (pypi-uri "pytest-astropy" version))
       (sha256
        (base32 "1d9rcxnc57rjp96xag1gq725pwl11b3k5hdaz7c3w5lixncsmbjf"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments (list #:tests? #f)) ; there are no tests
    (native-inputs
-     (list python-attrs
-           python-pytest-mock
-           python-setuptools
-           python-setuptools-scm))
+     (list python-attrs python-pytest-mock python-setuptools-scm))
    (propagated-inputs
     (list python-hypothesis
           python-pytest-arraydiff
@@ -2395,41 +2389,23 @@ functions.")
 (define-public python-pytest-celery
  (package
    (name "python-pytest-celery")
-    (version "1.2.1")
+    (version "0.0.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/celery/pytest-celery")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pytest-celery" version))
       (sha256
-        (base32 "04s5j456rl2lj4zxrzkynx1lb09bb8qrkn82pladj2q89pzqxh8k"))))
-    (build-system pyproject-build-system)
+        (base32 "01pli108qqiiyrn8qsqqabcpazrzj27r7cji9wgglsk76by61l6g"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-flags
-      ;; Disable tests that require docker/rabbit/redis running.
-      #~(list "--deselect=tests/integration"
-              "-k" "not rabbit and not redis")))
-    (native-inputs
-     (list python-celery-minimal
-           python-memcached             ;optional dependency, needed for tests
-           python-poetry-core
-           python-pytest
-           python-pytest-cov            ;coverage options in pyproject.toml
-           python-redis                 ;optional dependency, needed for tests
-           python-requests))            ;for python-docker
-    (propagated-inputs
-     (list python-psutil
-           python-pytest-docker-tools
-           python-tenacity))
-    (home-page "https://github.com/celery/pytest-celery")
-    (synopsis "Pytest plugin designed for Celery application developers")
+     `(#:tests? #f ; no tests and circular dependency on python-celery
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'sanity-check)))) ; checks for celery
+    (home-page "https://github.com/graingert/pytest-celery")
+    (synopsis "Shim pytest plugin to enable @code{celery.contrib.pytest}")
    (description
-     "This package enables dynamic orchestration of Celery environments for
-testing tasks in isolated conditions, leveraging Docker & pytest-docker-tools
-for environment simulation.")
+     "This package provides a shim Pytest plugin to enable a Celery marker.")
    (license license:bsd-3)))

 (define-public python-pytest-check
@@ -2662,40 +2638,6 @@ to mark some tests as dependent from other tests.  These tests will then be
 skipped if any of the dependencies did fail or has been skipped.")
    (license license:asl2.0)))

-(define-public python-pytest-docker-tools
-  (package
-    (name "python-pytest-docker-tools")
-    (version "3.1.9")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/Jc2k/pytest-docker-tools")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "06w89kvxqma5ns6gndmk6g048qpv10wdwf61ynii1mm1n0xy11sr"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; All other tests seem to require docker daemon running.
-      #~(list "tests/test_utils.py")))
-    (native-inputs
-     (list python-pytest
-           python-requests
-           python-setuptools))
-    (propagated-inputs
-     (list python-docker))
-    (home-page "https://github.com/Jc2k/pytest-docker-tools")
-    (synopsis "Test your built docker image")
-    (description
-     "This package is a set of opinionated helpers for creating py.test fixtures
-for your smoke testing and integration testing.  It strives to keep your
-environment definition declarative, like a docker-compose.yml.  It embraces
- py.test fixture overloading.")
-    (license license:asl2.0)))
-
 (define-public python-pytest-doctest-custom
  (package
    (name "python-pytest-doctest-custom")
@@ -4231,31 +4173,28 @@ framework.")
 (define-public python-pytest-xvfb
  (package
    (name "python-pytest-xvfb")
-    (version "3.1.1")
+    (version "2.0.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/The-Compiler/pytest-xvfb")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pytest-xvfb" version))
       (sha256
-        (base32 "0p27h1idqja2lz2xnk4fsb9c8kafvgy1zpa84lg9d1hlamr221ja"))))
-    (build-system pyproject-build-system)
+        (base32 "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4"))))
+    (build-system python-build-system)
    (arguments
-     (list
+     `(#:test-target "pytest"
       #:phases
-       #~(modify-phases %standard-phases
+       (modify-phases %standard-phases
         (add-before 'build 'prepare-tests
           (lambda _
             (system "Xvfb &")
             (setenv "DISPLAY" ":0")
+
             ;; This test is meant to run on Windows.
-             (delete-file "tests/test_xvfb_windows.py"))))))
+             (delete-file "tests/test_xvfb_windows.py")
+             #t)))))
    (native-inputs
-     (list python-pytest
-           python-setuptools
-           xorg-server-for-tests))
+     (list python-pytest python-pytest-runner xorg-server-for-tests))
    (propagated-inputs
     (list python-pyvirtualdisplay))
    (home-page "https://github.com/The-Compiler/pytest-xvfb")
@@ -4275,11 +4214,9 @@ framework.")
       (sha256
        (base32
         "1i17xh4dy238ibrjdgh8vn78fk5q6dj37mcznpvdfzidj57js7ca"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     `(#:tests? #f))                  ;the mini test suite fails
-    (native-inputs
-     (list python-pytest python-setuptools))
    (home-page "https://github.com/farizrahman4u/pyux")
    (synopsis "Utility to check API integrity in Python libraries")
    (description "The pyux utility detects API changes in Python
@@ -5002,7 +4939,7 @@ unused.")
       (uri (pypi-uri "xunitparser" version))
       (sha256
        (base32 "00lapxi770mg7jkw16zy3a91hbdfz4a9h43ryczdsgd3z4cl6vyf"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     `(#:phases
       (modify-phases %standard-phases
@@ -5012,9 +4949,7 @@ unused.")
             (substitute* "xunitparser.py"
               (("(^ +)self.stderr = None" m indent)
                (string-append m "\n" indent "self._cleanup = False\n"))))))))
-    (native-inputs
-     (list python-pytest python-setuptools))
-    (home-page "https://gitlab.com/woob/xunitparser/")
+    (home-page "http://git.p.engu.in/laurentb/xunitparser/")
    (synopsis "Read JUnit/XUnit XML files and map them to Python objects")
    (description "xunitparser reads a JUnit/XUnit XML file and maps it to
 Python objects.  It tries to use the objects available in the standard
@@ -5024,16 +4959,14 @@ Python objects.  It tries to use the objects available in the standard
 (define-public python-xvfbwrapper
  (package
    (name "python-xvfbwrapper")
-    (version "0.2.16")
+    (version "0.2.9")
    (source (origin
              (method url-fetch)
              (uri (pypi-uri "xvfbwrapper" version))
              (sha256
               (base32
-                "01gqp740hkb2asnfpvb0fjpjqj88rylhx4b1r2c0wzrknwshp016"))))
-    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-pytest python-setuptools))
+                "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w"))))
+    (build-system python-build-system)
    (propagated-inputs (list xorg-server-for-tests))
    (home-page "https://github.com/cgoldberg/xvfbwrapper")
    (synopsis "Python module for controlling virtual displays with Xvfb")
@@ -5043,27 +4976,3 @@ the X11 display server protocol.  It runs in memory and does not require a
 physical display.  Only a network layer is necessary.  Xvfb is useful for
 running acceptance tests on headless servers.")
    (license license:expat)))
-
-(define-public tms
-  (package
-    (name "tms")
-    (version "0.1.2")
-    (source
-     (origin
-       (method hg-fetch)
-       (uri (hg-reference
-              (url "https://hg.sr.ht/~olly/tms")
-              (changeset (string-append "v" version))))
-       (file-name (string-append name "-" version "-checkout"))
-       (sha256
-        (base32 "1k8v8vx0klz3zfj81g9d1rancn819sv51lgs5j94x69kqzgn3fsw"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:test-backend #~'custom
-           #:test-flags #~(list "tests.py")))
-    (native-inputs (list python-setuptools))
-    (home-page "https://hg.sr.ht/~olly/tms")
-    (synopsis "Test Match Special for test assertions")
-    (description
-     "This package provides match data structures and types in test code.")
-    (license license:bsd-2)))
@@ -188,6 +188,9 @@ to access its data, so it can be used as a drop-in replacement.")
 package, an implementation of the Brotli lossless compression algorithm.")
    (license license:expat)))

+(define-deprecated-package python-google-brotli
+  python-brotli)
+
 (define-public python-multivolumefile
  (package
    (name "python-multivolumefile")
@@ -792,6 +795,9 @@ for improving compression, as well as a python/C package that implements this
 algorithm within the Numpy framework.")
    (license license:expat)))

+(define-deprecated-package bitshuffle
+  python-bitshuffle)
+
 (define-public bitshuffle-for-snappy
  (package/inherit python-bitshuffle
    (name "bitshuffle-for-snappy")
@@ -810,10 +810,15 @@ ECB and OFB).")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1qsg06qrqnzixmrm65ibg503y2gffd675h1si4jgh92s315w1jrk"))))
-    (build-system pyproject-build-system)
-    (arguments (list #:test-backend #~'unittest))
-    (native-inputs (list python-setuptools))
+        (base32
+         "1qsg06qrqnzixmrm65ibg503y2gffd675h1si4jgh92s315w1jrk"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "python" "run.py" "tests")))))))
    (home-page "https://github.com/wbond/asn1crypto")
    (synopsis "ASN.1 parser and serializer in Python")
    (description
@@ -868,12 +873,16 @@ of improving usability, security and speed.")
              (sha256
               (base32
                "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     (list
-      #:test-backend #~'custom
-      #:test-flags #~(list "-m" "crcmod.test")))
-    (native-inputs (list python-setuptools))
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                ;; As per the Unit Testing subsection in the README.
+                (invoke "python" "-m" "crcmod.test")))))))
    (synopsis "CRC generator for Python")
    (description "Python module for generating objects that compute the
 Cyclic Redundancy Check.")
@@ -883,26 +892,33 @@ Cyclic Redundancy Check.")
 (define-public python-blurhash
  (package
    (name "python-blurhash")
-    (version "1.1.5")
+    (version "1.1.4")
    (source
      (origin
+        ;; Tests not included in pypi release and releases not tagged in git repo.
        (method git-fetch)
        (uri (git-reference
               (url "https://github.com/halcy/blurhash-python")
-               (commit (string-append "v" version))))
+               (commit "22e081ef1c24da1bb5c5eaa2c1d6649724deaef8")))
        (file-name (git-file-name name version))
        (sha256
-         (base32 "16xcjxiya773fp7bxs9i6y1wsjx88pdvlwj6bqyy9vf3ckcffcwm"))))
-    (build-system pyproject-build-system)
+         (base32
+          "1qq6mhydlp7q3na4kmaq3871h43wh3pyfyxr4b79bia73wjdylxf"))))
+    (build-system python-build-system)
    (arguments
-     (list #:test-flags #~(list "-c" "/dev/null")))
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (delete-file "setup.cfg")
+             (invoke "pytest"))))))
    (native-inputs
-     (list python-numpy python-pillow python-pytest python-setuptools))
+     (list python-numpy python-pillow python-pytest))
    (home-page "https://github.com/halcy/blurhash-python")
-    (synopsis "Pure-Python implementation of the blurhash algorithm")
+    (synopsis
+     "Pure-Python implementation of the blurhash algorithm")
    (description
-     "This package provides a pure Python implementation of the blurhash
-algorithm.")
+     "Pure-Python implementation of the blurhash algorithm.")
    (license license:expat)))

 (define-public python-ecpy
@@ -971,42 +987,19 @@ Python.")
 (define-public python-pycryptodome
  (package
    (name "python-pycryptodome")
-    (version "3.23.0")
+    (version "3.21.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/Legrandin/pycryptodome")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pycryptodome" version))
       (sha256
-        (base32 "0j1dk55y0q7gqmig1l5b8774w63w2i7qrii1xzkpzz0c3i229i67"))
+        (base32
+         "15vjyjy686kgm4fnpwlah1wvxxy0wvr4q5vnp1iygnlv8q6pwy7p"))
       (modules '((guix build utils)))
       (snippet pycryptodome-unbundle-tomcrypt-snippet)))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 42912 passed
-      #:test-backend #~'custom
-      ;; As seen in
-      ;; <https://github.com/Legrandin/pycryptodome/blob/v3.23.0/INSTALL.rst>.
-      #:test-flags
-      #~(list "-m" "Crypto.SelfTest")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-gmp-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "lib/Crypto/Math/_IntegerGMP.py"
-                (("load_lib\\(\"gmp\"")
-                 (format #f "load_lib(~s"
-                         (search-input-file inputs "/lib/libgmp.so.10")))))))))
-    (native-inputs
-     (list python-pycryptodome-test-vectors
-           python-setuptools))
+    (build-system python-build-system)
    (inputs
-     (list gmp
-           libtomcrypt
-           libtommath))
+     (list libtomcrypt libtommath))
    (home-page "https://www.pycryptodome.org")
    (synopsis "Low-level cryptographic Python library")
    (description
@@ -1047,44 +1040,18 @@ PyCryptodome variants, the other being python-pycryptodomex.")
    (license (list license:bsd-2
                   license:public-domain)))) ; code inherited from PyCrypto

-(define-public python-pycryptodome-test-vectors
-  (package
-    (name "python-pycryptodome-test-vectors")
-    (version "1.0.22")
+(define-public python-pycryptodomex
+  (package (inherit python-pycryptodome)
+    (name "python-pycryptodomex")
+    (version (package-version python-pycryptodome))
    (source
     (origin
       (method url-fetch)
-       (uri (pypi-uri "pycryptodome_test_vectors" version))
+       (uri (pypi-uri "pycryptodomex" version))
       (sha256
-        (base32 "19bn19fpnkj39nki2dp8k26is5fpqa3q7agkhk9rvfqfvzvgx3nn"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:tests? #f))        ;no tests
-    (native-inputs
-     (list python-setuptools)) 
-    (home-page "https://www.pycryptodome.org")
-    (synopsis "Test vectors for PyCryptodome")
-    (description
-     "This package provides test vectors for @code{PyCryptodome}.")
-    (license (list license:bsd-2
-                   license:asl2.0))))
-
-(define-public python-pycryptodomex
-  (package/inherit python-pycryptodome
-    (name "python-pycryptodomex")
-    (arguments
-     (substitute-keyword-arguments (package-arguments python-pycryptodome)
-       ((#:test-flags _)
-        #~(list "-m" "Cryptodome.SelfTest"))
-       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            (add-before 'build 'set-separate-namespace
-              (lambda _
-                ;; This changes the build logic, see setup.py.
-                (with-output-to-file ".separate_namespace"
-                  (lambda _ (display "")))))))))
-    (synopsis
-     "Low-level cryptographic Python library independent of the old PyCrypto")
+        (base32 "0v4y03ha7rm9kdcv9fkrmc94425z3q3mq1nn5p1jbpc1ag80nb92"))
+       (modules '((guix build utils)))
+       (snippet pycryptodome-unbundle-tomcrypt-snippet)))
    (description
     "PyCryptodome is a self-contained Python package of low-level
 cryptographic primitives.  It's not a wrapper to a separate C library like
@@ -1152,28 +1119,41 @@ through the Engine interface.")
 (define-public python-pykeepass
  (package
    (name "python-pykeepass")
-    (version "4.1.1.post1")
+    (version "3.2.1")
    (source
     (origin
       (method git-fetch)
+       ;; Source tarball on PyPI doesn't include tests.
       (uri (git-reference
-              (url "https://github.com/libkeepass/pykeepass")
-              (commit (string-append "v" version))))
+             (url "https://github.com/libkeepass/pykeepass")
+             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1ayvgklq3naydx01m7hyvf44ywczk5yzy2pk48bpfayl7bgk7q8d"))))
-    (build-system pyproject-build-system)
+        (base32 "1symxf4ahylynihnp9z4z3lh2vy65ipvg8s4hjrnn936hcaaxghk"))))
+    (build-system python-build-system)
    (arguments
-     ;; tests: 115 passed
-     (list #:test-backend #~'unittest))
-    (native-inputs
-     (list python-setuptools))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'make-kdbx-writable
+           ;; Tests have to write to the .kdbx files in the test directory.
+           (lambda _
+             (with-directory-excursion "tests"
+               (for-each make-file-writable (find-files "."))
+               #t)))
+         (add-before 'build 'patch-requirements
+           (lambda _
+             ;; Update requirements from dependency==version
+             ;; to dependency>=version.
+             (substitute* "setup.py"
+               (("==") ">="))
+             #t)))))
    (propagated-inputs
     (list python-argon2-cffi
           python-construct
+           python-dateutil
+           python-future
           python-lxml
-           python-pycryptodomex
-           python-pyotp))
+           python-pycryptodomex))
    (home-page "https://github.com/libkeepass/pykeepass")
    (synopsis "Python library to interact with keepass databases")
    (description
@@ -1441,20 +1421,20 @@ Password-Authenticated Key Exchange algorithm.")
       (method url-fetch)
       (uri (pypi-uri "keyutils" version))
       (sha256
-        (base32 "0lipygpzhwzzsq2k5imb1jgkmj8y4khxdwhzadjs3bd56g6bmkx9"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'regenerate-c-file
-            (lambda _
-              (invoke "cython" "keyutils/_keyutils.pyx"))))))
+        (base32
+         "0lipygpzhwzzsq2k5imb1jgkmj8y4khxdwhzadjs3bd56g6bmkx9"))))
+    (build-system python-build-system)
    (native-inputs
-     (list python-cython python-pytest python-setuptools))
+     (list python-cython python-pytest python-pytest-runner))
    (inputs
     (list keyutils))
+    (arguments
+     (list #:tests? #f
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'build 'regenerate-c-file
+                 (lambda _
+                   (invoke "cython" "keyutils/_keyutils.pyx"))))))
    (home-page "https://github.com/sassoftware/python-keyutils")
    (synopsis "Python bindings for keyutils")
    (description
@@ -1709,10 +1689,19 @@ implementation of the Argon2 password hashing algorithm.")
               (commit "2838db3df239797c71bddacc48a4c49a83f35747")))
        (file-name (git-file-name name version))
        (sha256
-         (base32 "1m32dh5fqc8cy7jyf1z5fs6zvmdkbq5fi98hr609gbl7s0l0y0i9"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-setuptools))
-    (propagated-inputs (list python-argon2-cffi python-cryptography))
+         (base32
+          "1m32dh5fqc8cy7jyf1z5fs6zvmdkbq5fi98hr609gbl7s0l0y0i9"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "python" "-m" "pytest"))))))
+    (native-inputs
+     (list python-pytest))
+    (propagated-inputs
+     (list python-argon2-cffi python-cryptography))
    (home-page "https://www.dropbox.com/developers")
    (synopsis "Library to password-protect your data")
    (description
@@ -1756,19 +1745,12 @@ can also encrypt and decrypt messages using RSA and ECDH.")
    (version "0.1.5")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/google/pyu2f/")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pyu2f" version))
       (sha256
-        (base32 "1jlpplw7hlrh8bgmp37g18panij0p7ism6r4d981my4dc73lbwik"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; This test requires the fakefs package.
-      #:test-flags #~(list "--ignore=pyu2f/tests/hid/linux_test.py")))
-    (native-inputs (list python-mock python-pytest python-setuptools))
+        (base32 "0srhzdbgdsqwpcw7awqm19yg3xbabqckfvrp8rbpvz2232hs7jm3"))))
+    (build-system python-build-system)
+    (arguments '(#:tests? #f))          ;none included
    (propagated-inputs (list python-six))
    (home-page "https://github.com/google/pyu2f/")
    (synopsis "U2F host library for interacting with a U2F device over USB")
@@ -1812,27 +1794,24 @@ supply a handful of python functions as methods to a class.")
 (define-public python-starkbank-ecdsa
  (package
    (name "python-starkbank-ecdsa")
-    (version "2.2.0")
+    (version "2.0.3")
    (home-page "https://github.com/starkbank/ecdsa-python")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url home-page)
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "01zy16csrbyfhjl0kay9rbpbwc3dpr7kh2qkrbdy5a1n644fbahx"))))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1k9h4p0frkgj76vrqfjim4mik98g09mivdxxcmxr6raa5jwr83sh"))))
    (arguments
-     (list
-      #:test-backend #~'unittest
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-broken-test
-            (lambda _
-              (delete-file "tests/testOpenSSL.py"))))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-setuptools))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'remove-broken-test
+                          (lambda _
+                            (delete-file "tests/testOpenSSL.py"))))))
+    (build-system python-build-system)
+    (native-inputs (list python-pytest))
    (synopsis "Python ECDSA library")
    (description "This package provides a Python ECDSA library, optimized for
 speed but without C extensions.")
--- a/Show More
+++ b/Show More