gnu: sweeper: Update to 26.04.1.

* gnu/packages/kde-utils.scm (sweeper): Update to 26.04.1. Change-Id: Ia3bf8408390716188d4e877f31f0f5ef163b466c
gnu: okteta: Update to 0.26.27.
2026-07-08 12:24:06 +02:00 · 2026-05-27 22:57:03 +05:30 · 2026-05-27 22:57:03 +05:30 · 2026-05-27 22:57:03 +05:30 · 2026-05-27 22:57:02 +05:30 · 2026-05-27 22:57:02 +05:30
361 changed files with 22568 additions and 28263 deletions
@@ -42,11 +42,12 @@
     ;; For use with 'bug-reference-prog-mode'.  Extra bug-reference
     ;; configuration should be done in your Emacs user configuration file;
     ;; refer to (info (guix) The Perfect Setup).
-     (eval . (setq-local bug-reference-bug-regexp
-                         ;; #8545 (issues), !8545 (PRs), guix/guix#8545 and
-                         ;; guix/guix!8545
-                         (rx (group (seq (? "guix/guix") (or "#" "!"))
-                                    (group (one-or-more digit))))))
+     (eval . (setq-local
+              ;; #8545, guix/guix#8545, guix/guix!8545, but not !8545
+              bug-reference-bug-regexp
+              (rx (group (or (seq (zero-or-more "guix/guix") "#")
+                             (seq (one-or-more "guix/guix") "!"))
+                         (group (one-or-more digit))))))
     (bug-reference-url-format . "https://codeberg.org/guix/guix/issues/%s")

     (eval . (add-to-list 'completion-ignored-extensions ".go"))
@@ -292,12 +292,12 @@ guix/build-system/julia\.scm                       @guix/julia

 gnu/packages/(kde)(-.+|)\.scm$                     @guix/kde

-gnu/build/linux-modules\.scm                       @guix/linux-libre
-gnu/packages/aux-files/linux-libre.*$              @guix/linux-libre
-gnu/packages/linux\.scm                            @guix/linux-libre
-gnu/tests/linux-modules\.scm                       @guix/linux-libre
-guix/build/linux-module-build-system\.scm          @guix/linux-libre
-guix/build-system/linux-module\.scm                @guix/linux-libre
+gnu/build/linux-modules\.scm                       @guix/kernel
+gnu/packages/aux-files/linux-libre.*$              @guix/kernel
+gnu/packages/linux\.scm                            @guix/kernel
+gnu/tests/linux-modules\.scm                       @guix/kernel
+guix/build/linux-module-build-system\.scm          @guix/kernel
+guix/build-system/linux-module\.scm                @guix/kernel

 gnu/packages/lisp(-.+|)\.scm$                      @guix/lisp
 guix/build/asdf-build-system\.scm                  @guix/lisp
@@ -341,7 +341,6 @@ guix/build-system/rakudo\.scm                      @guix/perl
 guix/import/cpan\.scm                              @guix/perl
 guix/scripts/import/cpan\.scm                      @guix/perl

-gnu/packages/aux-files/python/.*\.py$              @guix/python
 gnu/packages/django\.scm                           @guix/python
 gnu/packages/jupyter\.scm                          @guix/python
 gnu/packages/python(-.+|)\.scm$                    @guix/python
@@ -488,7 +488,6 @@ AUX_FILES =						\
  gnu/packages/aux-files/linux-libre/5.10-x86_64.conf	\
  gnu/packages/aux-files/ovmf/51-edk2-ovmf-2m-raw-x64-nosb.json	\
  gnu/packages/aux-files/pack-audit.c			\
-  gnu/packages/aux-files/python/pytest_guix.py		\
  gnu/packages/aux-files/python/sanity-check.py		\
  gnu/packages/aux-files/python/sitecustomize.py	\
  gnu/packages/aux-files/renpy/renpy.in	\
@@ -1281,14 +1280,6 @@ $(GIT_HOOKS_DIR):
 $(GIT_HOOKS_DIR)/%: etc/git/% | $(GIT_HOOKS_DIR)/
 	if [ -n "$(GIT_HOOKS_DIR)" ]; then cp "$<" "$@"; fi

-# Special-case the pre-push hook installation, to ensure it is always
-# up-to-date with its source.
-.PHONY: $(GIT_HOOKS_DIR)/pre-push
-$(GIT_HOOKS_DIR)/pre-push: etc/git/pre-push | $(GIT_HOOKS_DIR)
-	@if [ -n "$(GIT_HOOKS_DIR)" ]; then \
-	  cmp "--silent" "$<" "$@" || cp "$<" "$@"; \
-	fi
-
 $(GIT_CONFIG_FILE): etc/git/gitconfig
 	if [ -n "$(GIT_CONFIG_FILE)" ]; then \
 	  git config --fixed-value --replace-all include.path \
@@ -120,7 +120,6 @@ running 'guix-daemon $extra_options'" >&2
    "@abs_top_builddir@/pre-inst-env"				\
 	"@abs_top_builddir@/guix-daemon"			\
        $extra_options						\
-        --allow-aslr                                            \
 	--substitute-urls="$GUIX_BINARY_SUBSTITUTE_URL" &

    daemon_pid=$!
@@ -618,33 +618,6 @@ enhance @code{scheme-mode} and Geiser.  @xref{Introduction,,,
 emacs-guix, Emacs-Guix Reference Manual}, to make sure you don't miss
 out!

-@unnumberedsubsubsec Submitting Pull Requests Following the AGit Workflow
-
-@cindex AGit workflow, for pull requests (Emacs).
-@url{https://codeberg.org/halvin/agitjo, Agitjo} is a helper to ease
-AGit workflow based patch submission (@pxref{Submitting Patches}).
-Install it with:
-
-@example
-guix install emacs-agitjo
-@end example
-
-Assuming your local checkout is on the branch containing the changes you
-would like to submit for inclusion in the @code{master} branch, use
-@command{M-x agitjo-push} then:
-
-@itemize
-@item
-Set options like the title @option{-t} and the session identifier
-@option{-s}.
-@item
-Invoke one of the push commands to execute a @command{git push} operation.
-@end itemize
-
-When creating a new pull request, a dedicated buffer will open for
-drafting a description. The force-push option @option{-f} is enabled to
-push changes to the existing pull request.
-
@unnumberedsubsubsec Taming Boilerplate with Templates

@cindex code snippets
@@ -152,7 +152,6 @@ Copyright @copyright{} 2026 David Elsing@*
 Copyright @copyright{} 2026 Nguyễn Gia Phong@*
 Copyright @copyright{} 2026 Yarl Baudig@*
 Copyright @copyright{} 2026 Joan Vilardaga Castro@*
-Copyright @copyright{} 2026 Nemin@*

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -306,7 +305,6 @@ Package Management
 Substitutes

 * Official Substitute Servers::  One particular source of substitutes.
-* Volunteer Run Mirrors::        Additional, regional sources of substitutes.
 * Substitute Server Authorization::  How to enable or disable substitutes.
 * Getting Substitutes from Other Servers::  Substitute diversity.
 * Substitute Authentication::   How Guix verifies substitutes.
@@ -1781,21 +1779,6 @@ user namespaces is missing (@pxref{Build Environment Setup}).  Use at
 your own risk!
@end quotation

-@cindex ASLR (address space layout randomization), for builds
-@cindex address space layout randomization (ASLR), for builds
-@cindex Docker, running @command{guix-daemon}
-@cindex @command{guix-daemon}, running under Docker
-@item --allow-aslr
-Allow builds to start even if @acronym{ASLR, Address Space Layout
-Randomization} cannot be disabled on Linux systems.  This is normally
-done so as to increase reproducibility, but some environments, such as
-those affected by Docker's default seccomp policy, don't permit
-disabling ASLR.  Passing this option will allow builds to start with
-reduced reproducibility regardless.
-
-Note that passing this option doesn't ensure that ASLR is enabled, it
-only allows builds to start even when disabling it is blocked.
-
@item --isolate-host-loopback
 Prevent fixed-output chroot builds from accessing the host loopback.
 When this is used, fixed-output builds will have their own loopback
@@ -3953,7 +3936,6 @@ also result from derivation builds, can be available as substitutes.

@menu
 * Official Substitute Servers::  One particular source of substitutes.
-* Volunteer Run Mirrors::  Additional, regional sources of substitutes.
 * Substitute Server Authorization::  How to enable or disable substitutes.
 * Getting Substitutes from Other Servers::  Substitute diversity.
 * Substitute Authentication::   How Guix verifies substitutes.
@@ -3984,54 +3966,13 @@ could use the information gathered to determine, for instance, whether
 your system has unpatched security vulnerabilities.

 Substitutes from the official build farms are enabled by default when
-using Guix System (@pxref{GNU Distribution}).  However, they are
-disabled by default when using Guix on a foreign distribution, unless
-you have explicitly enabled them via one of the recommended installation
-steps (@pxref{Installation}).  Please @pxref{Substitute Server
-Authorization} on how to enable or disable substitutes for the official
-build farm; the same procedure can also be used to enable substitutes
-for any other substitute server.
-
-@node Volunteer Run Mirrors
-@subsection Volunteer Run Mirrors
-
-@cindex substitutes
-@cindex mirrors
-Beyond the two official substitute servers, there are additionally
-volunteer run mirrors.  These mirrors do not build their own
-substitutes, but rather copy them from the official build farm and
-distribute them to users.  Enabling a mirror may be beneficial in case
-the official servers are temporarily unavailable or provide inadequate
-bandwidth at the user's location.
-
-@quotation Note
-Mirrored substitutes are signed by the original builder, not the mirror.
-This means that mirror operators @strong{cannot} add or modify binaries,
-as long as you trust only the official substitute servers,
-@pxref{Substitute Server Authorization}.
-@end quotation
-
-List of volunteer run mirrors, grouped by location (with the build farm
-they mirror in parentheses):
-
-@table @asis
-@item Germany
-@itemize
-@item @code{https://hydra-guix-129.guix.gnu.org} (bordeaux.guix.gnu.org)
-@end itemize
-@item People's Republic of China
-@itemize
-@item @code{https://mirrors.sjtug.sjtu.edu.cn/guix} (ci.guix.gnu.org)
-@item @code{https://mirrors.sjtug.sjtu.edu.cn/guix-bordeaux} (bordeaux.guix.gnu.org)
-@end itemize
-@item Russia
-@itemize
-@item @code{https://mirror.yandex.ru/mirrors/guix/} (bordeaux.guix.gnu.org)
-@end itemize
-@end table
-
-To enable receiving substitutions from these mirrors, please @pxref{Getting
-Substitutes from Other Servers}.
+using Guix System (@pxref{GNU Distribution}).  However,
+they are disabled by default when using Guix on a foreign distribution,
+unless you have explicitly enabled them via one of the recommended
+installation steps (@pxref{Installation}).  The following paragraphs
+describe how to enable or disable substitutes for the official build
+farm; the same procedure can also be used to enable substitutes for any
+other substitute server.

@node Substitute Server Authorization
@subsection Substitute Server Authorization
@@ -36293,10 +36234,6 @@ Launch the app as this group (it must be an existing group).
 A list of sockets (as path strings) which gunicorn will be listening
 on.  This list must contain at least one socket.

-@item @code{control-socket} (default: #f) (type: string)
-If set, creates a gunicorn control-socket at the given path.  Note that,
-the control socket should refer to a path listed in @code{mappings}.
-
@item @code{socket-user} (default: @code{user}) (type: string)
 Owner of the directory containing the socket (must be an existing user).

@@ -38132,21 +38069,6 @@ This is the type of the dnsmasq service, whose value should be a
           (servers '("192.168.1.1"))))
@end lisp

-The following example shows a slightly more complex configuration that
-defines an authoritative DNS server on a given subdomain.
-@lisp
-(service dnsmasq-service-type
-         (dnsmasq-configuration
-           (listen-addresses '("10.1.1.1"))
-           (no-resolv? #t)
-           (no-hosts? #t)
-           (authoritative-servers '("vpn.example.com")) ;self
-           (authoritative-zones '("vpn.example.com"))
-           (host-records '("some-service.vpn.example.com,10.1.1.1"))))
-@end lisp
-
-For more examples, refer to @samp{man 8 dnsmasq.}
-
@code{dnsmasq-service-type} provides two actions:

@table @code
@@ -38236,33 +38158,12 @@ ie a subnet for which an interface exists on the server.
@item @code{listen-addresses} (default: @code{'()})
 Listen on the given IP addresses.

-@item @code{ipv4?} (default: @code{#t})
-Whether to include A records in answers.
-
-@item @code{ipv6?} (default: @code{#t})
-Whether to include AAAA records in answers.
-
@item @code{resolv-file} (default: @code{"/etc/resolv.conf"})
 The file to read the IP address of the upstream nameservers from.

@item @code{no-resolv?} (default: @code{#f})
 When true, don't read @var{resolv-file}.

-@item @code{authoritative-servers} (default: @code{'()})
-A list of strings corresponding to valid @option{--auth-server} values,
-such as a domain name.  This is useful to make @command{dnsmasq}
-authoritative for a given domain name or interface.
-
-@item @code{authoritative-zones} (default: @code{'()})
-A list of strings corresponding to valid @option{--auth-zone} values,
-such as a domain name.  This is useful to make @command{dnsmasq}
-authoritative for a given domain name.  Note that this must be used in
-conjunction with the @code{authoritative-servers} option.
-
-@item @code{host-records} (default: @code{'()})
-A list of strings corresponding to valid @option{--host-record} values,
-for example @code{'("some-service.example.com,10.1.1.1")}.
-
@item @code{forward-private-reverse-lookup?} (default: @code{#t})
 When false, all reverse lookups for private IP ranges are answered with
 "no such domain" rather than being forwarded upstream.
@@ -38271,12 +38172,6 @@ When false, all reverse lookups for private IP ranges are answered with
 When true, dnsmasq queries the servers in the same order as they appear
 in @var{servers}.

-@item @code{locals} (default: @code{'()})
-Specify domain name @emph{patterns} which should be treated as local,
-that is, for which there should be no delegation to upstream servers.
-Provided pattern values should be of the form
-@code{'("/vpn.example.com/")}.
-
@item @code{servers} (default: @code{'()})
 Specify IP address of upstream servers directly.

@@ -1,4 +1,5 @@
 #!/bin/sh
+# From Gerrit Code Review 3.11.1.
 #
 # Part of Gerrit Code Review (https://www.gerritcodereview.com/)
 #
@@ -69,9 +70,9 @@ dest="$1.tmp.${random}"

 trap 'rm -f "$dest" "$dest-2"' EXIT

-if ! sed -e '/>8/q' "$1" | git stripspace --strip-comments > "${dest}" ; then
-  echo "cannot strip comments from $1"
-  exit 1
+if ! cat "$1" | sed -e '/>8/q' | git stripspace --strip-comments > "${dest}" ; then
+   echo "cannot strip comments from $1"
+   exit 1
 fi

 if test ! -s "${dest}" ; then
@@ -90,7 +91,7 @@ else
  pattern=".*"
 fi

-if git interpret-trailers --no-divider --parse < "$1" | grep -q "^$token: $pattern$" ; then
+if git interpret-trailers --parse < "$1" | grep -q "^$token: $pattern$" ; then
  exit 0
 fi

@@ -98,7 +99,6 @@ fi
 # sentinel at the end to make sure there is one.
 # Avoid the --in-place option which only appeared in Git 2.8
 if ! git interpret-trailers \
-         --no-divider \
         --trailer "Signed-off-by: SENTINEL" < "$1" > "$dest-2" ; then
  echo "cannot insert Signed-off-by sentinel line in $1"
  exit 1
@@ -110,7 +110,6 @@ fi
 # Avoid the --in-place option which only appeared in Git 2.8
 # Avoid the --where option which only appeared in Git 2.15
 if ! git -c trailer.where=before interpret-trailers \
-         --no-divider \
         --trailer "Signed-off-by: $token: $value" < "$dest-2" |
     sed -e "s/^Signed-off-by: \($token: \)/\1/" \
         -e "/^Signed-off-by: SENTINEL/d" > "$dest" ; then
@@ -876,8 +876,8 @@ and the maven-build-system."
        "The plasma desktop environment, and KDE Applications."
        #:scope (list (make-regexp* "^gnu/packages/(kde)(-.+|)\\.scm$"))))

-(define-team linux-libre
-  (team 'linux-libre
+(define-team kernel
+  (team 'kernel
        #:name "Linux-libre kernel team"
        #:scope (list "gnu/build/linux-modules.scm"
                      (make-regexp* "^gnu/packages/aux-files/linux-libre.*$")
@@ -984,8 +984,7 @@ perl-build-system as well as the rakudo-build-system."
        #:description
        "Python, Python packages, the \"pypi\" importer, and the python-build-system."
        #:scope
-        (list (make-regexp* "^gnu/packages/aux-files/python/.*\\.py$")
-              "gnu/packages/django.scm"
+        (list "gnu/packages/django.scm"
              "gnu/packages/jupyter.scm"
              (make-regexp* "^gnu/packages/python(-.+|)\\.scm$")
              "gnu/packages/sphinx.scm"
@@ -1298,7 +1297,7 @@ the \"texlive\" importer."
 (define-member (person "Leo Famulari"
                       "leo@famulari.name"
                       "lfam")
-  linux-libre)
+  kernel)

 (define-member (person "Efraim Flashner"
                       "efraim@flashner.co.il"
@@ -1383,7 +1382,7 @@ the \"texlive\" importer."
 (define-member (person "Vagrant Cascadian"
                       "vagrant@debian.org"
                       "vagrantc")
-  debian embedded linux-libre)
+  debian embedded kernel)

 (define-member (person "Vagrant Cascadian"        ;XXX: duplicate
                       "vagrant@reproducible-builds.org"
@@ -1537,7 +1536,7 @@ the \"texlive\" importer."
 (define-member (person "Rodion Goritskov"
                       "rodion@goritskov.com"
                       "rodion-goritskov")
-  games java kde linux-libre release)
+  games java kde kernel release)

 (define-member (person "Jason Conroy"
                       "jconroy@tscripta.net"
@@ -1577,7 +1576,7 @@ the \"texlive\" importer."
 (define-member (person "Nguyễn Gia Phong"
                       "cnx@loang.net"
                       "cnx")
-  build-tools lua qa-packages sysadmin vcs)
+  build-tools python qa-packages sysadmin vcs)

 (define-member (person "Lilah Tascheter"
                       "lilah@lunabee.space"
@@ -1622,7 +1621,7 @@ the \"texlive\" importer."
 (define-member (person "Wilko Meyer"
                       "w@wmeyer.eu"
                       "theesm")
-  linux-libre perl)
+  kernel perl)

 (define-member (person "Untrusem"
                       "mysticmoksh@riseup.net"
@@ -173,16 +173,7 @@ SYSTEM."
 (define (core-packages system)
  "Return the 'core' package set suitable for SYSTEM, which might be a system
 type or a GNU triplet."
-  (cond ((target-linux? system)
-         (append %core-packages
-                 %linux-packages
-                 (cond ((target-arm32? system)
-                        (list linux-libre-arm-generic))
-                       ((target-aarch64? system)
-                        (list linux-libre-arm64-generic))
-                       ((target-riscv64? system)
-                        (list linux-libre-riscv64-generic))
-                       (else '()))))
+  (cond ((target-linux? system) (append %core-packages %linux-packages))
        ((target-hurd? system) (append %core-packages %hurd-packages))
        ((target-mingw? system) %core-packages-for-mingw)
        (else '())))
@@ -125,18 +125,16 @@ entry will be expired even if it has been accessed recently.")
                 (requirement shepherd-requirement)
                 (modules '((shepherd support)))  ;for '%user-runtime-dir'
                 (start
-                  #~(lambda args
-                      ((make-systemd-constructor
-                        (list #$(file-append gnupg "/bin/gpg-agent")
-                              "--supervised" "--enable-ssh-support")
-                        (list #$(endpoint "ssh" "S.gpg-agent.ssh")
-                              #$(endpoint "browser" "S.gpg-agent.browser")
-                              #$(endpoint "extra" "S.gpg-agent.extra")
-                              ;; #$(endpoint "scdaemon" "S.scdaemon")
-                              #$(endpoint "std" "S.gpg-agent"))
-                        ;; Inherit graphical session environment.
-                        #:environment-variables (environ))
-                       args)))
+                  #~(make-systemd-constructor
+                     (list #$(file-append gnupg "/bin/gpg-agent")
+                           "--supervised" "--enable-ssh-support")
+                     (list #$(endpoint "ssh" "S.gpg-agent.ssh")
+                           #$(endpoint "browser" "S.gpg-agent.browser")
+                           #$(endpoint "extra" "S.gpg-agent.extra")
+                           ;; #$(endpoint "scdaemon" "S.scdaemon")
+                           #$(endpoint "std" "S.gpg-agent"))
+                     ;; Inherit graphical session environment.
+                     #:environment-variables (environ)))
                 (stop #~(make-systemd-destructor))
                 (documentation "Start 'gpg-agent', the GnuPG passphrase
 agent, with support for handling OpenSSH material."))))
@@ -76,7 +76,6 @@
 # Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 # Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 # Copyright © 2025 bdunahu <bdunahu@operationnull.com>
-# Copyright © 2026 Simen Endsjø <contact@simendsjo.me>
 #
 # This file is part of GNU Guix.
 #
@@ -344,7 +343,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/golang-check.scm		\
  %D%/packages/golang-compression.scm		\
  %D%/packages/golang-crypto.scm	      	\
-  %D%/packages/golang-graphics.scm	\
  %D%/packages/golang-maths.scm		\
  %D%/packages/golang-vcs.scm	        	\
  %D%/packages/golang-web.scm	        	\
@@ -1001,12 +999,10 @@ dist_patch_DATA =						\
  %D%/packages/patches/agg-am_c_prototype.patch			\
  %D%/packages/patches/agg-2.5-gcc8.patch			\
  %D%/packages/patches/akonadi-paths.patch		\
-  %D%/packages/patches/akonadi-not-relocatable.patch		\
  %D%/packages/patches/akonadi-timestamps.patch		\
  %D%/packages/patches/alure-dumb-2.patch			\
  %D%/packages/patches/amd-smi-newer-libdrm.patch		\
  %D%/packages/patches/amd-smi-python.patch			\
-  %D%/packages/patches/angband-remove-nonfree-tile-options.patch	\
  %D%/packages/patches/ibus-anthy-fix-tests.patch		\
  %D%/packages/patches/ibus-table-paths.patch			\
  %D%/packages/patches/antiword-CVE-2014-8123.patch			\
@@ -1023,7 +1019,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/ath9k-htc-firmware-gcc.patch		\
  %D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch	\
  %D%/packages/patches/atlas-gfortran-compat.patch		\
-  %D%/packages/patches/aubio-waflib-python312-compat.patch	\
  %D%/packages/patches/audacity-ffmpeg-fallback.patch		\
  %D%/packages/patches/audiofile-fix-datatypes-in-tests.patch	\
  %D%/packages/patches/audiofile-fix-sign-conversion.patch	\
@@ -1106,6 +1101,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/cdparanoia-fpic.patch			\
  %D%/packages/patches/cdrkit-libre-cross-compile.patch	\
  %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch 	\
+  %D%/packages/patches/ceph-fix-cmake.patch                     \
  %D%/packages/patches/cf-tool-add-languages.patch		\
  %D%/packages/patches/chmlib-inttypes.patch			\
  %D%/packages/patches/cl-ana-pr-49.patch			\
@@ -1138,8 +1134,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/clog-fix-shared-build.patch		\
  %D%/packages/patches/clucene-gcc-14.patch			\
  %D%/packages/patches/clucene-pkgconfig.patch			\
+  %D%/packages/patches/coda-use-system-libs.patch		\
  %D%/packages/patches/codex-acp-0.11.1-disable-code-mode.patch \
  %D%/packages/patches/codex-acp-0.11.1-remove-patch-sections.patch \
+  %D%/packages/patches/codex-0.98.0-remove-patch-sections.patch    \
+  %D%/packages/patches/rust-codex-0.117.0-remove-patch-sections.patch    \
  %D%/packages/patches/cogl-fix-double-free.patch		\
  %D%/packages/patches/collada-dom-boost.patch			\
  %D%/packages/patches/collectd-5.11.0-noinstallvar.patch	\
@@ -1190,7 +1189,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/date-output-pkg-config-files.patch	\
  %D%/packages/patches/dbacl-include-locale.h.patch		\
  %D%/packages/patches/dbacl-icheck-multiple-definitions.patch	\
-  %D%/packages/patches/dblatex-importlib.patch		\
  %D%/packages/patches/dblatex-inkscape-1.0.patch		\
  %D%/packages/patches/dbus-helper-search-path.patch		\
  %D%/packages/patches/ddd-build.patch				\
@@ -1509,7 +1507,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch	\
  %D%/packages/patches/glibc-supported-locales.patch     	\
  %D%/packages/patches/glibc-versioned-locpath.patch		\
-  %D%/packages/patches/glog-windows-h-nonwindows.patch		\
  %D%/packages/patches/glycin-sandbox-Adapt-bwrap-invocation.patch	\
  %D%/packages/patches/gmime-disable-tests.patch		\
  %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
@@ -1584,9 +1581,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch	\
  %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
  %D%/packages/patches/gtk-doc-respect-xml-catalog.patch	\
-  %D%/packages/patches/gtk-doc-mkhtml-test-fix.patch	        \
-  %D%/packages/patches/gtk4-demo-reproducible.patch             \
-  %D%/packages/patches/gtk4-needs-udmabuf.patch                 \
+  %D%/packages/patches/gtk-doc-mkhtml-test-fix.patch	\
  %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch    	\
  %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
  %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
@@ -1880,7 +1875,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/lua-5.4-pkgconfig.patch			\
  %D%/packages/patches/lua-5.4-liblua-so.patch			\
  %D%/packages/patches/lua-5.4-search-paths.patch		\
-  %D%/packages/patches/lua-5.5-search-paths.patch		\
  %D%/packages/patches/lua-5.x-search-path-helpers.patch	\
  %D%/packages/patches/lua-lgi-fix-pango.patch			\
  %D%/packages/patches/lua-lgi-fix-ref.patch			\
@@ -1966,7 +1960,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/mswebrtc-cmake.patch			\
  %D%/packages/patches/mtools-mformat-uninitialized.patch	\
  %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
-  %D%/packages/patches/musl-CVE-2026-40200.patch		\
+  %D%/packages/patches/musl-cross-locale.patch			\
  %D%/packages/patches/mutt-store-references.patch		\
  %D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch	\
  %D%/packages/patches/nanosvg-prusa-slicer.patch		\
@@ -2110,7 +2104,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-3.11-fix-tests.patch		\
  %D%/packages/patches/python-3.12-fix-tests.patch		\
  %D%/packages/patches/python-anyio-unuse-exceptiongroup-in-test.patch	\
-  %D%/packages/patches/python-beangulp-click-8.2-compat.patch	\
  %D%/packages/patches/python-bed-reader-use-store-samples.patch	\
  %D%/packages/patches/python-chai-drop-python2.patch		\
  %D%/packages/patches/python-clarabel-blas.patch		\
@@ -2132,20 +2125,16 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-pyreadstat-link-libiconv.patch	\
  %D%/packages/patches/python-sip-include-dirs.patch	\
  %D%/packages/patches/python-scikit-build-setuptools-compat.patch	\
-  %D%/packages/patches/python-scikit-image-fix-python-pillow.patch	\
  %D%/packages/patches/python-sgmllib3k-assertions.patch	\
  %D%/packages/patches/python-sphobjinv-defer-ssl-import.patch	\
  %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch	\
  %D%/packages/patches/python-sshtunnel-pep518.patch	\
  %D%/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch	\
-  %D%/packages/patches/python-zeroc-ice-3.6.5-python-3.12-support.patch	\
-  %D%/packages/patches/python-zipfile2-python-3.12-support.patch	\
  %D%/packages/patches/qcodeeditor-qt6.patch			\
  %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch	\
  %D%/packages/patches/qtdeclarative-disable-qmlcache.patch	\
  %D%/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch	\
  %D%/packages/patches/qtwebengine-revert-egl.patch		\
-  %D%/packages/patches/qtwebengine5-python312-six-compat.patch	\
  %D%/packages/patches/quodlibet-disable-bundled-packages.patch	\
  %D%/packages/patches/qxlsx-fix-include-directory.patch	\
  %D%/packages/patches/schiffbruch-fix-build-for-gcc-13.patch	\
@@ -2255,7 +2244,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch	\
  %D%/packages/patches/python-pillow-CVE-2022-45199.patch	\
  %D%/packages/patches/python-libxml2-utf8.patch		\
-  %D%/packages/patches/python-lsp-server-python-3.13-compatibility.patch	\
  %D%/packages/patches/python-memcached-syntax-warnings.patch	\
  %D%/packages/patches/python-mslice-matplotlib-3.6-compatibility.patch	\
  %D%/packages/patches/python-packaging-test-arch.patch		\
@@ -2271,7 +2259,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-pytorch-system-libraries.patch	\
  %D%/packages/patches/python-pytorch-without-kineto.patch	\
  %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \
-  %D%/packages/patches/python-py-ubjson-recursion-test.patch	\
  %D%/packages/patches/python-vaex-core-fix-tsl-use.patch	\
  %D%/packages/patches/python-vega-datasets-remove-la-riots-code.patch	\
  %D%/packages/patches/python-versioneer-guix-support.patch	\
@@ -2366,8 +2353,16 @@ dist_patch_DATA =						\
  %D%/packages/patches/renpy-fix-integer-slots.patch			\
  %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch	\
  %D%/packages/patches/rdkit-unbundle-external-dependencies.patch	\
+  %D%/packages/patches/r-biostrings-r4.6.0-compat.patch		\
+  %D%/packages/patches/r-h5mread-0001-h5mread-1.3.2-Get-rid-of-non-API-calls-to-R.patch \
  %D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch	\
+  %D%/packages/patches/r-mscoreutils-0001-fix-non-API-call-to-R-SETLENGTH-by-using-lengthgets.patch \
+  %D%/packages/patches/r-rsamtools-r-4.6.0-compat.patch		\
+  %D%/packages/patches/r-snpstats-0001-fixed-non-API-except-for-IS_S4_OBJECT.patch \
+  %D%/packages/patches/r-snpstats-0002-fixed-IS_S4_OBJECT.patch \
  %D%/packages/patches/r-sapa-lapack.patch			\
+  %D%/packages/patches/r-shortread-0001-ShortRead-1.69.3-Get-rid-of-non-API-calls-to-R.patch \
+  %D%/packages/patches/r-sparsearray-r-4.6.0-compat.patch	\
  %D%/packages/patches/ripperx-missing-file.patch		\
  %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
  %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch	\
@@ -2408,8 +2403,13 @@ dist_patch_DATA =						\
  %D%/packages/patches/rust-1.78-unwinding-fix.patch		\
  %D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch	\
  %D%/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch	\
+  %D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch	\
+  %D%/packages/patches/rust-codex-0.98.0-test-timeout.patch	\
+  %D%/packages/patches/rust-codex-0.98.0-windows-sandbox-protocol-version.patch	\
  %D%/packages/patches/rust-codex-0.117.0-core-remove-self-dep.patch	\
+  %D%/packages/patches/rust-codex-0.120.0-core-remove-self-dep.patch	\
+  %D%/packages/patches/rust-codex-0.120.0-connectors-cache-test-race.patch	\
  %D%/packages/patches/rust-codex-0.120.0-remove-libwebrtc.patch	\
  %D%/packages/patches/rust-codex-0.120.0-test-timeout.patch	\
  %D%/packages/patches/rust-codex-0.124.0-code-mode-stub-toolname.patch	\
@@ -2424,6 +2424,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/sajson-build-with-gcc10.patch		\
  %D%/packages/patches/sane-look-for-plugins-in-SANE_BACKEND_LIB_PATH.patch	\
  %D%/packages/patches/sbc-fix-build-non-x86.patch		\
+  %D%/packages/patches/sbcl-fix-arm64-shared-lib.patch		\
  %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch	\
  %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch	\
  %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch	\
@@ -2452,7 +2453,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/shared-mime-info-xdgmime-path.patch	\
  %D%/packages/patches/sharutils-CVE-2018-1000097.patch		\
  %D%/packages/patches/showtime-python-3.11-compat.patch        \
-  %D%/packages/patches/simpleitk-r-4.6.0.patch			\
  %D%/packages/patches/sipwitch-fix-build-with-exosip5.patch	\
  %D%/packages/patches/slim-config.patch			\
  %D%/packages/patches/slim-gcc-14.patch			\
@@ -2487,7 +2487,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/swift-corelibs-libdispatch-5.7.3-modulemap.patch	\
  %D%/packages/patches/swift-llvm-5.7.3-linux.patch	\
  %D%/packages/patches/swig-support-gcc-12.patch		\
-  %D%/packages/patches/swig-support-r-4.6.0.patch		\
  %D%/packages/patches/swish-e-search.patch			\
  %D%/packages/patches/swish-e-format-security.patch		\
  %D%/packages/patches/t1lib-CVE-2010-2642.patch		\
@@ -2520,6 +2519,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/texmacs-wayland-hidpi.patch	\
  %D%/packages/patches/tflite-micro_disable_download.patch 	\
  %D%/packages/patches/thefuck-test-environ.patch		\
+  %D%/packages/patches/thefuck-remove-broken-tests.patch	\
  %D%/packages/patches/tidy-CVE-2015-5522+5523.patch		\
  %D%/packages/patches/timewarrior-time-sensitive-tests.patch	\
  %D%/packages/patches/tinydir-fix-cbehave-test.patch		\
@@ -2535,7 +2535,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/transcode-ffmpeg.patch	\
  %D%/packages/patches/trytond-add-guix_trytond_path.patch	\
  %D%/packages/patches/ttf2eot-cstddef.patch			\
-  %D%/packages/patches/tuir-python-3.12-support.patch	\
  %D%/packages/patches/tuxpaint-stamps-path.patch		\
  %D%/packages/patches/tvm_fix_cpptest_build.patch              \
  %D%/packages/patches/twinkle-bcg729.patch			\
@@ -51,7 +51,6 @@
  #:use-module (gnu packages libusb)
  #:use-module (gnu packages java)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages tcl)
  #:use-module (gnu packages xml)
@@ -186,9 +185,7 @@ terminals.")
    (native-inputs
     (append
       (list clisp
-             ;; See: <https://bugzilla.redhat.com/show_bug.cgi?id=2231865>.
-             python-cython-0
-             python-setuptools  ;remove with next update
+             python-cython-0 ;; See https://bugzilla.redhat.com/show_bug.cgi?id=2231865
             doxygen
             gettext-minimal)
       ;; icedtea doesn't build reliably on all architectures.
@@ -37,6 +37,7 @@
  #:use-module (gnu packages)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix utils))

 (define-public acl
@@ -109,6 +109,7 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system ruby)
@@ -144,7 +145,7 @@
  #:use-module (gnu packages elf)
  #:use-module (gnu packages file)
  #:use-module (gnu packages file-systems)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gawk)
@@ -743,7 +744,7 @@ manager.")
 (define-public swineherd
  (package
    (name "swineherd")
-    (version "0.0.5")
+    (version "0.0.4")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -752,7 +753,7 @@ manager.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1w3fvkdmqvbzqfx3xindm8qgam54wja46isgwasaiqmmhnla7p52"))))
+                "0iij1pl0y410k1dk1ifa56dxmjb1blv0y3k5rxy794gwg6w6c480"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags '("--localstatedir=/var")
@@ -766,7 +767,7 @@ manager.")
           guile-netlink
           guile-3.0
           guix
-           shepherd-1.0))
+           shepherd-0.10))
    (home-page "https://github.com/BIMSBbioinfo/swineherd")
    (synopsis "System container manager")
    (description
@@ -1084,7 +1085,7 @@ console.")
 (define-public btop
  (package
    (name "btop")
-    (version "1.4.7")
+    (version "1.4.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1093,7 +1094,7 @@ console.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0d3cr5l6gpcwhxgnrizny5b5kg6fys2hy9a58bc68w4n2hc040fy"))))
+                "1nj58dbv3c0rj8fngldkyrmdmacmjnbg8ch1c07ik97kqnnzd3l7"))))
    (build-system gnu-build-system)
    (native-inputs (list lowdown))
    (arguments
@@ -2979,7 +2980,7 @@ system is under heavy load.")
 (define-public stress-ng
  (package
    (name "stress-ng")
-    (version "0.21.01")
+    (version "0.20.01")
    (source
     (origin
       (method git-fetch)
@@ -2988,7 +2989,7 @@ system is under heavy load.")
             (commit (string-append "V" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "11w8xjm53lgnxfvg286lavqjh0il3bfr1fsgyk915167r4vlabqq"))))
+        (base32 "1jkinrxh9ppv7xfii9xlisnd2679wnj4ljq12h8y0nvwrm8fkm0b"))))
    (build-system gnu-build-system)
    (arguments
     ;; XXX The test suite seems to cause instability on the VisionFive 2
@@ -3405,7 +3406,7 @@ provides the following commands:
     ;; variable in the tests/import/cpan.scm test.
     (list (search-path-specification
            (variable "GUIX_PYTHONPATH")
-            (files (list "lib/python3.12/site-packages")))))
+            (files (list "lib/python3.11/site-packages")))))
    (home-page "https://www.ansible.com/")
    (synopsis "Radically simple IT automation")
    (description "Ansible aims to be a radically simple IT automation system.
@@ -3423,7 +3424,7 @@ modules and plugins that extend Ansible.")
 (define-public debops
  (package
    (name "debops")
-    (version "3.3.0")
+    (version "3.2.5")
    (source
     (origin
       (method git-fetch)
@@ -3432,7 +3433,7 @@ modules and plugins that extend Ansible.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0z6wck5kax5h2bjv1vw8pbd7fdcdhx87bj9fakh3h0rar9d2qksj"))
+        (base32 "15wfhha2b315i15l40j3sylyvs3mdrfw5awzq4cix51l5jppx8z5"))
       (patches
        (search-patches "debops-setup-py-avoid-git.patch"))))
    (build-system pyproject-build-system)
@@ -3454,8 +3455,8 @@ modules and plugins that extend Ansible.")
           python-future
           python-gitpython
           python-jinja2
-           python-pyxdg
           python-pyyaml
+           python-pyxdg
           python-toml))
    (arguments
     (list
@@ -3470,7 +3471,7 @@ modules and plugins that extend Ansible.")
                         `("PATH" ":" prefix
                           ,(map dirname
                                 (map (cut search-input-file inputs <>)
-                                      (list ;; "bin/ansible"    ;see above
+                                      (list "bin/ansible"
                                            "bin/gpg"
                                            "bin/git"
                                            "bin/git-crypt"
@@ -3926,18 +3927,6 @@ rules is done with the @code{auditctl} utility.")
                (wrap-program (string-append ndiff "/bin/ndiff")
                  `("GUIX_PYTHONPATH" prefix
                    (,(python-path ndiff)))))))
-          (add-before 'check 'fix-tests-for-python-3.12
-            (lambda _
-              (substitute* "ndiff/ndifftest.py"
-                (("import imp")
-                 "import importlib.util")
-                (("ndiff = imp\\.load_source\\(\"ndiff\", \"ndiff\\.py\"\\)")
-                 (string-join
-                  '("spec = \
-importlib.util.spec_from_file_location(\"ndiff\", \"ndiff.py\")"
-                    "ndiff = importlib.util.module_from_spec(spec)"
-                    "spec.loader.exec_module(ndiff)")
-                  "\n")))))
          ;; These are the tests that do not require network access.
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
@@ -4067,59 +4056,51 @@ plug-in architecture to allow monitoring other system metrics.")
    (license license:gpl2+)))

 (define-public thefuck
-  ;; Latest release, 3.32, is not compatible with Python 3.12.
-  (let ((revision "0")
-        (commit "c7e7e1d884d3bb241ea6448f72a989434c2a35ec"))
-    (package
-      (name "thefuck")
-      (version (git-version "3.32" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/nvbn/thefuck")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1l3i2cpdf3vznpbzqw7b18l23xikqs7andx6yzqvm5415snaqg06"))
-         (patches (search-patches "thefuck-test-environ.patch"))))
-      (build-system pyproject-build-system)
-      (arguments
-       (list
-        #:test-flags
-        #~(list
-           "--deselect=tests/test_utils.py::TestGetValidHistoryWithoutCurrent"
-           "--ignore=tests/functional/conftest.py")
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-before 'check 'pre-check
-              (lambda _
-                ;; ModuleNotFoundError: No module named 'pytest_docker_pexpect'
-                (delete-file "tests/functional/conftest.py")
-                ;; Tests look for installed package
-                ;; Some tests need write access to $HOME.
-                (setenv "HOME" "/tmp")
-                ;; Even with that, this function tries to mkdir /.config.
-                (substitute* "tests/test_utils.py"
-                  (("settings\\.init\\(\\)") "")))))))
-      (native-inputs
-       (list go
-             python-mock
-             ;; Uses test markers that are incompatible with pytest 9.
-             python-pytest-8
-             python-pytest-mock
-             python-setuptools))
-      (inputs
-       (list python-colorama
-             python-decorator
-             python-psutil
-             python-pyte))
-      (home-page "https://github.com/nvbn/thefuck")
-      (synopsis "Correct mistyped console command")
-      (description
-       "The Fuck tries to match a rule for a previous, mistyped command, creates
+  (package
+    (name "thefuck")
+    (version "3.32")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nvbn/thefuck")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18ipa1bm6q1n5drbi8i65726hhqhl1g41390lfqrc11hkbvv443d"))
+       (patches (search-patches "thefuck-test-environ.patch"
+                                "thefuck-remove-broken-tests.patch"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda _
+              ;; Tests look for installed package
+              ;; Some tests need write access to $HOME.
+              (setenv "HOME" "/tmp")
+              ;; Even with that, this function tries to mkdir /.config.
+              (substitute* "tests/test_utils.py"
+                (("settings\\.init\\(\\)") "")))))))
+    (native-inputs
+     (list go
+           python-mock
+           python-pytest-8
+           python-pytest-mock
+           python-setuptools
+           python-wheel))
+    (inputs
+     (list python-colorama
+           python-decorator
+           python-psutil
+           python-pyte))
+    (home-page "https://github.com/nvbn/thefuck")
+    (synopsis "Correct mistyped console command")
+    (description
+     "The Fuck tries to match a rule for a previous, mistyped command, creates
 a new command using the matched rule, and runs it.")
-      (license license:x11))))
+    (license license:x11)))

 (define-public di
  (package
@@ -4434,7 +4415,7 @@ buffers.")
 (define-public igt-gpu-tools
  (package
    (name "igt-gpu-tools")
-    (version "2.4")
+    (version "2.3")
    (source
     (origin
       (method git-fetch)
@@ -4443,7 +4424,7 @@ buffers.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0ijvfa5wamihzbl8l29sc27ml0kmgzlld83jm5mln6bb4bvny4gs"))))
+        (base32 "1vyqrsvxraib98r4i6cjmxq7nis480s2ns95v78dscygcci42i8a"))))
    (build-system meson-build-system)
    (arguments
     `(#:tests? #f              ; many of the tests try to load kernel modules
@@ -4461,7 +4442,6 @@ buffers.")
           libdrm
           libpciaccess
           libunwind
-           pciutils
           procps
           python))
    (native-inputs
@@ -7072,7 +7052,7 @@ network, which causes enabled computers to power on.")
 (define-public witr
  (package
    (name "witr")
-    (version "0.3.2")
+    (version "0.3.1")
    (source
     (origin
       (method git-fetch)
@@ -7081,7 +7061,7 @@ network, which causes enabled computers to power on.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "06vxrgd0j2v6s4snmyviwpp66hm5zai7xca9318inhyg4jw3ngg5"))))
+        (base32 "03v9n4mdvqm0knqjl4s64321i5clqpmlrlkkdb87glzb9p28sg00"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -7228,38 +7208,6 @@ has a focus on performance.  It can be used as a greeter by starting
 it from @file{~/.bashrc} for example.")
    (license license:agpl3+)))

-(define-public zeptofetch
-  (package
-    (name "zeptofetch")
-    (version "1.21")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.archlinux.org/gurov/zeptofetch")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1f1dm9nrp0z0prqy90csrkbk98ixp0jx76ax473qb0qsbb7ys4g7"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; No tests available.
-      #:make-flags
-      #~(list (string-append "PREFIX="
-                             #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)))) ; No configure script.
-    (home-page "https://gitlab.archlinux.org/gurov/zeptofetch")
-    (synopsis
-     "Fast, minimal system information tool for Linux.")
-    (description
-     "This package provides a system fetch tool, similar to
-@command{neofetch}, @command{fastfetch}, etc.  It is lightweight and
-has a focus on performance.")
-    (license license:gpl3+)))
-
 (define-public zzz
  (package
    (name "zzz")
@@ -117,7 +117,7 @@ Features:
 (define-public python-zbarlight
  (package
    (name "python-zbarlight")
-    (version "4.0")
+    (version "3.0")
    (source
     (origin
       (method git-fetch)
@@ -126,7 +126,7 @@ Features:
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1q1nfc7g7bl9y63fwvnq1fcgqk79inc2hhw3ilvyw0nk0g74v8cm"))))
+        (base32 "1radfpfhfhkx3xnz01bqr5l9pl2zv70zis6l2kw1gwqbfw65r6w6"))))
    (build-system pyproject-build-system)
    (propagated-inputs (list python-pillow))
    (inputs (list zbar))
@@ -52,7 +52,7 @@
  #:use-module (gnu packages cpp)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fltk)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages gcc)
@@ -88,6 +88,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system pyproject)
+  #:use-module ((guix build-system python) #:select (pypi-uri))
  #:use-module (guix build-system r)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -41,6 +41,7 @@
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
@@ -22,7 +22,7 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages dejagnu)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gawk)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages linux)
@@ -180,7 +180,7 @@ supported by Canonical since 2009.")
       (list libapparmor))
      ;; Python module `readline' needed
      (native-inputs
-       (list bison flex gettext-minimal perl python python-setuptools which))
+       (list bison flex gettext-minimal perl python which))
      (license license:gpl2))))

 (define-public pam-apparmor
@@ -50,7 +50,7 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages compression)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages image)
  #:use-module (gnu packages linux)
@@ -37,6 +37,7 @@

 (define-module (gnu packages astronomy)
  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix build-system python) #:select (pypi-uri)) ;to be removed soon
  #:use-module (guix build-system ant)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system copy)
@@ -66,7 +67,7 @@
  #:use-module (gnu packages curl)
  #:use-module (gnu packages databases)
  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages fortran-xyz)
  #:use-module (gnu packages freedesktop)
@@ -1991,22 +1992,12 @@ model-fitting photometry or morphological analyses.")
       (sha256
        (base32 "156y3zp0nm77976rwsxjjdh7yvggas8s6m0nm523khvn4lq8f9n0"))))
    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; Assertion errors:
-      ;;
-      ;; You are lazy loading attributes via 'bibtex', and so are making
-      ;; multiple calls to the API. This will impact your overall rate
-      ;; limits. bibtex should be queried with ads.ExportQuery(); You will hit
-      ;; API ratelimits very quickly otherwise.
-      #~(list (string-append "--deselect=ads/tests/test_search.py"
-                             "::TestArticle::test_get_field_bibtex"))))
    (native-inputs
     (list nss-certs-for-test
           python-httpretty
           python-pytest
-           python-setuptools))
+           python-setuptools
+           python-wheel))
    (propagated-inputs
     (list python-mock
           python-requests
@@ -3862,6 +3853,10 @@ find,download, and read the data files.")
      #~(list "-m" "not remote_data")
      #:phases
      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-pytest-config
+            (lambda _
+              (substitute* "pyproject.toml"
+                ((" --cov=cdflib --cov-report=xml") ""))))
          (add-before 'check 'set-HOME
            (lambda _
              (setenv "HOME" "/tmp"))))))
@@ -4663,6 +4658,7 @@ Cesium.")
    (native-inputs
     (list python-pydot
           python-pytest
+           python-pytest-cov
           python-pytest-asdf-plugin
           python-pytest-doctestplus
           python-pytest-filter-subpackage
@@ -5187,6 +5183,7 @@ files.")
    (build-system pyproject-build-system)
    (native-inputs
     (list python-pytest
+           python-pytest-cov
           python-setuptools
           python-setuptools-scm
           python-wheel))
@@ -5781,6 +5778,7 @@ across many files.")
     (list python-mock
           python-objgraph
           python-pytest
+           python-pytest-cov
           ;; python-pytest-faulthandler
           python-setuptools
           python-wheel
@@ -6627,6 +6625,19 @@ files.")
                 (string-append
                  "from astropy.units.core import Unit, UnitBase\n"
                  "from astropy.units.errors import UnitTypeError\n")))))
+          (add-after 'unpack 'relax-requirements
+            (lambda _
+              (substitute* "pyproject.toml"
+                ;; RuntimeError: Unable to detect version control
+                ;; system. Checked: Git. Not installed: Mercurial, Darcs,
+                ;; Subversion, Bazaar, Fossil, Pijul.  See
+                ;; <https://github.com/blacklanternsecurity/bbot/issues/1257>.
+                (("enable = true") "enable = false"))))
+          (add-before 'build 'set-version
+            (lambda _
+              ;; TODO: Include in pyproject-build-system.
+              (setenv "POETRY_DYNAMIC_VERSIONING_BYPASS"
+                      #$(version-major+minor+point version))))
          (add-before 'check 'prepare-test-environment
            (lambda _
              (setenv "HOME" "/tmp"))))))
@@ -6684,7 +6695,7 @@ astronomical tables
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 1508 passed, 43621 warnings
+      ;; tests: 1509 passed, 55331 warnings
      #:test-flags
      #~(list "--numprocesses" (number->string (min 8 (parallel-job-count)))
              ;; TypeError: SparseSolverBase.__init__() got an unexpected
@@ -6701,12 +6712,7 @@ astronomical tables
              (string-append "--deselect=test/test_Sampling/test_Likelihoods/"
                             "test_position_likelihood.py"
                             "::TestPositionLikelihood"
-                             "::test_multiplane_position_likelihood")
-              ;; XXX: AttributeError: 'FileFinder' object has no attribute
-              ;; 'find_module'.
-              ;; See: <https://github.com/lenstronomy/lenstronomy/issues/845>.
-              (string-append "--deselect=test/test_Util/test_package_util.py"
-                             "::test_short_and_laconic"))
+                             "::test_multiplane_position_likelihood"))
      #:phases
      #~(modify-phases %standard-phases
          (add-before 'check 'pre-check
@@ -11663,6 +11669,7 @@ for dealing with particle data and a few related utility functions.")
    (build-system pyproject-build-system)
    (propagated-inputs (list python-numpy python-scipy))
    (native-inputs (list python-pytest
+                         python-pytest-cov
                         python-pytest-doctestplus
                         python-setuptools-scm
                         python-wheel))
@@ -103,7 +103,7 @@
  #:use-module (gnu packages elf)
  #:use-module (gnu packages emacs)
  #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fltk)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
@@ -137,6 +137,7 @@
  #:use-module (gnu packages music)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages networking)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages onc-rpc)
  #:use-module (gnu packages oneapi)
  #:use-module (gnu packages perl)
@@ -145,7 +146,6 @@
  #:use-module (gnu packages pretty-print)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-check)
  #:use-module (gnu packages python-crypto)
  #:use-module (gnu packages python-science)
  #:use-module (gnu packages python-web)
@@ -181,6 +181,7 @@
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
@@ -820,8 +821,7 @@ Filter) modules follow the convention of 1V / Octave.")
                   "https://aubio.org/pub/aubio-" version ".tar.bz2"))
             (sha256
              (base32
-               "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"))
-             (patches (search-patches "aubio-waflib-python312-compat.patch"))))
+               "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"))))
    (build-system waf-build-system)
    (arguments
     (list
@@ -2135,17 +2135,7 @@ envelope follower, distortion effects, tape effects and more.")
 	        (base32
                 "01hnx4hhbz3ap3bw15s42q4q1mw1mhdjwygq4550wvjfg6k4ga8w"))))
      (build-system waf-build-system)
-      (arguments
-       (list
-        #:tests? #false ;There are no tests.
-        #:phases
-        '(modify-phases %standard-phases
-           (add-after 'unpack 'python3.12-compatibility
-             (lambda _
-               (substitute* "waflib/Context.py"
-                 (("imp.new_module") "types.ModuleType")
-                 (("import os, re, imp, sys")
-                  "import os, re, types, sys")))))))
+      (arguments (list #:tests? #false)) ;There are no tests.
      (inputs (list lv2))
      (native-inputs (list pkg-config))
      (home-page "https://git.drobilla.net/cgit.cgi/omins.lv2.git/")
@@ -3289,27 +3279,30 @@ synchronous execution of all clients, and low latency operation.")
  (package
    (inherit jack-1)
    (name "jack2")
-    ;; 1.9.22 does not compile with Python 3.12, use the latest commit instead.
-    (properties '((commit . "17959465a722225a36a8b612aed26764036f258e")
-                  (revision . "0")))
-    (version (git-version "1.9.22"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
+    (version "1.9.21")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                     (url "https://github.com/jackaudio/jack2")
-                     (commit (assoc-ref properties 'commit))))
+                    (url "https://github.com/jackaudio/jack2")
+                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "18dbjq9y8mcp27j9aaqdlg4976hrisr7b88lk84ck09gmzlwqalp"))))
+                "0sbrffmdbajvrk7iqvsvrnwnpvmicvbjyq3f52r6ashdsznsz03b"))))
    (build-system waf-build-system)
    (arguments
     `(#:tests? #f                      ; no check target
       #:configure-flags '("--dbus" "--alsa")
       #:phases
       (modify-phases %standard-phases
+         ;; Python 3.11 has removed the 'U' (universal newline) mode.  It has
+         ;; been the default since Python 3.3.
+         (add-after 'unpack 'python-compatibility
+           (lambda _
+             (substitute* '("waflib/Context.py"
+                            "waflib/ConfigSet.py")
+               (("m='rU'") "m='r'")
+               (("read\\('rU'") "read('r'"))))
         (add-before 'configure 'set-linkflags
           (lambda _
             ;; Ensure -lstdc++ is the tail of LDFLAGS or the simdtests.cpp
@@ -3335,7 +3328,7 @@ synchronous execution of all clients, and low latency operation.")
           expat
           libsamplerate
           opus
-           python-dbus
+           python-dbus-1.2
           readline))
    (native-inputs
     (list pkg-config))
@@ -4213,7 +4206,9 @@ one-dimensional sample-rate conversion library.")
                 (string-append "'" #$(this-package-input "libsndfile")
                                "/lib/libsndfile"))))))))
    (native-inputs
-     (list python-pytest python-setuptools))
+     (list python-pytest
+           python-pytest-cov
+           python-setuptools))
    (inputs
     (list libsndfile
           portaudio))
@@ -7991,59 +7986,60 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
                  (delete-file-recursively "third_party")
                  (delete-file-recursively "modules")))))
    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:configure-flags
-      #~(list "-DLINK_BUILD_QT_EXAMPLES=ON"
-              "-DLINK_BUILD_JACK=ON")
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key inputs tests? #:allow-other-keys)
-              (when tests?
-                (let* ((python (search-input-file inputs "/bin/python3"))
-                       (run-tests "../source/ci/run-tests.py"))
-                  (invoke python run-tests "--target" "LinkCoreTest")
-                  (invoke python run-tests "--target" "LinkDiscoveryTest")))))
-          (add-before 'install 'patch-cmake
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let* ((source "../source/"))
-                (substitute* (string-append source
-                                            "cmake_include/AsioStandaloneConfig.cmake")
-                  (((string-append "\\$\\{CMAKE_CURRENT_LIST_DIR\\}/\\.\\./"
-                                   "modules/asio-standalone/asio/include"))
-                   (dirname (search-input-file inputs "include/asio.hpp"))))
-                (substitute* (string-append source "AbletonLinkConfig.cmake")
-                  (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include")
-                   "${CMAKE_CURRENT_LIST_DIR}/../../../include")
-                  (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include/ableton/Link\\.hpp")
-                   "${CMAKE_CURRENT_LIST_DIR}/../../../include/ableton/Link.hpp")))))
-          (replace 'install
-            (lambda _
-              (let* ((out #$output)
-                     (lib-cmake (string-append out "/lib/cmake/ableton-link"))
-                     (source "../source"))
-                (for-each delete-file
-                          '("bin/LinkDiscoveryTest" "bin/LinkCoreTest"))
-                (copy-recursively "bin" (string-append out "/bin"))
-                (copy-recursively (string-append source "/include/ableton")
-                                  (string-append out "/include/ableton"))
-                (install-file (string-append source "/AbletonLinkConfig.cmake")
-                              lib-cmake)
-                (install-file (string-append source
-                                             "/cmake_include/AsioStandaloneConfig.cmake")
-                              (string-append lib-cmake "/cmake_include"))))))))
    (native-inputs
     (list catch-framework
-           portaudio                    ;for portaudio examples
-           python                       ;for running tests
-           python-setuptools))          ;for running tests
+           python ;for running tests
+           portaudio)) ;for portaudio examples
    (inputs
     (list jack-1)) ;for JACK examples
    (propagated-inputs
     ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp
     ;; contains '#include <asio.hpp>'.
     (list asio-1.28))
+    (arguments
+     `(#:configure-flags
+       '("-DLINK_BUILD_QT_EXAMPLES=ON"
+         "-DLINK_BUILD_JACK=ON")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs tests? #:allow-other-keys)
+             (when tests?
+               (let* ((python (search-input-file inputs "/bin/python3"))
+                      (run-tests "../source/ci/run-tests.py"))
+                 (invoke python run-tests "--target" "LinkCoreTest")
+                 (invoke python run-tests "--target" "LinkDiscoveryTest")))))
+         (add-before 'install 'patch-cmake
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((source "../source/"))
+               (substitute* (string-append source
+                                           "cmake_include/AsioStandaloneConfig.cmake")
+                 (((string-append "\\$\\{CMAKE_CURRENT_LIST_DIR\\}/\\.\\./"
+                                  "modules/asio-standalone/asio/include"))
+                  (string-append (assoc-ref inputs "asio")
+                                 "/include")))
+               (substitute* (string-append source "AbletonLinkConfig.cmake")
+                 (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include")
+                  "${CMAKE_CURRENT_LIST_DIR}/../../../include")
+                 (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include/ableton/Link\\.hpp")
+                  "${CMAKE_CURRENT_LIST_DIR}/../../../include/ableton/Link.hpp")))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (lib-cmake (string-append out "/lib/cmake/ableton-link"))
+                    (source "../source"))
+               (for-each (lambda (test-file)
+                           (delete-file test-file))
+                         '("bin/LinkDiscoveryTest" "bin/LinkCoreTest"))
+               (copy-recursively "bin" bin)
+               (copy-recursively (string-append source "/include/ableton")
+                                 (string-append out "/include/ableton"))
+               (install-file (string-append source "/AbletonLinkConfig.cmake")
+                             lib-cmake)
+               (install-file (string-append source
+                                            "/cmake_include/AsioStandaloneConfig.cmake")
+                             (string-append lib-cmake "/cmake_include"))))))))
    (home-page "https://github.com/Ableton/link")
    (synopsis "Synchronize musical beat, tempo, and phase across multiple applications")
    (description
@@ -8239,7 +8235,7 @@ as sample rate, determining whether an audio file is silent, and much more.")
    (propagated-inputs
     (list python-numba python-numpy python-scipy python-six))
    (native-inputs
-     (list python-pytest python-setuptools python-wheel))
+     (list python-pytest python-pytest-cov python-setuptools python-wheel))
    (home-page "https://github.com/bmcfee/resampy")
    (synopsis "Efficient signal resampling")
    (description
@@ -8257,10 +8253,10 @@ Home Page}.")
     (origin
       (method git-fetch)
       (uri (git-reference
-              (url "https://github.com/librosa/librosa/")
-              (commit version)
-              ;; TODO: Package test data.
-              (recursive? #true)))
+             (url "https://github.com/librosa/librosa/")
+             (commit version)
+             ;; For test files.
+             (recursive? #true)))
       (file-name (git-file-name name version))
       (sha256
        (base32 "065x43hx670rjrclxi4hiqxscllb16v9s7myjvg7rd5pd3y0k7sg"))))
@@ -8268,13 +8264,15 @@ Home Page}.")
    (arguments
     (list
      #:test-flags
-      #~(list "-k" (string-append
-                    ;; Resampling tests require python-samplerate.
-                    "not resample"
-                    ;; These tests use Pooch and download data files.
-                    " and not example and not test_cite"
-                    ;; XXX assert 22050 == 31744
-                    " and not test_stream"))))
+      ;; Ignore --mpl flag.
+      '(list "-c" "/dev/null"
+             "-k" (string-append
+                   ;; Resampling tests require python-samplerate.
+                   "not resample"
+                   ;; These tests use Pooch and download data files.
+                   " and not example and not test_cite"
+                   ;; XXX assert 22050 == 31744
+                   " and not test_stream"))))
    (propagated-inputs
     (list python-audioread
           python-decorator
@@ -8293,9 +8291,10 @@ Home Page}.")
     (list python-matplotlib
           python-packaging
           python-pytest
-           python-pytest-mpl
+           python-pytest-cov
           python-resampy
-           python-setuptools))
+           python-setuptools
+           python-wheel))
    (home-page "https://librosa.org")
    (synopsis "Python module for audio and music processing")
    (description
@@ -1,58 +0,0 @@
-# GNU Guix --- Functional package management for GNU
-# Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
-#
-# This file is part of GNU Guix.
-#
-# GNU Guix is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Guix is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-import importlib.util
-import json
-
-
-def pytest_addoption(parser):
-    """Add stub options to be ignored by pytest.
-
-    More precisely, inject all options provided in .pytest_guix_options.json,
-    except options whose plugin is indeed installed.
-
-    For example, if the json file records --cov:
-      if the pytest_cov module is installed, its --cov will be used.
-      otherwise, --cov is ignored (read by this parser, but nothing is done
-      with it).
-
-    Flags can be given with additional keyword arguments in a json object.
-    If the json object is not given, fallback to the default
-    {"action": "append", "nargs": "?"}.  In practice, these arguments are only
-    mandatory for the store_true and store_const actions to avoid eating other
-    arguments.
-
-    This allows to remove development packages, which are not required at build
-    time while at the same time avoiding the need to adjust test options in
-    pyproject.toml or other configuration files.
-    """
-    with open(".pytest_guix_options.json", "r") as options_file:
-        plugin_options = json.load(options_file)
-        group = parser.getgroup(
-            "guix", "Options ignored by the Guix pyproject-build-system"
-        )
-
-        # Only add options for plugins that are not present.
-        for key, options in plugin_options.items():
-            if importlib.util.find_spec(f"pytest_{key}") is None:
-                # Plugin not found, add stub options
-                for option, kwargs in options.items():
-                    if kwargs:
-                        group.addoption(option, **kwargs)
-                    else:
-                        group.addoption(option, action="append", nargs="?")
@@ -50,6 +50,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -106,7 +107,6 @@
  #:use-module (gnu packages rsync)
  #:use-module (gnu packages ruby-xyz)
  #:use-module (gnu packages serialization)
-  #:use-module (gnu packages sphinx)
  #:use-module (gnu packages ssh)
  #:use-module (gnu packages time)
  #:use-module (gnu packages tls)
@@ -137,6 +137,7 @@
           python-paramiko
           python-pexpect
           python-pytest
+           python-pytest-runner
           python-setuptools-scm
           tzdata-for-tests
           python-mock))
@@ -631,26 +632,41 @@ rsnapshot uses hard links to deduplicate identical files.")
 (define-public borg
  (package
    (name "borg")
-    (version "1.4.4")
+    (version "1.4.3")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/borgbackup/borg")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "borgbackup" version))
       (sha256
-        (base32 "0bk302lbjjz1y8dg78wqqys80bm7mzkj5yf6wgyqdwvbqpsnpim4"))))
+        (base32 "07s4jqcv03s98hi6lvqpvmnnhl532qnvv11mjy2xc08rbmsgmfvr"))
+       (snippet
+        #~(begin
+            ;; Delete files generated by Cython.  We used to have a regex that
+            ;; created the list of generated files but Borg has added new
+            ;; non-generated C files that cause the regex to generate the
+            ;; wrong list.
+            (for-each delete-file
+                      '("src/borg/algorithms/checksums.c"
+                        "src/borg/chunker.c"
+                        "src/borg/compress.c"
+                        "src/borg/crypto/low_level.c"
+                        "src/borg/hashindex.c"
+                        "src/borg/item.c"
+                        "src/borg/platform/darwin.c"
+                        "src/borg/platform/freebsd.c"
+                        "src/borg/platform/linux.c"
+                        "src/borg/platform/posix.c"
+                        "src/borg/platform/syncfilerange.c"
+                        "src/borg/platform/windows.c"))))))
    (build-system pyproject-build-system)
    (arguments
     (list
      #:modules '((srfi srfi-26)        ; for cut
                  (guix build utils)
                  (guix build pyproject-build-system))
-      ;; tests: 1318 passed, 293 skipped
      #:test-flags
      #~(list "--benchmark-skip"
-              "--numprocesses" (number->string (min 8 (parallel-job-count)))
+              "--numprocesses" (number->string (parallel-job-count))
              "--pyargs" "borg.testsuite"
              "-k" (string-join
                    ;; These tests need to write to '/var'.
@@ -671,15 +687,7 @@ rsnapshot uses hard links to deduplicate identical files.")
                          "test_mount_hardlinks "
                          "test_readonly_mount "
                          "test_fuse_versions_view "
-                          "test_migrate_lock_alive"
-                          ;; Test files are not in /gnu/store
-                          "test_convert_all[False]"
-                          "test_convert_all[True]"
-                          "test_convert_segments[False]"
-                          "test_convert_segments[True]"
-                          "test_detect_attic_repo"
-                          "test_key_export_qr"
-                          "test_keys")
+                          "test_migrate_lock_alive")
                    " and not "))
      #:phases
      #~(modify-phases %standard-phases
@@ -695,58 +703,46 @@ rsnapshot uses hard links to deduplicate identical files.")
                (setenv "BORG_LIBLZ4_PREFIX" lz4)
                (setenv "BORG_LIBXXHASH_PREFIX" xxhash)
                (setenv "BORG_LIBZSTD_PREFIX" zstd))))
-          (add-before 'build 'fix-testsuite-setuid-mode
+          (add-after 'install 'install-doc
            (lambda _
-              (substitute* "src/borg/testsuite/archiver.py"
-                (("0o4755") "0o0755"))))
-          (add-after 'install 'build-and-install-docs
-            (lambda _
-              (let* ((doc (string-append #$output "/share/doc/borg-" #$version))
-                     (html (string-append doc "/html"))
-                     (txt (string-append doc "/txt"))
-                     (misc (string-append doc "/misc"))
-                     (man (string-append #$output "/share/man/man1")))
-                (with-directory-excursion "docs"
-                  (invoke "make" "text" "man" "singlehtml"))
+              (let ((man (string-append #$output "/share/man/man1"))
+                    (misc (string-append #$output "/share/doc/borg-"
+                                         #$(package-version this-package))))
                (for-each (cut install-file <> misc)
                          '("docs/misc/create_chunker-params.txt"
                            "docs/misc/borg-data-flow.png"
                            "docs/misc/internals-picture.txt"
                            "docs/misc/prune-example.txt"))
-                (copy-recursively "docs/_build/man" man)
-                (copy-recursively "docs/_build/singlehtml" html)
-                (copy-recursively "docs/_build/text" txt))))
-          (add-after 'build-and-install-docs 'install-shell-completions
+                (copy-recursively "docs/man" man))))
+          (add-after 'install-doc 'install-shell-completions
            (lambda _
-              (let* ((etc (string-append #$output "/etc"))
-                     (share (string-append #$output "/share"))
-                     (bash (string-append etc "/bash_completion.d"))
-                     (zsh (string-append share "/zsh/site-functions"))
-                     (fish (string-append share "/fish/vendor_completions.d")))
+              (let ((etc (string-append #$output "/etc"))
+                    (share (string-append #$output "/share")))
                (with-directory-excursion "scripts/shell_completions"
-                  (install-file "bash/borg" bash)
-                  (install-file "zsh/_borg" zsh)
-                  (install-file "fish/borg.fish" fish))))))))
+                  (install-file "bash/borg"
+                                (string-append etc "/bash_completion.d"))
+                  (install-file "zsh/_borg"
+                                (string-append share "/zsh/site-functions"))
+                  (install-file "fish/borg.fish"
+                                (string-append share "/fish/vendor_completions.d")))))))))
    (native-inputs
     (list python-cython
-           python-guzzle-sphinx-theme
-           python-pkgconfig
+           python-dateutil
           python-pytest
           python-pytest-benchmark
           python-pytest-xdist
           python-setuptools
           python-setuptools-scm
-           python-sphinx
-           python-sphinxcontrib-jquery))
+           python-wheel))
    (inputs
     (list acl
           lz4
           openssl
-           python-msgpack
+           ;; This is the latest version of msgpack accepted by 'setup.py'.
+           python-msgpack-for-borg
           ;; FUSE 3 isn't working well, so we stick with FUSE 2 for now:
           ;; <https://issues.guix.gnu.org/53407>
           python-llfuse
-           python-packaging
           xxhash
           `(,zstd "lib")))
    (synopsis "Deduplicated, encrypted, authenticated and compressed backups")
@@ -1268,9 +1264,10 @@ compression parameters used by Gzip.")
 (define-public borgmatic
  (package
    (name "borgmatic")
-    (version "2.1.5")
+    (version "2.1.2")
    (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")
@@ -1278,11 +1275,10 @@ compression parameters used by Gzip.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "17i15ysg0wbcnfvki8wz2z9gx3zx99czv3czjh83y2m1xppvqbl5"))))
+         "0vrpl21n6hf3pj0di4n7s36jq64sx24c93j48cmbdgczs8jiwi36"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 2609 passed
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'configure
@@ -1297,12 +1293,19 @@ compression parameters used by Gzip.")
                (("(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
-           python-pytest-timeout
-           python-setuptools))
+           python-pytest-cov
+           python-setuptools
+           python-wheel))
    (inputs
     (list borg
           python-apprise
@@ -1364,9 +1367,9 @@ borgmatic is powered by borg.")
            (assoc-ref qt:%standard-phases 'qt-wrap)))))
    (native-inputs
     (list python-platformdirs
-           python-pytest
           python-pytest-mock
           python-pytest-qt
+           python-pytest-runner
           python-setuptools
           python-setuptools-git))
    (inputs
@@ -44,6 +44,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system meson)
  #:use-module (gnu packages)
@@ -28,7 +28,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages m4)
  #:use-module (gnu packages perl)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (srfi srfi-1))

 (define-public bison
@@ -86,6 +86,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -533,9 +534,8 @@ and will take advantage of multiple processor cores where possible.")
    (inputs (list boost-1.83 openssl))
    (native-inputs
     (list libfaketime
-           pkg-config
-           python-setuptools
-           python-wrapper))
+           python-wrapper
+           pkg-config))
    (home-page "https://www.libtorrent.org/")
    (synopsis "Feature-complete BitTorrent implementation")
    (description
@@ -83,6 +83,9 @@
    (build-system gnu-build-system)
    (arguments
     (list
+      #:imported-modules %pyproject-build-system-modules
+      #:modules `(((guix build pyproject-build-system) #:select (python-version))
+                  ,@%default-gnu-modules)
      #:tests? #f
      #:configure-flags
      #~(let ((icu (dirname (dirname (search-input-file
@@ -91,26 +94,17 @@
           ;; Auto-detection looks for ICU only in traditional
           ;; install locations.
           (string-append "--with-icu=" icu)
-           ;; Ditto for Python.  The Gexp can't be evaluated if python is not
-           ;; in the inputs (e.g. boost-for-mysql), so delay its evaluation
-           ;; after checking for python, rather than concurrently.
-           #$@(force
-               (if (or (%current-target-system)
-                       (not (this-package-input "python-minimal-wrapper")))
-                   (delay
-                     #~())
-                   (delay
-                     #~((let ((python (dirname (dirname (search-input-file
-                                                         %build-inputs
-                                                         "bin/python")))))
-                          (string-append "--with-python-root=" python)
-                          (string-append "--with-python=" python
-                                         "/bin/python")
-                          (string-append "--with-python-version="
-                                         #$(version-major+minor
-                                            (package-version
-                                             (this-package-input
-                                              "python-minimal-wrapper")))))))))
+           ;; Ditto for Python.
+           #$@(if (%current-target-system)
+                  #~()
+                  #~((let ((python (dirname (dirname (search-input-file
+                                                      %build-inputs
+                                                      "bin/python")))))
+                       (string-append "--with-python-root=" python)
+                       (string-append "--with-python=" python
+                                      "/bin/python")
+                       (string-append "--with-python-version="
+                                      (python-version python)))))
           "--with-toolset=gcc"))
      #:make-flags
      #~(list "threading=multi" "link=shared"
@@ -206,39 +200,29 @@
          (replace 'install
            (lambda* (#:key make-flags #:allow-other-keys)
              (apply invoke "./b2" "install" make-flags)))
-          #$@(force  ; See above for why the force is necessary.
-              (if (or (%current-target-system)
-                      (not (this-package-input "python-minimal-wrapper")))
-                  (delay
-                    #~())
-                  (delay
-                    #~((add-after 'install 'provide-libboost_python
-                         (lambda* (#:key make-flags inputs outputs
-                                   #:allow-other-keys)
-                           (let* ((static? (member "link=static" make-flags))
-                                  (ext (if static? ".a" ".so"))
-                                  (python (dirname
-                                           (dirname (search-input-file
-                                                     inputs "bin/python"))))
-                                  (python-version
-                                   #$(version-major+minor
-                                      (package-version
-                                       (this-package-input
-                                        "python-minimal-wrapper"))))
-                                  (NN (string-join (string-split
-                                                    python-version #\.)
-                                                   ""))
-                                  (libboost_pythonNN
-                                   (string-append "libboost_python" NN ext))
-                                  (major (string-take python-version 1)))
-                             (with-directory-excursion
-                                 (string-append #$output "/lib")
-                               (symlink libboost_pythonNN
-                                        (string-append "libboost_python" ext))
-                               ;; Some packages only look for the major version.
-                               (symlink libboost_pythonNN
-                                        (string-append "libboost_python"
-                                                       major ext)))))))))))))
+          #$@(if (%current-target-system)
+                 #~()
+                 #~((add-after 'install 'provide-libboost_python
+                      (lambda* (#:key make-flags inputs outputs #:allow-other-keys)
+                        (let* ((static? (member "link=static" make-flags))
+                               (libext (if static? ".a" ".so"))
+                               (python (dirname (dirname (search-input-file
+                                                          inputs "bin/python"))))
+                               (python-version (python-version python))
+                               (libboost_pythonNN
+                                (string-append "libboost_python"
+                                               (string-join (string-split
+                                                             python-version #\.)
+                                                            "")
+                                               libext)))
+                          (with-directory-excursion (string-append #$output "/lib")
+                            (symlink libboost_pythonNN
+                                     (string-append "libboost_python" libext))
+                            ;; Some packages only look for the major version.
+                            (symlink libboost_pythonNN
+                                     (string-append "libboost_python"
+                                                    (string-take python-version 1)
+                                                    libext)))))))))))
    (inputs
     (append
      (list icu4c zlib)
@@ -48,14 +48,13 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages disk)
  #:use-module (gnu packages bison)
-  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages cdrom)
  #:use-module (gnu packages check)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cross-base)
  #:use-module (gnu packages disk)
  #:use-module (gnu packages firmware)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages gettext)
@@ -66,6 +65,7 @@
  #:use-module (gnu packages man)
  #:use-module (gnu packages mtools)
  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages package-management)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
@@ -1815,68 +1815,63 @@ For more information, refer to
 (define-public os-prober
  (package
    (name "os-prober")
-    (version "1.84")
+    (version "1.81")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://salsa.debian.org/installer-team/os-prober.git")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_"
+                           version ".tar.xz"))
       (sha256
-        (base32 "1bji3w6nbqaz8zqrbmy8b1j5dph9xn7bdh1cd2z8ia1q125i6mgp"))))
+        (base32 "10w8jz6mqhp0skdcam9mpgv79vx1sv7lkpra3rqjg0jkhvn2in9g"))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      #:tests? #f                       ; No tests.
-      #:modules '((guix build gnu-build-system)
+     `(#:modules ((guix build gnu-build-system)
                  (guix build utils)
-                  (ice-9 regex)         ; string-match
-                  (srfi srfi-26))       ; cut
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target)))
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'configure
-            (lambda _
-              (substitute* (find-files ".")
-                (("/usr") #$output))
-              (substitute* (find-files "." "50mounted-tests$")
-                (("mkdir") "mkdir -p -v"))))
-          (replace 'install
-            (lambda _
-              (define (find-files-non-recursive directory)
-                (find-files directory
-                            (lambda (file stat)
-                              (string-match (string-append "^" directory "/[^/]*$")
-                                            file))
-                            #:directories? #t))
+                  (ice-9 regex)         ; for string-match
+                  (srfi srfi-26))       ; for cut
+       #:make-flags
+       (list ,(string-append "CC=" (cc-for-target)))
+       #:tests? #f                      ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* (find-files ".")
+               (("/usr") (assoc-ref outputs "out")))
+             (substitute* (find-files "." "50mounted-tests$")
+               (("mkdir") "mkdir -p"))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (define (find-files-non-recursive directory)
+               (find-files directory
+                           (lambda (file stat)
+                             (string-match (string-append "^" directory "/[^/]*$")
+                                           file))
+                           #:directories? #t))

-              (let ((bin (string-append #$output "/bin"))
-                     (lib (string-append #$output "/lib"))
-                     (share (string-append #$output "/share")))
-                (for-each (cut install-file <> bin)
-                          (list "linux-boot-prober" "os-prober"))
-                (install-file "newns" (string-append lib "/os-prober"))
-                (install-file "common.sh" (string-append share "/os-prober"))
-                (install-file "os-probes/mounted/powerpc/20macosx"
-                              (string-append lib "/os-probes/mounted"))
-                (for-each
-                 (lambda (directory)
-                   (for-each
-                    (lambda (file)
-                      (let ((destination (string-append lib "/" directory
-                                                        "/" (basename file))))
-                        (mkdir-p (dirname destination))
-                        (copy-recursively file destination)))
-                    (append (find-files-non-recursive (string-append directory "/common"))
-                            (find-files-non-recursive (string-append directory "/x86")))))
-                 (list "linux-boot-probes"
-                       "linux-boot-probes/mounted"
-                       "os-probes"
-                       "os-probes/init"
-                       "os-probes/mounted"))))))))
-    (home-page "https://joeyh.name/code/os-prober/")
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (lib (string-append out "/lib"))
+                    (share (string-append out "/share")))
+               (for-each (cut install-file <> bin)
+                         (list "linux-boot-prober" "os-prober"))
+               (install-file "newns" (string-append lib "/os-prober"))
+               (install-file "common.sh" (string-append share "/os-prober"))
+               (install-file "os-probes/mounted/powerpc/20macosx"
+                             (string-append lib "/os-probes/mounted"))
+               (for-each
+                (lambda (directory)
+                  (for-each
+                   (lambda (file)
+                     (let ((destination (string-append lib "/" directory
+                                                       "/" (basename file))))
+                       (mkdir-p (dirname destination))
+                       (copy-recursively file destination)))
+                   (append (find-files-non-recursive (string-append directory "/common"))
+                           (find-files-non-recursive (string-append directory "/x86")))))
+                (list "os-probes" "os-probes/mounted" "os-probes/init"
+                      "linux-boot-probes" "linux-boot-probes/mounted"))))))))
+    (home-page "https://joeyh.name/code/os-prober")
    (synopsis "Detect other operating systems")
    (description "os-prober probes disks on the system for other operating
 systems so that they can be added to the bootloader.  It also works out how to
@@ -64,6 +64,7 @@
  #:use-module (gnu packages logging)
  #:use-module (gnu packages lua)
  #:use-module (gnu packages man)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages package-management)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages perl)
@@ -76,7 +77,6 @@
  #:use-module (gnu packages python-crypto)
  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages compiler-tools)
  #:use-module (gnu packages regex)
  #:use-module (gnu packages rpc)
  #:use-module (gnu packages serialization)
@@ -94,6 +94,7 @@
  #:use-module (guix build-system hare)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system trivial)
  #:use-module (guix deprecation)
  #:use-module (guix download)
@@ -104,8 +105,7 @@
  #:use-module (guix packages)
  #:use-module (guix search-paths)
  #:use-module (guix utils)
-  #:use-module (ice-9 optargs)
-  #:use-module (srfi srfi-1))
+  #:use-module (ice-9 optargs))

 (define-public acr
  (package
@@ -432,8 +432,9 @@ files and generates build instructions for the Ninja build system.")
    (arguments
     (list
      #:tests? #f                       ;disabled to avoid extra dependencies
-      ;; Custom build steps to prevent using pyproject-build-system which
-      ;; allows to edit the latter without a C++ world rebuild.
+      ;; Essentially a lighter copy of the former python-build-system.
+      ;; Using it rather than pyproject-build-system allows to edit the latter
+      ;; without a C++ world rebuild.
      #:phases
      #~(modify-phases %standard-phases
          (delete 'bootstrap)
@@ -1484,114 +1485,3 @@ Features:
@item Support for languages outside C/C++ (e.g. Go, Rust, Zig).
@end itemize")
   (license license:asl2.0)))
-
-(define-public ninja/pinned
-  (hidden-package
-   (package
-     (name "ninja")
-     (version "1.13.2")
-     (source (origin
-               (method git-fetch)
-               (uri (git-reference
-                     (url "https://github.com/ninja-build/ninja")
-                     (commit (string-append "v" version))))
-               (file-name (git-file-name name version))
-               (sha256
-                (base32
-                 "0lp9dmxbjyjwv089i8mgq3nvnhpbnsn01ifm05m9s47w7cifrl8g"))))
-     (build-system gnu-build-system)
-     (inputs (list python-wrapper re2c))
-     (arguments
-      '(; Tests now require googletest, which is a circular dependency.
-        #:tests? #f
-        #:phases
-        (modify-phases %standard-phases
-          (replace 'configure
-            (lambda _
-              (substitute* "src/subprocess-posix.cc"
-                (("/bin/sh") (which "sh")))
-              (substitute* "src/subprocess_test.cc"
-                (("/bin/echo") (which "echo")))))
-          (replace 'build
-            (lambda _
-              (invoke "./configure.py" "--bootstrap")))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "./configure.py")
-                (invoke "./ninja" "ninja_test")
-                (invoke "./ninja_test"))))
-          (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let* ((out (assoc-ref outputs "out"))
-                     (bin (string-append out "/bin"))
-                     (doc (string-append out "/share/doc/ninja")))
-                (install-file "ninja" bin)
-                (install-file "doc/manual.asciidoc" doc)))))))
-     (home-page "https://ninja-build.org/")
-     (synopsis "Small build system")
-     (description
-      "Ninja is a small build system with a focus on speed.  It differs from
-other build systems in two major respects: it is designed to have its input
-files generated by a higher-level build system, and it is designed to run
-builds as fast as possible.")
-    (license license:asl2.0))))
-
-(define-public ninja
-  (package/inherit ninja/pinned
-    (properties (alist-delete 'hidden? (package-properties ninja/pinned)))))
-
-(define-public samurai
-  (package
-    (name "samurai")
-    (version "1.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/michaelforney/samurai")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "04iw18hgkm72yrl83a2xh1jc47w9rilpb95kwick0j37b4q3gxj4"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:tests? #f                  ;no test suite
-           #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
-                                (string-append "PREFIX=" #$output))
-           #:phases #~(modify-phases %standard-phases
-                        (add-after 'unpack 'patch-/bin/sh
-                          (lambda* (#:key inputs #:allow-other-keys)
-                            (substitute* "build.c"
-                              (("/bin/sh")
-                               (search-input-file inputs "bin/sh")))))
-                        (delete 'configure))))
-    (inputs (list bash-minimal))
-    (home-page "https://github.com/michaelforney/samurai")
-    (synopsis "Ninja-compatible build tool written in C")
-    (description "@code{samurai} is a ninja-compatible build tool written in
-C99 with a focus on simplicity, speed, and portability.  It is
-feature-complete and supports most of the same options as ninja.  This package
-provides the command @command{samu}.  For a @command{ninja} command
-replacement, use the @code{samu-as-ninja-wrapper} package.")
-    (license (list license:asl2.0               ;for the most part
-                   license:expat))))            ;htab.h, htab.c and tree.c
-
-(define-public samu-as-ninja-wrapper
-  (package/inherit samurai
-    (name "samu-as-ninja-wrapper")
-    (build-system trivial-build-system)
-    (arguments
-     (list #:builder
-           (with-imported-modules '((guix build utils))
-             #~(begin
-                 (use-modules (guix build utils))
-                 (let ((bindir (string-append #$output "/bin"))
-                       (samu (string-append #$(this-package-input "samurai")
-                                            "/bin/samu")))
-                   (mkdir-p bindir)
-                   (symlink samu (string-append bindir "/ninja")))))))
-    (inputs (list samurai))
-    (description "This package provides the @command{ninja} command,
-implemented as a symbolic link to the @command{samu} command of @code{samurai}
-package.")))
@@ -55,6 +55,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix store)
  #:use-module (gnu packages)
  #:use-module (gnu packages bash)
@@ -63,6 +64,7 @@
  #:use-module (gnu packages bison)
  #:use-module (gnu packages check)
  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gawk)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages perl)
@@ -45,6 +45,7 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system pyproject)
+  #:use-module ((guix build-system python) #:select (pypi-uri))
  #:use-module (gnu packages admin)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
@@ -52,7 +52,7 @@
  #:use-module (gnu packages bash)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages compression)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages docbook)
@@ -131,6 +131,7 @@
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system trivial)
  #:use-module (ice-9 match)
  #:use-module (srfi srfi-1))
@@ -1881,6 +1882,7 @@ http server.")
    (arguments (list #:tests? #false)) ;no tests included
    (native-inputs
     (list python-pytest
+           python-pytest-cov
           python-setuptools
           python-wheel
           python-xmlschema))
@@ -1913,6 +1915,42 @@ XML output")
 decorators from external files.")
    (license license:expat)))

+(define-public python-pytest-random-order
+  (package
+    (name "python-pytest-random-order")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-random-order" version))
+       (sha256
+        (base32 "104hww3b86jchk41kjhyycr541pd2dfgqkww6lx5y70z9z9xfwj4"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      ;; AttributeError: module 'py' has no attribute 'code'.
+      #~(list "-k" (string-append "not test_it_works_with_actual_tests"
+                                  " and not test_failed_first"
+                                  " and not test_doctests"))))
+    (native-inputs
+     (list python-pytest-xdist
+           python-setuptools
+           python-py
+           python-wheel))
+    (propagated-inputs
+     (list python-pytest))
+    (home-page "https://github.com/jbasko/pytest-random-order")
+    (synopsis "Pytest plugin to randomize the order of tests")
+    (description "@code{pytest-random-order} is a Pytest plugin that
+randomizes the order of tests.  This can be useful to detect a test that
+passes just because it happens to run after an unrelated test that leaves the
+system in a favourable state.  The plugin allows user to control the level of
+randomness they want to introduce and to disable reordering on subsets of
+tests.  Tests can be rerun in a specific order by passing a seed value
+reported in a previous test run.")
+    (license license:expat)))
+
 (define-public python-pytest-runner
  (package
    (name "python-pytest-runner")
@@ -2695,11 +2733,7 @@ failures and errors instantly.")
                     "test_is_not_identity"
                     "test_resolves_builtin_types[object]"
                     "test_resolves_forwardrefs_to_builtin_types[object]"
-                     "test_timezone_lookup[tzinfo]"
-                     ;; hypothesis.errors.FailedHealthCheck: Input generation is slow
-                     #$@(if (target-riscv64?)
-                            '("test_can_run_with_no_db")
-                            '()))
+                     "test_timezone_lookup[tzinfo]")
               " and not "))
      #:phases
      #~(modify-phases %standard-phases
@@ -2922,8 +2956,12 @@ mypy plugins.")
                           "and not upstream_url"))))
    (native-inputs
     (list python-pytest
+           python-pytest-black
           python-pytest-checkdocs
+           python-pytest-cov
           python-pytest-enabler
+           python-pytest-flake8
+           python-pytest-mypy
           python-setuptools
           python-wheel))
    (propagated-inputs
@@ -3030,28 +3068,21 @@ possible to write plugins to add your own checks.")
 (define-public behave
  (package
    (name "behave")
-    ;; 1.3.3 (2025-09-04), the latest changes provide support for Python
-    ;; 3.12+; move back to git tag when released.
-    (properties '((commit . "43d0a93240c0b25b0cbf59bdc196b74fb8a2353e")
-                  (revision . "0")))
-    (version (git-version "1.3.3"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
+    (version "1.3.3")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/behave/behave")
-              (commit (assoc-ref properties 'commit))))
+              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05671jf7scpgqr8chzgs9bxidvf12nlkqqiqxa5qwmykqfvc8nk4"))))
+        (base32 "1fxj51kailsdakqi7qbw700k258n7r3lv75mgxs45ld5xh2jfyxh"))))
    (build-system pyproject-build-system)
-    ;; tests: 1638 passed, 3 skipped, 2 xfailed
    (native-inputs
-     (list python-chardet
-           python-freezegun
-           python-charset-normalizer
+     (list python-assertpy
+           python-chardet
+           python-mock
           python-path
           python-pyhamcrest
           python-pytest
@@ -28,6 +28,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix download)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
@@ -46,7 +47,7 @@
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages fortran-xyz)
@@ -302,7 +302,7 @@ will name the threaded machine type unless THREADS? is provided as #f."
    (name "chez-scheme-for-racket")
    ;; The version should match `(scheme-version #t)`.
    ;; See s/cmacros.ss c. line 360.
-    (version "10.4.0-pre-release.1-1") ; expect a chez-nanopass-bootstrap update
+    (version "10.3.0-pre-release.2") ; expect a chez-nanopass-bootstrap update
    (source #f)
    (build-system gnu-build-system)
    (inputs `(,@(if (nix-system->native-chez-machine-type)
@@ -507,7 +507,7 @@ version of Chez Scheme.")
    (name "chez-scheme")
    ;; The version should match `(scheme-version-number #t)`.
    ;; See s/cmacros.ss c. line 360.
-    (version "10.4.0") ; expect a chez-nanopass-bootstrap update
+    (version "10.2.0") ; expect a chez-nanopass-bootstrap update
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -515,7 +515,7 @@ version of Chez Scheme.")
                    (commit (string-append "v" version))))
              (sha256
               (base32
-                "079vlkl27qdvsg1rsynmd828m42n98c2dnldkhsxf2slfsqd9kv5"))
+                "14iv4kfkyvrkigr1n2prf71n2l3vs0sf0549rvh6y4x2faa2l329"))
              (file-name (git-file-name name version))
              (patches (search-patches "chez-scheme-bin-sh.patch"))
              (snippet #~(begin
@@ -840,9 +840,9 @@ User's Guix}, among other documents.")
 (define-public chez-nanopass-bootstrap
  (hidden-package
   (package
-     (name "chez-nanopass-bootstrap")
-     (version "1.9.4")
-     (properties '((chez-nanopass-release-date . "December 29, 2025")))
+     (name "chez-nanopass")
+     (version "1.9.2")
+     (properties `((chez-nanopass-release-date . "October 18, 2020")))
     (source
      (origin
        (method git-fetch)
@@ -850,7 +850,7 @@ User's Guix}, among other documents.")
              (url "https://github.com/nanopass/nanopass-framework-scheme")
              (commit (string-append "v" version))))
        (sha256
-         (base32 "1qq0vnbrvcialgjgnblfq3qp1ilqg94h0kg896ksd9v4g7ipj9v0"))
+         (base32 "16vjsik9rrzbabbhbxbaha51ppi3f9n8rk59pc6zdyffs0vziy4i"))
        (file-name (git-file-name "nanopass-framework-scheme" version))
        (snippet
         #~(begin
@@ -929,9 +929,10 @@ create compilers, making them easier to understand and maintain.")
 (define-public chez-nanopass
  (package
    (inherit chez-nanopass-bootstrap)
-    (name "chez-nanopass")
-    (version "1.9.4")
-    (properties '((chez-nanopass-release-date . "December 29, 2025")))
+    ;; This release has a significant bug fix.  Expect the next releases of
+    ;; chez-scheme{,-for-racket} to want this for chez-nanopass-bootstrap.
+    (version "1.9.3")
+    (properties '((chez-nanopass-release-date . "August 24, 2025")))
    (source
     (let ((bootstrap-origin (package-source chez-nanopass-bootstrap)))
       (origin
@@ -940,7 +941,7 @@ create compilers, making them easier to understand and maintain.")
                (url (git-reference-url (origin-uri bootstrap-origin)))
                (commit (string-append "v" version))))
         (sha256
-          (base32 "1qq0vnbrvcialgjgnblfq3qp1ilqg94h0kg896ksd9v4g7ipj9v0"))
+          (base32 "0757x3a3b4kcd3jk52h4ikqzv7cc1mvphlw592f0r5pz99bkxiin"))
         (file-name (git-file-name "nanopass-framework-scheme" version)))))
    (native-inputs (list chez-scheme stex))))

@@ -53,6 +53,7 @@
  #:use-module (gnu packages llvm)
  #:use-module (gnu packages kerberos)
  #:use-module (gnu packages maths)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages node)
  #:use-module (gnu packages nss)
  #:use-module (gnu packages pciutils)
@@ -30,6 +30,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (gnu packages)
  #:use-module (gnu packages admin)
  #:use-module (gnu packages autotools)
@@ -32,7 +32,7 @@
  #:use-module (gnu packages check)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages docbook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages libevent)
  #:use-module (gnu packages linux)
@@ -47,6 +47,7 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
  #:use-module (gnu packages)
  #:use-module (gnu packages backup)
@@ -25,7 +25,7 @@
  #:use-module (guix gexp)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages dbm)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages perl)
@@ -49,6 +49,7 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system cmake)
+  #:use-module ((guix build-system python) #:select (pypi-uri))
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system trivial)
  #:use-module (guix build-system go)
@@ -66,7 +67,7 @@
  #:use-module (gnu packages curl)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages emacs)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages golang-build)
@@ -42,7 +42,7 @@
  #:use-module (gnu packages m4)
  #:use-module (gnu packages gawk)
  #:use-module (gnu packages bison)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages guile)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages multiprecision)
@@ -1,11 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2014, 2019, 2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016, 2024-2025 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017, 2020, 2021 Sergei Trofimovich <slyfox@inbox.ru>
-;;; Copyright © 2018, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
-;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2025 Alexey Abramov <levenson@mmer.org>
+;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024-2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2025 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -25,21 +22,14 @@

 (define-module (gnu packages compiler-tools)
  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages bison)
  #:use-module (gnu packages gawk)
-  #:use-module (gnu packages m4)
-  #:use-module (gnu packages man)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system trivial)
  #:use-module (guix download)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (srfi srfi-1))
+  #:use-module (guix packages))

 (define-public byacc
  (package
@@ -75,59 +65,6 @@ consist of a set of LALR(1) parsing tables and a driver routine written in the
 C programming language.")
    (license license:public-domain)))

-(define-public flex
-  (package
-    (name "flex")
-    (version "2.6.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/westes/flex"
-             "/releases/download/v" version "/"
-             "flex-" version ".tar.gz"))
-       (sha256
-        (base32
-         "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))))
-    (build-system gnu-build-system)
-    (arguments
-     (if (%current-target-system)
-         (list #:configure-flags
-               #~'("ac_cv_func_malloc_0_nonnull=yes"
-                   "ac_cv_func_realloc_0_nonnull=yes"))
-         '()))
-    (native-inputs
-     (list help2man
-           ;; m4 is not present in PATH when cross-building
-           m4))
-    (inputs
-     (list
-      (package
-        (inherit bison)
-        (arguments
-         ;; Disable tests, since they require flex.
-         (substitute-keyword-arguments arguments
-           ((#:tests? _ #f) #f)))
-        (inputs (modify-inputs inputs
-                  (delete "flex"))))))
-    (propagated-inputs (list m4))
-    (home-page "https://github.com/westes/flex")
-    (synopsis "Fast lexical analyser generator")
-    (description
-     "Flex is a tool for generating scanners.  A scanner, sometimes
-called a tokenizer, is a program which recognizes lexical patterns in
-text.  The flex program reads user-specified input files, or its standard
-input if no file names are given, for a description of a scanner to
-generate.  The description is in the form of pairs of regular expressions
-and C code, called rules.  Flex generates a C source file named,
-\"lex.yy.c\", which defines the function yylex().  The file \"lex.yy.c\"
-can be compiled and linked to produce an executable.  When the executable
-is run, it analyzes its input for occurrences of text matching the
-regular expressions for each rule.  Whenever it finds a match, it
-executes the corresponding C code.")
-    (license (license:non-copyleft "file://COPYING"
-                                   "See COPYING in the distribution."))))
-
 (define-public oyacc
  (package
    (name "oyacc")
@@ -175,42 +112,3 @@ besides libc.")
    (description
     "This package provides the @command{yacc} command, implemented as a
 symbolic link to the @command{oyacc} command from the same-named package.")))
-
-(define-public re2c
-  (package
-    (name "re2c")
-    (version "4.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/skvadrik/" name
-                           "/releases/download/" version "/"
-                           name "-" version ".tar.xz"))
-       (sha256
-        (base32
-         "07ysqgdm0h566a8lwnpdgycp93vz7zskzihsgah3bla0ycj2pp69"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests?
-      (not (or (%current-target-system)
-               ;; TODO: run_tests.py hangs
-               (system-hurd?)))
-      #:phases
-      (if (target-arm32?)
-          #~(modify-phases %standard-phases
-              (add-after 'unpack 'patch-sources
-                (lambda _
-                  (invoke "patch" "-p1" "--force" "--input"
-                          #$(local-file (search-patch
-                                         "re2c-Use-maximum-alignment.patch"))))))
-          #~%standard-phases)))
-    (native-inputs
-     (list python))             ; for the test driver
-    (home-page "https://re2c.org/")
-    (synopsis "Lexer generator")
-    (description
-     "@code{re2c, Regular Expressions to Code} is a flexible lexical analyser.
-Instead of using traditional table-driven approaches, it encodes a finite
-state machine directly in the code in the form of jumps and comparisons.")
-    (license license:public-domain)))
@@ -1475,7 +1475,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to
 (define-public 7zip
  (package
    (name "7zip")
-    (version "26.01")
+    (version "26.00")
    (source
     (origin
       (method git-fetch)
@@ -1483,7 +1483,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to
              (url "https://github.com/ip7z/7zip")
              (commit version)))
       (sha256
-        (base32 "0qwzn9pz1m6f8q20cqgmfqp1qx6s7959xnyikpr60n1v8c1mj98q"))
+        (base32 "1fvgl9qp2pl5c0jmvgbdx6qig3qd80mhxvml42yby8y412x65sh7"))
       (file-name (git-file-name name version))
       (modules '((guix build utils)
                  (ice-9 regex)))
@@ -35,7 +35,7 @@
  #:use-module (gnu packages boost)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages emacs)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gawk)
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages ocaml)
@@ -23,7 +23,7 @@
 (define-module (gnu packages coreboot)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages compression)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages pciutils)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix build-system cargo)
@@ -127,76 +127,6 @@ formats:
 It also comes with example files generated by bincfg.")
    (license license:gpl3+)))

-(define-public bucts
-  (package
-    (name "bucts")
-    (version %coreboot-version)
-    (source %coreboot-origin)
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ;no tests
-      #:make-flags #~(list (string-append "CC=" #$(cc-for-target)))
-      #:phases #~(modify-phases %standard-phases
-                   (delete 'configure) ;no configure script
-                   (add-after 'unpack 'enter-source
-                     (lambda _
-                       (chdir "util/bucts")))
-                   (add-after 'enter-source 'set-version
-                     (lambda _
-                       (substitute* "Makefile"
-                         (("^VERSION:=*")
-                          #$(string-append "VERSION:=" version)))))
-                   ;; no install target
-                   (replace 'install
-                     (lambda _
-                       (let ((bin (string-append #$output "/bin"))
-                             (doc (string-append #$output "/share/doc/bucts/"))
-                             (licenses (string-append #$output
-                                        "/share/licenses/bucts/")))
-                         (install-file "bucts" bin)
-                         (install-file "readme.md" doc)
-                         (install-file "../../COPYING" licenses)))))))
-    (inputs (list pciutils))
-    (home-page "https://coreboot.org")
-    (synopsis "Tool to swap the BIOS bootblock and backup bootblock on the
-Intel I945 chipsets")
-    (description
-     "The @command{bucts} command can flip a bit in the BUC.TS register of the
-Intel I945 chipsets and show the register status.  When the bit is set, it
-swaps the bootblock location.  Because the bootblock region is often set
-read-only by the default BIOS, this enables to bypass that restriction and is
-used as part of a procedure to replace the nonfree BIOS with free software on
-various computers (Lenovo X60, X60s, X60T, T60, probably more).")
-    (license license:gpl2)))
-
-(define-public ectool
-  (package
-    (name "ectool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; no test suite
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/ectool")))
-          (delete 'configure)))) ; no configure script
-    (home-page "https://doc.coreboot.org/util.html")
-    (synopsis "Tool to dump and modify @acronym{EC, Embedded Controller} RAM
-on computers such as laptops")
-    (description "This package provides @command{ectool}, a program to dump
-and modify the contents of @acronym{EC, Embedded Controller} RAM
-on mobile computers.")
-    (license license:gpl2)))
-
 (define-public ifdtool
  (package
    (name "ifdtool")
@@ -79,6 +79,7 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system scons)
  #:use-module (guix modules)
@@ -2016,7 +2017,8 @@ using the string similarity calculations from FuzzyWuzzy.")
          (add-after 'unpack 'fix-pytest-config
            (lambda _
              (substitute* "pyproject.toml"
-                (("\"pytest-cov\", ") "")))))))
+                ((" \"pytest-cov\", ") "")
+                ((" --cov-fail-under=90 --cov=cpplint") "")))))))
    (native-inputs
     (list python-pytest
           python-pytest-timeout
@@ -105,6 +105,7 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system perl)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix utils)
  #:use-module (srfi srfi-1)
@@ -62,6 +62,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix download)
  #:use-module (guix git-download)
@@ -31,6 +31,7 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (gnu packages databases)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cpp)
@@ -111,7 +112,7 @@ Refresh}in-DRAM mitigations effectively and as such can trigger bit flips.")
 (define-public gallia
  (package
    (name "gallia")
-    (version "2.1.1")
+    (version "2.0.2")
    (source
     (origin
       (method git-fetch)
@@ -120,7 +121,7 @@ Refresh}in-DRAM mitigations effectively and as such can trigger bit flips.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "04xzh5fi18wrkjs7sqwlv344jf54njvnly042rhxq3x5jrvpvkdw"))))
+        (base32 "1yvjpwpqq6r6glfm4qzb8j91d2gsfy4lvygd9z9pg2j6jvcq6f6s"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -132,16 +133,25 @@ Refresh}in-DRAM mitigations effectively and as such can trigger bit flips.")
      #:test-flags #~(list "tests/pytest")))
    (native-inputs
     (list python-poetry-core
+           python-pygit2
           python-pytest
           python-pytest-asyncio))
    (inputs
-     (list python-aiosqlite
+     (list python-aiofiles
+           python-aiosqlite
           python-argcomplete
           python-boltons
+           python-can
+           python-construct
+           python-exitcode
+           python-httpx
+           python-more-itertools
+           python-msgspec
           python-platformdirs
+           python-psutil
           python-pydantic
+           python-pygit2
           python-tabulate
-           python-wcwidth
           python-zstandard))
    (home-page "https://github.com/Fraunhofer-AISEC/gallia")
    (synopsis "Extendable Pentesting Framework")
@@ -32,7 +32,7 @@
 ;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
 ;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
-;;; Copyright © 2018, 2021-2023, 2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2018, 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us>
 ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
@@ -109,7 +109,7 @@
  #:use-module (gnu packages dbm)
  #:use-module (gnu packages docbook)
  #:use-module (gnu packages emacs)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gawk)
  #:use-module (gnu packages gcc)
@@ -131,7 +131,6 @@
  #:use-module (gnu packages guile-xyz)
  #:use-module (gnu packages icu4c)
  #:use-module (gnu packages jemalloc)
-  #:use-module (gnu packages kerberos)
  #:use-module (gnu packages language)
  #:use-module (gnu packages libedit)
  #:use-module (gnu packages libevent)
@@ -148,7 +147,6 @@
  #:use-module (gnu packages networking)
  #:use-module (gnu packages node)
  #:use-module (gnu packages onc-rpc)
-  #:use-module (gnu packages openldap)
  #:use-module (gnu packages openstack)
  #:use-module (gnu packages pantheon)
  #:use-module (gnu packages parallel)
@@ -177,7 +175,6 @@
  #:use-module (gnu packages ruby)
  #:use-module (gnu packages ruby-check)
  #:use-module (gnu packages ruby-xyz)
-  #:use-module (gnu packages security-token)
  #:use-module (gnu packages serialization)
  #:use-module (gnu packages sphinx)
  #:use-module (gnu packages ssh)
@@ -208,6 +205,7 @@
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system ruby)
  #:use-module (guix build-system cmake)
@@ -1186,81 +1184,50 @@ autocompletion and syntax highlighting.")
 auto-completion and syntax highlighting.")
    (license license:bsd-3)))

+;; XXX When updating, check whether boost-for-mysql is still needed.
+;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past.
 (define-public mysql
  (package
    (name "mysql")
-    (version "9.7.0")
+    (version "5.7.33")
    (source (origin
              (method url-fetch)
              (uri (list (string-append
-                          "https://cdn.mysql.com/Downloads/MySQL-"
+                          "https://dev.mysql.com/get/Downloads/MySQL-"
                          (version-major+minor version) "/"
+                          name "-" version ".tar.gz")
+                         (string-append
+                          "https://downloads.mysql.com/archives/get/file/"
                          name "-" version ".tar.gz")))
              (sha256
               (base32
-                "0v9hc8yzp0f5pwl4kr1a8k7lwyf62g95klxb6avfrc2npjx79dbl"))
-              (modules '((guix build utils)
-                         (ice-9 ftw)
-                         (srfi srfi-26)))
-              (snippet
-               #~(begin
-                   (define (delete-all-but directory . preserve)
-                     (with-directory-excursion directory
-                       (let* ((pred (negate (cut member <>
-                                                 (cons* "." ".." preserve))))
-                              (items (scandir "." pred)))
-                         (for-each (cut delete-file-recursively <>) items))))
-
-                   ;; Delete bundled source libraries.
-                   (delete-all-but "extra"
-                                   ;; XXX: The build system doesn't currently
-                                   ;; support unbundling these.
-                                   "json" ;used by bundled opentelemetry
-                                   "libbacktrace"
-                                   "libcno"
-                                   "opentelemetry-cpp"
-                                   "opentelemetry-proto"
-                                   "rapidjson"
-                                   "unordered_dense"
-                                   "xxhash")))))
+                "1bb343mf7n0qg2qz497gxjsqprygrjz1q1pbz76hgqxnsy08sfxd"))))
    (build-system cmake-build-system)
    (arguments
     (list
-      #:tests? #f          ;FIXME: teach build system to use system googletest
      #:configure-flags
      #~(list "-DBUILD_CONFIG=mysql_release"
-              "-DWITH_AUTHENTICATION_LDAP=ON"
-              "-DWITH_AUTHENTICATION_WEBAUTHN=ON"
-              "-DWITH_BENCHMARK=OFF"
-              ;; XXX: BUILD_ID is disabled so that the INFO_BIN target is not
-              ;; run; this target relies on running mysqld before it is
-              ;; installed, which fails in our case.
-              "-DWITH_BUILD_ID=OFF"
-              "-DWITH_FIDO=system"
-              "-DWITH_SYSTEM_LIBS=ON"
-              "-DWITH_UNIT_TESTS=OFF"   ;avoid bundled googletest
-              "-DREPRODUCIBLE_BUILD=ON"
+              "-DWITH_SSL=system"
+              "-DWITH_ZLIB=system"
+              "-DDEFAULT_CHARSET=utf8"
+              "-DDEFAULT_COLLATION=utf8_general_ci"
              "-DMYSQL_DATADIR=/var/lib/mysql"
              "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-              "-DINSTALL_INFODIR=share/info"
+              "-DINSTALL_INFODIR=share/mysql/docs"
              "-DINSTALL_MANDIR=share/man"
              "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+              "-DINSTALL_SCRIPTDIR=bin"
              "-DINSTALL_INCLUDEDIR=include/mysql"
              "-DINSTALL_DOCREADMEDIR=share/mysql/docs"
              "-DINSTALL_SUPPORTFILESDIR=share/mysql"
              "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-              "-DINSTALL_MYSQLTESTDIR=OFF"
              "-DINSTALL_DOCDIR=share/mysql/docs"
-              "-DINSTALL_SHAREDIR=share/mysql")
+              "-DINSTALL_SHAREDIR=share/mysql"
+              ;; Get rid of test data.
+              "-DINSTALL_MYSQLTESTDIR="
+              "-DINSTALL_SQLBENCHDIR=")
      #:phases
      #~(modify-phases %standard-phases
-          (add-before 'configure 'disable-broken-abi-check
-            (lambda _
-              ;; The ABI check started failing with MySQL 9.7.0 for unknown
-              ;; reasons.
-              (substitute* "cmake/abi_check.cmake"
-                (("RUN_ABI_CHECK 1")
-                 "RUN_ABI_CHECK 0"))))
          (add-after 'install 'remove-extra-binaries
            (lambda _
              ;; Remove the 3 *_embedded files, which weigh in at
@@ -1287,95 +1254,31 @@ auto-completion and syntax highlighting.")
                           (dirname coreutils)
                           (dirname grep)
                           (dirname ps)
-                           (dirname sed)))))))
-          (add-after 'install 'fix-permissions
-            ;; XXX: Otherwise, the guix daemon reports: "suspicious ownership
-            ;; or permission on `/gnu/store/...-mysql-9.7.0'; rejecting this
-            ;; build output".
-            (lambda _
-              (chmod #$output #o755))))))
+                           (dirname sed))))))))))
    (native-inputs
     (list bison perl pkg-config))
    (inputs
     (list bash-minimal
-           boost
+           boost-for-mysql
           coreutils
-           curl
-           cyrus-sasl
           gawk
           grep
-           icu4c
           libaio
-           libedit
-           libfido2
           libtirpc
-           lz4
-           mit-krb5
           ncurses
-           openldap
-           openssl
-           protobuf
+           openssl-1.1
           procps
           rpcsvc-proto                 ; rpcgen
           sed
-           zlib
-           `(,zstd "lib")))
+           zlib))
    (home-page "https://www.mysql.com/")
    (synopsis "Fast, easy to use, and popular database")
    (description
     "MySQL is a fast, reliable, and easy to use relational database
 management system that supports the standardized Structured Query
 Language.")
-    (license license:gpl2)))    ;v2 only -- see 'Election of GPLv2' in LICENSE
-
-(define-public mysql-connector-python
-  (package
-    (name "mysql-connector-python")
-    (version "9.7.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/mysql/mysql-connector-python")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0zdm35apj1cfraxwlqfmr04pm87qpw73ilb8p88cn08zsa8q11hg"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              ;; Our protobuf is too old for the mysqlx dev API, so use the
-              ;; classic one without the C modules.
-              (chdir "mysql-connector-python")))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                ;; Some of these tests might be failing due to the build
-                ;; container's restrictions, others are due to the version
-                ;; mismatch.
-                (mkdir-p "/tmp/datadir")
-                (invoke "python3" "unittests.py"
-                        "--verbosity=3"
-                        (string-append "--with-mysql=" #$(this-package-input "mysql"))
-                        "--keep"
-                        "--mysql-topdir=/tmp/datadir"
-                        "--unix-socket=/tmp/datadir")))))))
-    (native-inputs (list python-setuptools))
-    (inputs (list mysql openssl zlib `(,zstd "lib")))
-    (home-page "https://dev.mysql.com/doc/connector-python/en/index.html")
-    (synopsis "MySQL driver written in Python")
-    (description "MySQL Connector/Python enables Python programs to access
-MySQL databases, using an API that is compliant with the Python Database API
-Specification v2.0 (PEP 249).")
    (license license:gpl2)))

-(define-deprecated-package python-mysql-connector-python
-  mysql-connector-python)
-
 (define-public mariadb
  (package
    (name "mariadb")
@@ -1672,14 +1575,14 @@ and high-availability (HA).")
 (define-public postgresql-17
  (package
    (name "postgresql")
-    (version "17.10")
+    (version "17.7")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                  version "/postgresql-" version ".tar.bz2"))
              (sha256
               (base32
-                "144cb40gn1lasvz0jvz4i72mda8k7pm1bx6azq2vggfddm8h72h7"))
+                "1dg9labqgph2idaypb8khdvbag29pr3h4bqv5w8k7kgc08rk97pg"))
              (patches (search-patches
                        "postgresql-disable-normalize_exec_path.patch"))))
    (build-system gnu-build-system)
@@ -1742,14 +1645,14 @@ pictures, sounds, or video.")
  (package
    (inherit postgresql-17)
    (name "postgresql")
-    (version "16.14")
+    (version "16.10")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                  version "/postgresql-" version ".tar.bz2"))
              (sha256
               (base32
-                "0w9lgsn03m4k0v3m622v7fk3gqbfbjvwv34mrrc0i4ip4wa7gl7n"))
+                "0hib575m9x3z8c71gkcv9jsyq77d3qk7q2zgzvfy6clwrvs8b16y"))
              (patches (search-patches
                        "postgresql-disable-normalize_exec_path.patch"))))
    (arguments
@@ -1773,14 +1676,14 @@ pictures, sounds, or video.")
  (package
    (inherit postgresql-16)
    (name "postgresql")
-    (version "15.18")
+    (version "15.15")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                  version "/postgresql-" version ".tar.bz2"))
              (sha256
               (base32
-                "1d13qckpslfqamdmp23q3rbzxlp1rqwszylilyllpsp3gzwhvpqi"))
+                "1ais46b2ij38y75i1w336as03pybyndsd2pp2q8gdjq9igmsllsp"))
              (patches (search-patches
                        "postgresql-disable-resolve_symlinks.patch"))))
    (native-inputs (modify-inputs native-inputs
@@ -1793,7 +1696,6 @@ pictures, sounds, or video.")
    (inherit postgresql-15)
    (name "postgresql")
    (version "14.20")
-    (replacement postgresql-14.23)
    (source (origin
              (inherit (package-source postgresql-15))
              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
@@ -1802,19 +1704,6 @@ pictures, sounds, or video.")
               (base32
                "0sv45dsmyplfys6dfdjdwmrczl46s82x35xdh311nxj02q7z29vm"))))))

-(define-public postgresql-14.23
-  (package
-    (inherit postgresql-14)
-    (name "postgresql")
-    (version "14.23")
-    (source (origin
-              (inherit (package-source postgresql-14))
-              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
-                                  version "/postgresql-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "19clihp73ak2p5di90jhg50lqjkkr0iy349gkki30qsl5f11cwnc"))))))
-
 (define-deprecated/public postgresql-13 #f
  (package
    (inherit postgresql-14)
@@ -4849,24 +4738,33 @@ PickleShare.")
 (define-public python-apsw
  (package
    (name "python-apsw")
-    (version "3.50.4.0")
+    (version "3.46.0.0")
+    ;; The compressed release has fetching functionality disabled.
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/rogerbinns/apsw")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/rogerbinns/apsw/releases/download/"
+             version "/apsw-" version ".zip"))
       (sha256
-        (base32 "0r9awjgpl9cmqz5xd4zbqrpiv0rv5c36a18jkqnsfky6n6sgr424"))))
+        (base32
+         "10yfbasi4mq63g0svyl1h49ylwn9znjylq78id16dzxzk9q9ipdx"))))
    (build-system pyproject-build-system)
-    (arguments
-     (list #:test-backend #~'custom
-           #:test-flags #~(list "-m" "apsw.tests")))
    (native-inputs
-     (list python-setuptools))
-    (inputs
-     (list sqlite-next))         ;SQLite 3.45.1 required.
+     (list unzip python-setuptools python-wheel))
+    (inputs (list sqlite-next))         ;SQLite 3.45.1 required.
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'build-extensions
+            (lambda _
+              (invoke "python" "setup.py" "build" "--enable-all-extensions"
+                      "--enable=load_extension")))
+          (add-after 'build 'build-test-helper
+            (lambda _
+              (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext"
+                      "-I." "-Isqlite3" "src/testextension.c"))))))
    (home-page "https://github.com/rogerbinns/apsw/")
    (synopsis "Another Python SQLite Wrapper")
    (description
@@ -5665,7 +5563,7 @@ with integrated support for finding required rows quickly.")
 (define-public apache-arrow
  (package
    (name "apache-arrow")
-    (version "24.0.0")
+    (version "23.0.1")
    (source
     (origin
       (method git-fetch)
@@ -5675,7 +5573,7 @@ with integrated support for finding required rows quickly.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1j3gs5ffa9gx2y2nggmi2zn5rj0bsnjnxrzfnipx6050jz6n8dx9"))))
+         "1qn7wgavi3kiz4d6w1naqj5631bg87fnj6gbhaxmpmynm5hi9wm7"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -5844,7 +5742,6 @@ __version_tuple__ = version_tuple = (~a)~%" version version-tuple))))))
           python-cython
           python-pytest
           python-pytest-runner
-           python-scikit-build-core
           python-setuptools-scm
           python-setuptools))
    (outputs '("out"))
@@ -6441,7 +6338,7 @@ mechanism of @code{dogpile}.")
 (define-public datasette
  (package
    (name "datasette")
-    (version "1.0a26")
+    (version "1.0a19")
    (source
     (origin
       (method git-fetch)
@@ -6450,20 +6347,23 @@ mechanism of @code{dogpile}.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1ra0yfrz9w3jx7ix3dmcsg0g8hjxkz37586g7ijmqshxpzczxfm7"))))
+        (base32 "0wb73iksrc5vg2lnq3q4vr7yhlzxwr711jfmjdndd0s77996zsfh"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 1720 passed, 9 skipped, 8 xfailed, 13 xpassed, 3 warnings, 120
-      ;; subtests passed
      #:test-flags
-      #~(list "--numprocesses" (number->string (min 8 (parallel-job-count)))
-              "--ignore=tests/test_black.py")
+      ;; See https://github.com/simonw/datasette/issues/2048
+      #~(list "-k" (string-append
+                    ;; These contain two unexpected extra items.
+                    "not test_searchable"
+                    " and not test_searchmode")
+              "--ignore=tests/test_black.py"
+              "-n" (number->string (parallel-job-count)))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'relax-requirements
            (lambda _
-              (substitute* "pyproject.toml"
+              (substitute* "setup.py"
                (("\"pip\",") "")))))))
    (propagated-inputs
     (list python-aiofiles
@@ -6478,6 +6378,7 @@ mechanism of @code{dogpile}.")
           python-janus
           python-jinja2
           python-mergedeep
+           python-pint
           python-pluggy
           python-pyyaml
           python-sqlite-utils
@@ -6486,9 +6387,9 @@ mechanism of @code{dogpile}.")
     (list nss-certs-for-test
           python-beautifulsoup4
           python-cogapp
-           python-multipart-form-data-conformance
           python-pytest
-           python-pytest-asyncio
+           python-pytest-asyncio-0.26
+           python-pytest-runner
           python-pytest-timeout
           python-pytest-xdist
           python-setuptools
@@ -20,7 +20,7 @@
  #:use-module (gnu packages bison)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages python)
@@ -27,6 +27,7 @@
 (define-module (gnu packages dav)
  #:use-module (guix build-system cargo)
  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -142,6 +143,9 @@ CardDAV server with a local folder or file.")
    (build-system pyproject-build-system)
    (native-inputs
     (list python-pytest
+           python-pytest-cov
+           python-pytest-flake8
+           python-pytest-isort
           python-setuptools
           python-waitress
           python-wheel))
@@ -240,6 +244,7 @@ efficient syncing
     (list python-aioresponses
           python-pytest
           python-pytest-asyncio
+           python-pytest-cov
           python-pytest-httpserver
           python-setuptools
           python-setuptools-scm
@@ -58,7 +58,7 @@
  #:use-module (gnu packages code)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages digest)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages gdb)
@@ -77,6 +77,7 @@
  #:use-module (gnu packages mail)
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages pretty-print)
@@ -262,7 +263,7 @@ simple way to add custom protocol messages.")
 (define-public c-vise
  (package
    (name "c-vise")
-    (version "2.8.0")
+    (version "2.4.0")
    (source
     (origin
       (method git-fetch)
@@ -270,53 +271,37 @@ simple way to add custom protocol messages.")
             (url "https://github.com/marxin/cvise")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "1ynhm1d56r25apgvv0wqbdrhjbwigkwrgw92g2czz4nfx77rjxz2"))
+        (base32 "1i2z5q2pcwh1gpdqc24x1a2q5vzwhblzzq021nzwf304di7m18vl"))
       (file-name (git-file-name name version))))
    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-linkage
-            (lambda _
-              (substitute* "clang_delta/CMakeLists.txt"
-                (("\\$\\{LLVM_LINK_LLVM_DYLIB\\}")
-                 "True")
-                (("  LLVM")
-                 "  LLVMSupport"))))
-          (add-before 'build 'hardcode-paths
-            (lambda _
-              (substitute* "cvise.py"
-                (("/bin/bash")
-                 (which "bash"))
-                (("(.*)# Special case for clang-format" all blank)
-                 (format #f "~a# Special case for unifdef
-~aprograms['unifdef'] = ~s
-~a"
-                         blank blank (which "unifdef") all)))))
-          (add-after 'install 'wrap
-            (lambda _
-              (let ((python-path (getenv "GUIX_PYTHONPATH")))
-                (wrap-program (string-append #$output "/bin/cvise")
-                  `("PYTHONPATH" ":" prefix
-                    (,(string-join
-                       (filter (lambda (cand)
-                                 (not (string-contains cand "pytest")))
-                               (string-split python-path #\:))
-                       ":"))))))))))
    (native-inputs
-     (list flex
-           python-pytest
-           python-pytest-flake8))
+     (list flex python-pytest python-pytest-flake8))
    (inputs
-     (list bash-minimal
-           clang
-           llvm
-           unifdef
-           python
-           python-pebble
-           python-psutil
-           python-chardet))
+     (list bash-minimal clang llvm unifdef
+           python python-pebble python-psutil python-chardet))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-linkage
+           (lambda _
+            (substitute* "clang_delta/CMakeLists.txt"
+              (("\\$\\{LLVM_LINK_LLVM_DYLIB\\}") "True")
+              (("  LLVM") "  LLVMSupport"))))
+         (add-before 'build 'hardcode-paths
+           (lambda _
+            (substitute* "cvise.py"
+              (("/bin/bash") (which "bash"))
+              (("(.*)# Special case for clang-format" & >)
+               (string-append > "# Special case for unifdef\n"
+                              > "programs['unifdef'] = '" (which "unifdef") "'\n"
+                              &)))))
+         (add-after 'install 'wrap
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (python-path (getenv "GUIX_PYTHONPATH")))
+               (wrap-program (string-append out "/bin/cvise")
+                 `("PYTHONPATH" ":" prefix (,python-path)))
+               #t))))))
    (home-page "https://github.com/marxin/cvise")
    (synopsis "Reducer for interesting code")
    (description
@@ -1229,7 +1214,7 @@ and input distributions can also be expressed in Fandango.")
                          ;; Shorten paths to sockets in tests.
                          (lambda _ (setenv "TMPDIR" "/tmp"))))
           #:test-target "test"))
-    (native-inputs (list python python-setuptools)) ; for tests
+    (native-inputs (list python))      ; for tests
    (synopsis "Fault injector in userspace")
    (description "Fiu provides CLI utilities and a C library
 to mark points of failure inside your code
@@ -41,6 +41,7 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
  #:use-module (gnu packages)
@@ -48,7 +49,6 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages bison)
-  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages check)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
@@ -56,7 +56,7 @@
  #:use-module (gnu packages curl)
  #:use-module (gnu packages education)
  #:use-module (gnu packages emacs)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fribidi)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages glib)
@@ -122,83 +122,58 @@ Carnegie Mellon University.")
              "https://github.com/cmusphinx/cmudict/blob/master/LICENSE"))))

 (define-public dico
-  (let ((commit "05da4bc9e613834fdb065e38c7181044d8889575")
-        (revision "0"))
-    (package
-      (name "dico")
-      (version (git-version "2.12" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://git.gnu.org.ua/dico.git")
-                (commit commit)
-                (recursive? #t)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1fmr01gpvvb1p6p9ylr67nqx8ymmmkqjhsi9y5zvp2nc32cgxvah"))))
-      (build-system gnu-build-system)
-      (arguments
-       (list
-        #:configure-flags #~(list "--disable-static")
-        #:phases
-        #~(modify-phases %standard-phases
-            (replace 'bootstrap
-              (lambda* (#:key inputs #:allow-other-keys)
-                (substitute* "grecs/bootstrap"
-                  (("/bin/sh")
-                   (which "bash"))
-                  ((" GRECS_GIT_ID=.*")
-                   " GRECS_GIT_ID=v1.0-25-g51b12be\n"))
-                (invoke "perl" "./bootstrap" "--force" "--skip-po")))
-            (add-before 'build 'post-configure
-              (lambda* (#:key inputs #:allow-other-keys)
-                ;; For some reason, this file is missing.
-                (install-file "gnulib/lib/getopt.c"
-                              "xdico/gnu")
-                ;; This code invokes "/bin/sh -c 'm4 -s ...'".
-                (substitute* "grecs/src/grecs-lex.l"
-                  (("\"/bin/sh")
-                   (string-append "\""
-                                  (search-input-file inputs "/bin/sh"))))))
-
-            (add-before 'check 'silence-guile
-              (lambda _
-                ;; Guile is too talkative, which disturbs the test
-                ;; infrastructure.  Gag it.
-                (setenv "GUILE_AUTO_COMPILE" "0")
-                (setenv "GUILE_WARN_DEPRECATED" "no"))))))
-      (native-inputs
-       (list autoconf-2.71
-             automake
-             bison
-             flex
-             gettext-minimal
-             groff
-             libtool
-             perl
-             texinfo))
-      (inputs
-       (list m4                           ;used at run time
-             bash-minimal                 ;likewise
-             pcre
-             python-wrapper
-             guile-3.0
-             gsasl
-             readline
-             zlib
-             wordnet
-             libxcrypt                    ;for 'crypt'
-             libltdl))
-      (home-page "https://www.gnu.org.ua/software/dico/")
-      (synopsis "Implementation of DICT server (RFC 2229)")
-      (description
-       "GNU Dico implements a flexible dictionary server and client according
-to RFC 2229 (DICT Server).  It is able to access any database available,
+  (package
+    (name "dico")
+    (version "2.12")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/dico/dico-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "1xvahrav8aml90qcj4cj3a33y0n7nm1k0ywgks1zy2q91v2qk2vj"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:configure-flags #~(list "--disable-static")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'set-shell-file-name
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; This code invokes "/bin/sh -c 'm4 -s ...'".
+              (substitute* "grecs/src/grecs-lex.c"
+                (("\"/bin/sh\"")
+                 (string-append "\""
+                                (search-input-file inputs "/bin/sh")
+                                "\"")))))
+          (add-before 'check 'silence-guile
+            (lambda _
+              ;; Guile is too talkative, which disturbs the test
+              ;; infrastructure.  Gag it.
+              (setenv "GUILE_AUTO_COMPILE" "0")
+              (setenv "GUILE_WARN_DEPRECATED" "no"))))))
+    (native-inputs (list groff))
+    (inputs
+     (list m4                           ;used at run time
+           bash-minimal                 ;likewise
+           pcre
+           python-wrapper
+           guile-3.0
+           gsasl
+           readline
+           zlib
+           wordnet
+           libxcrypt                    ;for 'crypt'
+           libltdl))
+    (home-page "https://www.gnu.org.ua/software/dico/")
+    (synopsis "Implementation of DICT server (RFC 2229)")
+    (description
+     "GNU Dico implements a flexible dictionary server and client according to
+RFC 2229 (DICT Server).  It is able to access any database available,
 regardless of format, thanks to its modular structure.  New modules may be
 written in C, Guile or Python.  Dico also includes a command-line client,
 which may be used to query remote dictionary databases.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))

 (define-public libmaa
  (package
@@ -67,6 +67,7 @@
  #:use-module (gnu packages vim)
  #:use-module (gnu packages web)
  #:use-module (gnu packages xml)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
@@ -289,6 +290,14 @@ install.")
              (for-each (lambda (file)
                          (chmod file #o755))
                        (find-files #$output "autopkgtest-virt-.*"))))
+          ;; Adjust use of importlib.resources to use python 3.10 compatible
+          ;; syntax, which requires an argument.
+          ;; Drop when switching to python 3.12+.
+          (add-after 'unpack 'adjust-importlib-resources-for-old-python
+            (lambda _
+              (substitute* "reprotest/__init__.py"
+                (("importlib.resources.files\\(\\)")
+                  "importlib.resources.files(package='reprotest')"))))
          (add-after 'unpack 'skip-most-tests
            ;; These tests require functionality not available in the guix
            ;; build environment
@@ -27,6 +27,7 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system trivial)
  #:use-module (guix utils)
  #:use-module (gnu packages check)
@@ -59,6 +59,7 @@
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system scons)
  #:use-module (guix build-system trivial)
@@ -105,6 +106,7 @@
  #:use-module (gnu packages libbsd)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages nss)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages perl-web)
@@ -1224,25 +1226,16 @@ and its highly optimized now for efficient performance.")
  (package
    (name "volume-key")
    (version "0.3.12")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://pagure.io/volume_key")
-              (commit (string-append "volume_key-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0zadzbh26ckk263w02d02r2x3mry2kxbybkhwwaxwpv6jsrm7xr6"))))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://releases.pagure.org/volume_key/volume_key-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "16rhfz6sjwxlmss1plb2wv2i3jq6wza02rmz1d2jrlnsq67p98vc"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list autoconf
-           automake
-           gettext-minimal
-           libtool
-           pkg-config
-           python       ; used to generate the Python bindings
-           python-setuptools
-           swig))
+     (list pkg-config swig-4.0 python-3))           ; used to generate the Python bindings
    (inputs
     (append
      (cons cryptsetup-minimal (libcryptsetup-propagated-inputs))
@@ -1252,21 +1245,15 @@ and its highly optimized now for efficient performance.")
            glib
            gpgme)))
    (arguments
-     (list
-      #:tests? #f ; not sure how tests are supposed to pass, even when run manually
-      #:configure-flags
-      #~(list "--without-python"
-              (string-append "--with-gpgme-prefix="
-                             #$(this-package-input "gpgme")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'set-python-paths
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((python #$(this-package-native-input "python")))
-                (setenv "PYTHON3"
-                        (string-append python "/bin/python3"))
-                (setenv "PYTHON3_CONFIG"
-                        (string-append python "/bin/python3-config"))))))))
+     `(#:tests? #f ; not sure how tests are supposed to pass, even when run manually
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-python.h-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((python (assoc-ref inputs "python")))
+               (substitute* "Makefile.in"
+                 (("/usr/include/python") (string-append python "/include/python")))
+               #t))))))
    (home-page "https://pagure.io/volume_key")
    (synopsis "Manipulate storage volume encryption keys")
    (description
@@ -46,7 +46,6 @@
  #:use-module (gnu packages perl)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-xyz))

 (define-public boinc-client
@@ -109,11 +108,7 @@ resources).  It supports virtualized, parallel, and GPU-based applications.")
                                     "--with-gtk"
                                     "--with-auth")))
    (native-inputs
-     (list autoconf
-           automake
-           pkg-config
-           python-setuptools
-           which))
+     (list pkg-config autoconf automake which))
    (inputs
     (list avahi
           gtk+
@@ -37,6 +37,7 @@
  #:use-module (guix git-download)
  #:use-module (guix gexp)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix deprecation)
  #:use-module (guix search-paths)
  #:use-module (guix utils)
@@ -312,7 +313,7 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
        (base32 "1a5vd07wrnfbclvf6pz9p8ag9kdd1453lsl9q0bkyc45hq2xqd2a"))))
    (build-system pyproject-build-system)
    (native-inputs
-     (list python-django python-pytest python-setuptools))
+     (list python-django python-pytest python-pytest-cov python-setuptools))
    (home-page "https://github.com/epicserve/django-cache-url")
    (synopsis "Configure Django cache settings from URLs")
    (description
@@ -403,6 +404,7 @@ and adapters that are useful for non-trivial configuration scenarios.")
           python-factory-boy
           python-pygments
           python-pytest
+           python-pytest-cov ; runs by default
           python-pytest-django
           python-setuptools
           python-shortuuid
@@ -1311,6 +1313,7 @@ server headers required for Cross-Origin Resource Sharing (CORS).")
           python-mock
           python-msgpack
           python-pytest
+           python-pytest-cov
           python-pytest-django
           python-pytest-mock
           python-setuptools
@@ -2167,6 +2170,7 @@ templates and not in python-level form definitions.")
    (build-system pyproject-build-system)
    (native-inputs
     (list python-pytest
+           python-pytest-cov ; runs by default
           python-pytest-django
           python-setuptools
           python-wheel))
@@ -29,6 +29,7 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
@@ -41,7 +41,6 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
-  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages check)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages curl)
@@ -49,10 +48,10 @@
  #:use-module (gnu packages gdb)
  #:use-module (gnu packages libedit)
  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages ninja)
  #: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-xyz)
  #:use-module (gnu packages textutils)
  #:use-module (gnu packages xorg)
@@ -117,7 +116,6 @@
       ("ldc" ,gdmd)
       ("ninja" ,ninja)
       ("python-wrapper" ,python-wrapper)
-       ("python-setuptools" ,python-setuptools)
       ("tzdata" ,tzdata-for-tests)
       ("unzip" ,unzip)))
    (home-page "http://wiki.dlang.org/LDC")
@@ -56,7 +56,7 @@
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages glib)
@@ -53,6 +53,7 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (srfi srfi-26))

 ;; The fetch-plan, install-plan and phases for docbook-xml tend to vary
@@ -665,8 +666,7 @@ the in DocBook SGML DTDs.")
               (base32
                "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"))
              (patches
-               (search-patches "dblatex-importlib.patch"
-                               "dblatex-inkscape-1.0.patch"))))
+               (search-patches "dblatex-inkscape-1.0.patch"))))
    (outputs '("out" "doc"))
    (build-system pyproject-build-system)
    (arguments
@@ -39,6 +39,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix utils)
  #:use-module (gnu packages autotools)
@@ -41,6 +41,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system perl)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix deprecation)
@@ -57,7 +58,7 @@
  #:use-module (gnu packages bison)
  #:use-module (gnu packages kde-frameworks)
  #:use-module (gnu packages docbook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages ghostscript)
  #:use-module (gnu packages graphviz)
  #:use-module (gnu packages gettext)
@@ -489,8 +490,9 @@ inspired by Dash.")
    (build-system gnu-build-system)
    (arguments
     (list
-      ;; Custom build steps to prevent using pyproject-build-system which
-      ;; allows to edit the latter without a texlive + haskell world rebuild.
+      ;; Essentially a lighter copy of the former python-build-system.
+      ;; Using it rather than pyproject-build-system allows to edit the latter
+      ;; without a texlive + haskell world rebuild.
      #:phases
      #~(modify-phases %standard-phases
          (delete 'bootstrap)
@@ -29,7 +29,7 @@
  #:use-module (gnu packages compression)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages databases)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages base)
@@ -62,6 +62,7 @@
  #:use-module (guix utils)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
  #:use-module (ice-9 match))

 (define-public treecc
@@ -25,6 +25,7 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system pyproject)
+  #:use-module ((guix build-system python) #:select (pypi-uri))
  #:use-module (guix build-system r)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -40,6 +40,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
@@ -206,7 +207,7 @@ with Microsoft Compiled HTML (CHM) files.")
           python-css-parser
           python-cssselect
           python-dateutil
-           python-dnspython
+           python-dnspython-1.16
           python-feedparser
           python-fonttools
           python-html2text
@@ -282,9 +283,7 @@ tags = [\"WS_X11\"]")
                 (string-append "[tool.sip.project]
 sip-include-dirs = [\""
                   #$(this-package-input "python-pyqt")
-                   "/lib/python"
-                   #$(version-major+minor (package-version python))
-                   "/site-packages/PyQt6/bindings\"]")))
+                   "/lib/python3.11/site-packages/PyQt6/bindings\"]")))
              (substitute* "src/calibre/ebooks/pdf/pdftohtml.py"
                (("PDFTOHTML = 'pdftohtml'")
                 (string-append "PDFTOHTML = \""
@@ -42,7 +42,7 @@
  #:use-module (gnu packages curl)
  #:use-module (gnu packages databases)
  #:use-module (gnu packages django)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
@@ -91,6 +91,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
  #:use-module (srfi srfi-1))
@@ -64,6 +64,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix deprecation)
  #:use-module (guix download)
@@ -90,7 +91,7 @@
  #:use-module (gnu packages elf)
  #:use-module (gnu packages embedded)
  #:use-module (gnu packages engineering)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gawk)
@@ -195,10 +196,6 @@
            (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
              (assoc-ref glib-or-gtk:%standard-phases
                         'generate-gdk-pixbuf-loaders-cache-file))
-            (add-after 'unpack 'fix-python-incompatibilities
-              (lambda _
-                (substitute* (find-files "." "\\.py$")
-                  (("assertEquals") "assertEqual"))))
            (add-before 'build 'set-home-env
              (lambda _
                (setenv "HOME" "/tmp")))
@@ -582,10 +579,8 @@ individual low-level driver modules.")
    (build-system gnu-build-system)
    (arguments
     (list
-      #:imported-modules %pyproject-build-system-modules
-      #:modules '((guix build gnu-build-system)
-                  ((guix build pyproject-build-system) #:prefix py:)
-                  (guix build utils))
+      #:imported-modules (append %default-gnu-imported-modules
+                                 %python-build-system-modules)
      #:make-flags
      #~(list (string-append "PREFIX=" #$output))
      #:phases
@@ -612,7 +607,7 @@ individual low-level driver modules.")
                (invoke "make" "-C" "examples/spm")
                (invoke "make" "-C" "examples/simple"))))
          (add-after 'install 'python:wrap
-            (assoc-ref py:%standard-phases 'wrap)))))
+            (@@ (guix build python-build-system) wrap)))))
    (native-inputs
     (list clang python-minimal-wrapper python-sphinx texinfo yosys))
    (inputs
@@ -1314,7 +1309,7 @@ package.")
       #:tests? #f)) ;no test suite
    (native-inputs (list asciidoc
                         gettext-minimal
-                         git-minimal/pinned
+                         git-minimal
                         perl
                         perl-unicode-linebreak
                         perl-yaml-tiny
@@ -1677,10 +1672,6 @@ an embedded event driven algorithm.")
     (list
      #:phases
      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              (substitute* "pyproject.toml"
-                (("click>=8,<8.3") "click>=8"))))
          (add-after 'compress-documentation 'wrap-program
            (lambda _
              (wrap-program (string-append #$output "/bin/librelane")
@@ -2261,10 +2252,7 @@ versus schematic} tests and can assist with automatic routing.")
     (list
      #:tests? #f                       ;there are no tests
      #:imported-modules (append %qt-build-system-modules
-                                 %pyproject-build-system-modules)
-      #:modules '((guix build qt-build-system)
-                  ((guix build pyproject-build-system) #:prefix py:)
-                  (guix build utils))
+                                 %python-build-system-modules)
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'build-info-documentation
@@ -2293,7 +2281,7 @@ versus schematic} tests and can assist with automatic routing.")
              (install-it "mcy")
              (install-it "mcy-dash")))
          (add-after 'make-install 'python:wrap
-            (assoc-ref py:%standard-phases 'wrap)))))
+            (@@ (guix build python-build-system) wrap)))))
    (native-inputs
     (list pkg-config
           python-sphinx
@@ -2521,7 +2509,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
 (define-public nvc
  (package
    (name "nvc")
-    (version "1.21.0")
+    (version "1.20.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2530,7 +2518,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "00hnrzk9dw88srfmjxxb9xkgnd5n26pmqlcw1bff1y0bckblsr38"))))
+                "1b38x2ch468s4p6mrq6c8s0d95vb84p6w4v8in79l4w7sfy8jnr0"))))
    (build-system gnu-build-system)
    (arguments
     (list #:out-of-source? #t
@@ -3260,6 +3248,7 @@ Numpy arrays for convenience.")
              (setenv "PDM_BUILD_SCM_VERSION" #$version))))))
    (native-inputs
     (list python-pdm-backend
+           python-pytest-cov
           python-setuptools
           python-setuptools-scm
           sby
@@ -3438,12 +3427,8 @@ SystemVerilog, and SystemC, with conversion between languages and to JSON.")
                                          inputs "include/antlr4-runtime"))
                     (antlr4cpp-lib (search-input-file
                                      inputs "lib/libantlr4-runtime.so"))
-                     (python-include
-                      (search-input-directory
-                       inputs
-                       (string-append
-                        "include/python"
-                        #$(version-major+minor (package-version python))))))
+                     (python-include (search-input-directory
+                                       inputs "include/python3.11")))
                ;; Patch CMake to use our paths directly.
                (substitute* "src/CMake_antlr4.txt"
                  (("set\\(ANTLR_CLASSPATH \"\"\\)")
@@ -3608,16 +3593,15 @@ Standard} data mode.")
    (version "0.4.1")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/SanDisk-Open-Source/pyvcd")
-             (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pyvcd" version))
       (sha256
-        (base32 "1a1fsgxmpy6gbrs7lp3a56b7d4g6srlp42y5azb1ywjx3w8fiwc6"))))
+        (base32 "15nnydvr1a4ykh8cagi484sfgvdg0dnjxaw6c0ivhjbrbblpaqnw"))))
    (build-system pyproject-build-system)
    (native-inputs
-     (list python-pytest python-setuptools python-setuptools-scm))
+     (list python-pytest-cov
+           python-setuptools
+           python-setuptools-scm))
    (home-page "http://pyvcd.readthedocs.io/")
    (synopsis "Library to manipulate digital wave files")
    (description
@@ -3894,7 +3878,10 @@ Automation}.")
                         #$output "/share/info/hdlmake-figures")))))
      #:test-flags #~(list "test_all.py")))
    (native-inputs
-     (list python-pytest python-setuptools python-sphinx texinfo))
+     (list python-pytest-cov
+           python-setuptools
+           python-sphinx
+           texinfo))
    (propagated-inputs (list python-networkx))
    (home-page "https://ohwr.gitlab.io/project/hdl-make/")
    (synopsis "Generate multi-purpose makefiles for HDL projects")
@@ -4057,9 +4044,18 @@ design.")
      ;; Tests are expensive and may introduce race condition on systems with
      ;; high (more than 16) threads count; limit parallel jobs to 8x.
      #~(list
-         "--numprocesses" (number->string (min 8 (parallel-job-count))))))
+         "--numprocesses" (number->string (min 8 (parallel-job-count))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'pathch-pytest-options
+            (lambda _
+              (substitute* "pyproject.toml"
+                ((".*--cov=.*") "")
+                ((".*--self-contained-html.*") "")
+                ((".*-n.*auto.*") "")))))))
    (native-inputs
-     (list python-pytest
+     (list python-pytest-cov
+           python-pytest-html
           python-pytest-xdist
           python-setuptools))
    (propagated-inputs
@@ -4623,10 +4619,11 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
     (list
      #:parallel-tests? #f
      #:test-target "test"
-      #:imported-modules %pyproject-build-system-modules
      #:modules `((guix build gnu-build-system)
-                  ((guix build pyproject-build-system) #:prefix python:)
+                  ((guix build python-build-system) #:prefix python:)
                  (guix build utils))
+      #:imported-modules `(,@%default-gnu-imported-modules
+                           (guix build python-build-system))
      #:make-flags #~(list (string-append "PREFIX=" #$output))
      #:phases
      #~(modify-phases %standard-phases
@@ -242,7 +242,6 @@
  #:use-module (gnu packages networking)
  #:use-module (gnu packages ocr)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages python-check)
  #:use-module (gnu packages telephony)
@@ -4547,6 +4546,43 @@ boilerplate code from defining new Flymake backend functions.")
    (description "This package adds Clojure syntax checker clj-kondo.")
    (license license:gpl3+)))

+(define-public emacs-flymake-shellcheck
+  ;; No tag, version grabbed from source .el file.
+  (let ((commit "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7")
+        (revision "1"))
+    (package
+      (name "emacs-flymake-shellcheck")
+      (version (git-version "0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/federicotdn/flymake-shellcheck")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl"))))
+      (build-system emacs-build-system)
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'substitute-shellcheck-path
+             (lambda* (#:key inputs #:allow-other-keys)
+               (make-file-writable "flymake-shellcheck.el")
+               (emacs-substitute-sexps "flymake-shellcheck.el"
+                 ("defcustom flymake-shellcheck-path"
+                  `(or (executable-find "shellcheck")
+                       ,(search-input-file inputs "bin/shellcheck")))))))))
+      (inputs
+       (list shellcheck))
+      (home-page "https://github.com/federicotdn/flymake-shellcheck")
+      (synopsis "Flymake backend for Bash/Sh powered by ShellCheck")
+      (description
+       "This package provides a backend for Flymake to use the
+tool ShellCheck for static analyzing @command{bash} and @command{sh}
+scripts.")
+      (license license:gpl3+))))
+
 (define-public emacs-a
  (package
    (name "emacs-a")
@@ -5266,39 +5302,6 @@ to prevent advertisers from tracking you when you open URLs (or listen to
 podcasts) in Emacs.")
      (license (list license:gpl3+)))))

-(define-public emacs-emcp
-  (let ((commit "a91016452ef73813ea4a7e84cde233176d87a97f")
-        (revision "0"))
-    (package
-      (name "emacs-emcp")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://codeberg.org/martenlienen/emcp")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "08wbpj95l38fsdihxhgryb74psl11agw5n9swnpf1j3qyhwa13cn"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:test-command
-        #~(list "emacs" "-Q" "-batch"
-                "-l" "emcp-tests.el"
-                "-f"
-                "ert-run-tests-batch-and-exit")))
-      (propagated-inputs
-       (list emacs-elisp-refs emacs-magit emacs-http-server))
-      (home-page "https://codeberg.org/martenlienen/emcp")
-      (synopsis "Emacs MCP client")
-      (description
-       "@code{emacs-emcp} is an Emacs client for the @acronym{Model Context
-Protocol, MCP}, designed to connect LLM agents directly to Emacs.")
-      (license license:gpl3+))))
-
 (define emacs-emms-print-metadata
  (package
    (name "emacs-emms-print-metadata")
@@ -14047,54 +14050,46 @@ libraries from Swagger specs.")
      #:imported-modules (append %emacs-build-system-modules
                                 %pyproject-build-system-modules)
      #:modules '((guix build emacs-build-system)
-                  ((guix build pyproject-build-system) #:prefix py:)
+                  ((guix build python-build-system) #:prefix py:)
                  (guix build emacs-utils)
                  (guix build utils))
      #:phases
-      (with-extensions (list (pyproject-guile-json))
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'avoid-server-installation-for-tests
-              (lambda _
-                (substitute* "Makefile"
-                  ;; Disable tox since it's only configured for python 3.8 and
-                  ;; python 3.9 by the project--that's ancient.
-                  (("tox")
-                   "echo tox")
-                  (("env: .*$")
-                   (string-append "env: " #$output "/bin/jediepcserver\n")))))
-            (add-after 'unpack 'ensure-no-mtimes-pre-1980
-              (assoc-ref py:%standard-phases 'ensure-no-mtimes-pre-1980))
-            (add-before 'check 'setenv
-              (lambda _
-                (setenv "HOME" "/tmp")))
-            (add-after 'ensure-no-mtimes-pre-1980 'relax-python-requirements
-              (lambda _
-                ;; Argparse should only be required for Python < 3.2
-                ;; (see: https://github.com/tkf/emacs-jedi/issues/365).
-                (substitute* "setup.py"
-                  ((".*argparse.*") ""))))
-            (add-after 'relax-python-requirements 'python:build
-              (assoc-ref py:%standard-phases 'build))
-            (add-after 'python:build 'python:add-install-to-pythonpath
-              (assoc-ref py:%standard-phases 'add-install-to-pythonpath))
-            (add-after 'python:add-install-to-pythonpath 'python:install
-              (assoc-ref py:%standard-phases 'install))
-            (add-after 'python:install 'python:create-entrypoints
-              (assoc-ref py:%standard-phases 'create-entrypoints))
-            (add-after 'python:create-entrypoints 'python:wrap
-              (assoc-ref py:%standard-phases 'wrap))
-            (add-after 'python:wrap 'patch-jedi:server-command
-              (lambda* (#:key outputs #:allow-other-keys)
-                (emacs-substitute-variables "jedi-core.el"
-                  ("jedi:server-command"
-                   `(list ,(search-input-file outputs "bin/jediepcserver"))))))))))
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'avoid-server-installation-for-tests
+            (lambda _
+              (substitute* "Makefile"
+                ;; Disable tox since it's only configured for python 3.8 and
+                ;; python 3.9 by the project--that's ancient.
+                (("tox")
+                 "echo tox")
+                (("env: .*$")
+                 (string-append "env: " #$output "/bin/jediepcserver\n")))))
+          (add-after 'unpack 'ensure-no-mtimes-pre-1980
+            (assoc-ref py:%standard-phases 'ensure-no-mtimes-pre-1980))
+          (add-before 'check 'setenv
+            (lambda _
+              (setenv "HOME" "/tmp")))
+          (add-after 'ensure-no-mtimes-pre-1980 'relax-python-requirements
+            (lambda _
+              ;; Argparse should only be required for Python < 3.2
+              ;; (see: https://github.com/tkf/emacs-jedi/issues/365).
+              (substitute* "setup.py"
+                ((".*argparse.*") ""))))
+          (add-after 'relax-python-requirements 'python:add-install-to-pythonpath
+            (assoc-ref py:%standard-phases 'add-install-to-pythonpath))
+          (add-after 'python:add-install-to-pythonpath 'python:install
+            (assoc-ref py:%standard-phases 'install))
+          (add-after 'python:install 'python:wrap
+            (assoc-ref py:%standard-phases 'wrap))
+          (add-after 'python:wrap 'patch-jedi:server-command
+            (lambda* (#:key outputs #:allow-other-keys)
+              (emacs-substitute-variables "jedi-core.el"
+                ("jedi:server-command"
+                 `(list ,(search-input-file outputs "bin/jediepcserver")))))))))
    (native-inputs (list emacs-mocker python-wrapper))
    (inputs (list python-wrapper python-epc python-jedi)) ;wrapped
    (propagated-inputs
-     (list emacs-auto-complete
-           emacs-python-environment
-           emacs-epc
-           python-setuptools))
+     (list emacs-auto-complete emacs-python-environment emacs-epc))
    (home-page "https://github.com/tkf/emacs-jedi")
    (synopsis "Provides Python completion in Emacs")
    (description
@@ -15522,6 +15517,34 @@ underlying library functionality for performing various activities related to
 the game of chess.")
    (license license:gpl3+)))

+(define-public emacs-4clojure
+  ;; There is no release.  Base version is extracted from Version keyword in
+  ;; the main file.
+  (let ((commit "4eccf8c7d4341a36c269451838114b27836699f9")
+        (revision "1"))
+    (package
+      (name "emacs-4clojure")
+      (version (git-version "0.2.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacsorphanage/4clojure")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "19x653lzc1dxil4ix257hciidbdmbhaxhs6qhlkwi9ygjrlrgvnk"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       (list emacs-request))
+      (home-page "https://github.com/emacsorphanage/4clojure/")
+      (synopsis "Open and evaluate 4clojure questions in Emacs")
+      (description "Emacs 4clojure interacts with
+@url{http://www.4clojure.com, 4clojure} problems.  You can open a specific
+question and move to the next or previous one.  You can also verify your
+answers.")
+      (license license:gpl3+))))
+
 (define-public emacs-base16-theme
  (package
    (name "emacs-base16-theme")
@@ -16790,51 +16813,6 @@ line program.")
 requests library that uses the url library.")
      (license license:gpl2+))))

-(define-public emacs-http-server
-  (let ((commit "00e746baf4a622a7545b4af5c5237a55d51f801b")
-        (revision "0"))
-    (package
-      (name "emacs-http-server")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://codeberg.org/martenlienen/http-server.el")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "0j7ls15ljk22qxy6hs2qzcjnbdfvrq4qwly8s6kfbczi74mw5iji"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:test-command
-        #~(list "emacs" "-Q" "-batch"
-                "-l" "http-server.el"
-                "-l" "http-server-ws.el"
-                "-l" "http-server-tests.el"
-                "-l" "http-server-ws-tests.el"
-                "--eval"
-                (string-append
-                 "(ert-run-tests-batch-and-exit "
-                 "'(and (not http-server-accepts-extra-methods)
-                        (not http-server-rejects-unsupported-methods)))"))
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'build-info-manual
-              (lambda _
-                (invoke "makeinfo" "--no-split"
-                        "-o" "http-server.info" "docs/http-server.texi"))))))
-      (native-inputs
-       (list emacs-package-lint emacs-plz emacs-websocket texinfo))
-      (home-page "https://codeberg.org/martenlienen/http-server.el")
-      (synopsis "Emacs HTTP server")
-      (description
-       "This library implements an HTTP server inside of Emacs to communicate
-with the user or other external programs.")
-      (license license:gpl3+))))
-
 (define-public emacs-rtfm-mode
  (package
   (name "emacs-rtfm-mode")
@@ -23872,8 +23850,8 @@ actually changing the buffer's text.")

 (define-public emacs-diff-hl
  ;; No new tags or releases since 2024.
-  (let ((commit "7d873b2f58908de1ea2f499da9bf993e088953d7")
-        (revision "1"))
+  (let ((commit "e79aa49ad3cbbe85379cf6646db3aaacd3b04708")
+        (revision "0"))
    (package
      (name "emacs-diff-hl")
      (version (git-version "1.10.0" revision commit))
@@ -23885,7 +23863,7 @@ actually changing the buffer's text.")
                (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "15a9cjlpjsfcb2hxqbb123389qhiqs06mn01pas2l0jqhc2p86v9"))))
+          (base32 "0fvxngcbx36vqj72fllfp5iqwihcqd1dfhmqr3m1284191q83na3"))))
      (build-system emacs-build-system)
      (arguments
       (list
@@ -23908,7 +23886,7 @@ actually changing the buffer's text.")
                (invoke "git" "init")
                (invoke "git" "add" ".")
                (invoke "git" "commit" "-m" "Commit all."))))))
-      (native-inputs (list git-minimal/pinned))
+      (native-inputs (list git-minimal))
      (home-page "https://github.com/dgutov/diff-hl")
      (synopsis "Highlight uncommitted changes using VC")
      (description
@@ -42120,7 +42098,7 @@ add popup descriptions to existing keymaps
 (define-public emacs-forgejo
  (package
    (name "emacs-forgejo")
-    (version "0.2.3")
+    (version "0.2.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -42129,7 +42107,7 @@ add popup descriptions to existing keymaps
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1c8s8a0hwb44jddxsrd74bh8rwaz8z5mn9ga8jmwxy7w045xfln1"))))
+                "0hf4sckxdygxa84g3pi3m2qy16ngx76jsrf192q5l4fppsyirnws"))))
    (build-system emacs-build-system)
    (arguments
     (list #:lisp-directory "lisp"
@@ -45,6 +45,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system trivial)
  #:use-module ((guix build utils) #:select (alist-replace delete-file-recursively))
  #:use-module (gnu packages)
@@ -57,7 +58,7 @@
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cross-base)
  #:use-module (gnu packages dejagnu)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages gdb)
  #:use-module (gnu packages guile)
@@ -2036,7 +2037,13 @@ whereas kdmx creates pseudo-ttys.")
      ;; tests: 631 passed, 27 skipped, 1 warning
      #:test-flags
      ;; E   ModuleNotFoundError: No module named 'mbed_tools_ci_scripts'
-      #~(list "--ignore=tests/ci_scripts/test_sync_board_db.py")))
+      #~(list "--ignore=tests/ci_scripts/test_sync_board_db.py")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-pytest-config
+            (lambda _
+              (substitute* "pytest.ini"
+                (("addopts = .*") "")))))))
    (native-inputs
     (list python-factory-boy
           python-pytest
@@ -68,7 +68,6 @@
  #:use-module (gnu packages bash)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages boost)
-  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages cdrom)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
@@ -81,7 +80,7 @@
  #:use-module (gnu packages engineering)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages file-systems)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fltk)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages fontutils)
@@ -108,6 +107,7 @@
  #:use-module (gnu packages music)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages networking)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages parallel)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages pretty-print)
@@ -140,6 +140,7 @@
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial))
@@ -41,6 +41,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix licenses)
  #:use-module (srfi srfi-1))

@@ -77,6 +77,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -113,7 +114,7 @@
  #:use-module (gnu packages emacs-build)
  #:use-module (gnu packages emacs-xyz)
  #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gawk)
@@ -1672,7 +1673,7 @@ multiple services and devices with hundreds of supported integrations.")
 (define-public python-esptool
  (package
    (name "python-esptool")
-    (version "5.2.0")
+    (version "5.0.2")
    (source
     (origin
       (method git-fetch)
@@ -1681,7 +1682,7 @@ multiple services and devices with hundreds of supported integrations.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0rgwa7mimznwkn8ql17yxwxsfp0is3i75y7bf62mgsxjyx7zawcd"))))
+        (base32 "1wl75j6ncm5lahy9pzc38qivhaf9p42a2bijishdkwkw388fs6x1"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1930,55 +1931,21 @@ r2ghidra.")
 (define-public rayforge
  (package
    (name "rayforge")
-    (version "1.7.7")   ;newer version requires python-raygeo (Rust)
+    (version "1.0.2")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-              (url "https://github.com/barebaric/rayforge")
-              (commit version)))
+             (url "https://github.com/barebaric/rayforge")
+             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1w44qw51nynf1rk61y0d0wj6xl66ciswpcsp38dnwrpfwsqgafxw"))))
+        (base32 "1c6dl0x3pafmh4p533jbk2cj73q90vz1797jya3hzzxdv0h383yc"))))
    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 1626 passed
-      #:test-flags
-      ;; XXX: Tests fail to pick exact version of cairo: E gi.RepositoryError:
-      ;; Typelib file for namespace 'cairo', version '1.0' not found
-      #~(list "--ignore=tests/core/geo/test_font_config.py"
-              "--ignore=tests/core/geo/test_geo_text.py"
-              "--ignore=tests/core/geo/test_geometry.py"
-              "--ignore=tests/core/geo/test_text.py"
-              "--ignore=tests/core/geo/test_transform.py"
-              ;; XXX: Projects ships a huge test suite which the majority
-              ;; fail, run bare minimal core tests.
-              "tests/core")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              ;; All of the dependencies are pined to exact version.
-              (substitute* "requirements.txt"
-                (("[=~]=.*") "\n")
-                ;; XXX: Guix's opencv package does not provide Python's
-                ;; version metadata.
-                (("opencv_python") ""))))
-          (add-before  'sanity-check 'set-home
-            (lambda _
-              (setenv "HOME" "/tmp")))
-          (add-before 'check 'remove-local-source
-            (lambda _
-              (delete-file-recursively "rayforge")))
-          (add-after 'wrap 'wrap-rayforge
-            (lambda _
-              (wrap-program (string-append #$output "/bin/rayforge")
-                `("GI_TYPELIB_PATH" ":" prefix
-                  (,(getenv "GI_TYPELIB_PATH")))))))))
    (native-inputs (list python-gitpython
                         python-pytest
                         python-pytest-asyncio
+                         python-pytest-cov
                         python-pytest-mock
                         python-setuptools))
    (inputs (list bash-minimal
@@ -1988,27 +1955,54 @@ r2ghidra.")
                  python-asyncudp
                  python-blinker
                  python-ezdxf
-                  python-gitpython
                  python-numpy
                  python-platformdirs
-                  python-pluggy
                  python-pycairo
                  python-pyclipper
                  python-pygobject
-                  python-pymupdf
                  python-pyopengl
                  python-pyopengl-accelerate
                  python-pypdf
-                  python-pyserial
+                  python-pyserial-asyncio
                  python-pyvips
                  python-pyyaml
                  python-scipy
                  python-semver
                  python-svgelements
-                  python-trimesh
                  python-websockets
                  vtracer))
-    (home-page "https://rayforge.org/")
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'write-version-file
+            (lambda _
+              (call-with-output-file "rayforge/version.txt"
+                (lambda (port)
+                  (display #$version port)))
+              (let ((port (open-file "MANIFEST.in" "a")))
+                (display "include rayforge/version.txt\n" port)
+                (close-port port))))
+          (add-after 'unpack 'fix-tests
+            (lambda _
+              (mkdir "tmp-home")
+              (setenv "HOME"
+                      (string-append (getcwd) "/tmp-home"))
+              ;; Fix abstract class test for older Python error message format
+              (substitute* "tests/pipeline/stage/test_base_stage.py"
+                (("without an implementation for abstract method 'reconcile'")
+                 "abstract method '?reconcile'?"))
+              ;; Fix arc fitting test: add looser tolerance for floating point comparison
+              (substitute* "tests/core/geo/test_fitting.py"
+                (("(assert np\\.allclose\\(.*, \\(-10\\.0, 0\\.0\\))" match)
+                 (string-append match ", atol=1e-3")))))
+          (delete 'sanity-check) ; Tests against python package version of rayforge
+          (add-after 'wrap 'wrap-rayforge
+            (lambda _
+              (wrap-program (string-append #$output "/bin/rayforge")
+                `("GI_TYPELIB_PATH" ":" prefix
+                  (,(getenv "GI_TYPELIB_PATH")))))))))
+    (home-page "https://github.com/barebaric/rayforge")
    (synopsis "Desktop application for laser cutting and engraving")
    (description
     "Rayforge is a cross-platform 2D CAD and G-code control software designed
@@ -2490,6 +2484,7 @@ Newton-Raphson power flow solvers in the C++ library lightsim2grid, and the
                         python-networkx
                         python-openpyxl
                         python-pytest
+                         python-pytest-cov ; --cov runs by default on skrf
                         python-pytest-mock
                         python-pyvisa
                         python-setuptools
@@ -3024,22 +3019,20 @@ interpolation toolkit.")
 (define-public python-motulator
  (package
    (name "python-motulator")
-    (version "0.6.2")
+    (version "0.5.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/Aalto-Electric-Drives/motulator/")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "motulator" version))
       (sha256
-        (base32 "1di2r1i19jl751v0hj426zkwk48w5yf8zpw2bl6qzk0vq4z2vpbw"))))
+        (base32 "1kh13zfa4w73q04pny2w2zgym47fp8xy7glwfx82fdx4fihk7dv7"))))
    (build-system pyproject-build-system)
    (arguments
     (list #:tests? #f)) ; there are no tests
-    (propagated-inputs
-     (list python-numpy python-matplotlib python-scipy python-tqdm))
-    (native-inputs (list python-hatchling))
+    (propagated-inputs (list python-matplotlib python-numpy python-scipy))
+    (native-inputs (list python-hatchling
+                         python-ipykernel
+                         python-toml))
    (home-page "https://aalto-electric-drives.github.io/motulator/")
    (synopsis "Motor Drive Simulator in Python")
    (description "This package includes simulation models for an induction
@@ -4183,6 +4176,10 @@ BOM creation and has a lot of extra features.")
       (sha256
        (base32 "19fi0y0lk45cyampczgh3kz2swai4zcgzkffp0xf5h55rxxrdpvk"))))
    (build-system cmake-build-system)
+    (inputs
+     (list protobuf
+           python
+           python-sip-4))
    (arguments
     `(#:tests? #f
       #:configure-flags '("-DBUILD_EXAMPLES=OFF")
@@ -4203,11 +4200,6 @@ BOM creation and has a lot of extra features.")
                                 (package-version python))
                               "/site-packages"
                               " Python3_SITEARCH"))))))))
-    (inputs
-     (list protobuf
-           python
-           python-sip-4))
-    (native-inputs (list python-setuptools))
    (home-page "https://github.com/Ultimaker/libArcus")
    (synopsis "Communication library for Ultimaker software components")
    (description "This library contains C++ code and Python3 bindings for
@@ -4426,6 +4418,15 @@ problem.  It was inspired from the SVGNest Javascript library.")
       (sha256
        (base32 "0jhqfylg6vzlbz9rqs981bg6y8s18iklw1p8hmax72xq2c7561s1"))))
    (build-system cmake-build-system)
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list boost
+           clipper
+           libnest2d-for-cura
+           nlopt
+           python
+           python-sip-4))
    (arguments
     `(#:tests? #f
       #:phases
@@ -4445,16 +4446,6 @@ problem.  It was inspired from the SVGNest Javascript library.")
                  (string-append path " Python3_SITEARCH"))
                 (("\\$\\{_process_output\\} Python3_SITELIB")
                  (string-append path " Python3_SITELIB")))))))))
-    (native-inputs
-     (list pkg-config
-           python-setuptools))
-    (inputs
-     (list boost
-           clipper
-           libnest2d-for-cura
-           nlopt
-           python
-           python-sip-4))
    (home-page "https://github.com/Ultimaker/pynest2d")
    (synopsis "Python bindings for libnest2d")
    (description
@@ -4499,6 +4490,8 @@ belongs to the Cura project from Ultimaker.")
       (sha256
        (base32 "1cq85x0xizsjwf9nl7v7x4i9vl335mgv2lda3q2c9fcwrndsc3wk"))))
    (build-system cmake-build-system)
+    (inputs
+     (list python python-sip-4))
    (arguments
     `(#:tests? #f ; No test suite.
       #:phases
@@ -4515,8 +4508,6 @@ belongs to the Cura project from Ultimaker.")
                  (string-append path " Python3_SITEARCH"))
                 (("\\$\\{_process_output\\} Python3_SITELIB")
                  (string-append path " Python3_SITELIB")))))))))
-    (inputs (list python python-sip-4))
-    (native-inputs (list python-setuptools))
    (home-page "https://github.com/Ultimaker/libSavitar")
    (synopsis "C++ implementation of 3mf loading with SIP python bindings")
    (description "LibSavitar is a C++ implementation of 3mf loading with SIP
@@ -4959,9 +4950,7 @@ and mogan.")
               (("'\" [+] python_path [+]")
                (string-append "'\" + std::string(\""
                               (assoc-ref outputs "out")
-                               "/lib/python"
-                               #$(version-major+minor (package-version python))
-                               "/site-packages"
+                               "/lib/python3.11/site-packages"
                               "\") +")))))
          (add-before 'check 'prepare-checks
            (lambda _
@@ -30,6 +30,7 @@
  #:use-module (guix gexp)
  #:use-module (guix utils)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (gnu packages)
  #:use-module (gnu packages algebra)
@@ -24,7 +24,7 @@
 (define-module (gnu packages esolangs)
  #:use-module (gnu packages)
  #:use-module (gnu packages bison)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
@@ -30,7 +30,7 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages bison)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages graphviz)
  #:use-module (gnu packages linux)
@@ -29,6 +29,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix utils)
  #:use-module (gnu packages)
@@ -244,6 +245,7 @@ seamlessly with your desktop environment.")
    (native-inputs
     (list nss-certs-for-test
           python-pytest
+           python-pytest-cov
           python-pytest-mock
           python-pytest-recording
           python-pytest-retry
@@ -52,6 +52,7 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system linux-module)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system trivial)
  #:use-module (guix utils)
@@ -78,7 +79,7 @@
  #:use-module (gnu packages docbook)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages file)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gawk)
  #:use-module (gnu packages gettext)
@@ -1507,6 +1508,158 @@ can create and compare snapshots, revert differences between them, and
 supports automatic snapshots timelines.")
    (license license:gpl2)))

+(define-public xfstests
+  ;; The last release (1.1.0) is from 2011.
+  (let ((revision "3")
+        (commit "8de535c53887bb49adae74a1b2e83e77d7e8457d"))
+    (package
+      (name "xfstests")
+      (version (git-version "1.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1sbkryl04xflrk6jb4fsl3h2whilj5m3vpdkpwwb26idp7ckjjv6"))))
+      (build-system gnu-build-system)
+      (arguments
+       (list
+        #:configure-flags
+        #~'("CFLAGS=-Wno-error=implicit-int")
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'patch-tool-locations
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute* "common/config"
+                  ;; Make absolute file names relative.
+                  (("(MKFS_PROG=\").*(\")" _ pre post)
+                   (string-append pre "mkfs" post)))
+                (for-each (lambda (file)
+                            (substitute* file
+                              (("( -s|#.|[= ])(/bin/sh|/bin/bash)" _ pre match)
+                               (string-append pre
+                                              (search-input-file inputs match)))
+                              (("/bin/(rm|true)" match)
+                               (search-input-file inputs match))
+                              (("/usr(/bin/time)" _ match)
+                               (search-input-file inputs match))))
+                          (append (find-files "common" ".*")
+                                  (find-files "tests" ".*")
+                                  (find-files "tools" ".*")
+                                  (find-files "src" "\\.(c|sh)$")))))
+            (replace 'bootstrap
+              (lambda* (#:key make-flags #:allow-other-keys)
+                (substitute* "Makefile"
+                  ;; Avoid a mysterious (to me) ‘permission denied’ error.
+                  (("cp ") "cp -f "))
+                (substitute* "m4/package_utilies.m4"
+                  ;; Fix the bogus hard-coded paths for every single binary.
+                  (("(AC_PATH_PROG\\(.*, ).*(\\))" _ pre post)
+                   (string-append pre (getenv "PATH") post)))
+                (apply invoke "make" "configure" make-flags)))
+            (add-after 'install 'wrap-xfstests/check
+              ;; Keep wrapping distinct from 'create-helper-script below: users
+              ;; must be able to invoke xfstests/check directly if they prefer.
+              (lambda* (#:key inputs #:allow-other-keys)
+                (wrap-program (string-append #$output "/xfstests/check")
+                  ;; Prefix the user's PATH with the minimum required tools.
+                  ;; The suite has many other optional dependencies and will
+                  ;; automatically select tests based on the original PATH.
+                  `("PATH" ":" prefix
+                    ,(map (lambda (file)
+                            (dirname (search-input-file inputs file)))
+                          (list "bin/setfacl"         ; acl
+                                "bin/attr"            ; attr
+                                "bin/bc"              ; bc
+                                "bin/df"              ; coreutils
+                                "bin/hostname"        ; inetutils
+                                "bin/perl"            ; perl
+                                "sbin/mkfs.xfs")))))) ; xfsprogs
+            (add-after 'install 'create-helper
+              ;; Upstream installs only a ‘check’ script that's not in $PATH and
+              ;; would try to write to the store without explaining how to change
+              ;; that.  Install a simple helper script to make it discoverable.
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let* ((check  (string-append #$output "/xfstests/check"))
+                       (bin    (string-append #$output "/bin"))
+                       (helper (string-append bin "/xfstests-check")))
+                  (mkdir-p bin)
+                  (with-output-to-file helper
+                    (lambda _
+                      (format #t "#!~a --no-auto-compile\n!#\n"
+                              (search-input-file inputs "/bin/guile"))
+                      (write
+                       `(begin
+                          (define (try proc dir)
+                            "Try to PROC DIR.  Return DIR on success, else #f."
+                            (with-exception-handler (const #f)
+                              (lambda _ (proc dir) dir)
+                              #:unwind? #t))
+
+                          (define args
+                            (cdr (command-line)))
+
+                          (when (or (member "--help" args)
+                                    (member "-h" args))
+                            (format #t "Usage: ~a [OPTION]...
+This Guix helper sets up a new writable RESULT_BASE if it's unset, then executes
+xfstest's \"~a\" command (with any OPTIONs) as documented below.\n\n"
+                                    ,(basename helper)
+                                    ,(basename check)))
+
+                          (let* ((gotenv-base (getenv "RESULT_BASE"))
+                                 (base (or gotenv-base
+                                           (let loop ((count 0))
+                                             (or (try mkdir
+                                                      (format #f "xfstests.~a"
+                                                              count))
+                                                 (loop (+ 1 count))))))
+                                 (result-base (if (string-prefix? "/" base)
+                                                  base
+                                                  (string-append (getcwd) "/"
+                                                                 base))))
+                            (setenv "RESULT_BASE" result-base)
+                            ;; CHECK must run in its own directory or will fail.
+                            (chdir ,(dirname check))
+                            (let ((status
+                                   (status:exit-val (apply system* ,check args))))
+                              (unless gotenv-base
+                                (try rmdir result-base))
+                              status))))))
+                  (chmod helper #o755)))))))
+      (native-inputs
+       (list autoconf automake libtool))
+      (inputs
+       (list acl
+             attr
+             bash-minimal
+             bc
+             guile-3.0                  ; for our xfstests-check helper script
+             inetutils
+             `(,util-linux "lib")
+             perl
+             time
+             xfsprogs))
+      (home-page "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git")
+      (synopsis "File system @acronym{QA, Quality Assurance} test suite")
+      (description
+       "The @acronym{FSQA, File System Quality Assurance} regression test suite,
+more commonly known as xfstests, comprises over 1,500 tests that exercise
+(@dfn{torture}) both the user- and kernel-space parts of many different file
+systems.
+
+As the package's name subtly implies, it was originally developed to test the
+XFS file system.  Today, xfstests is the primary test suite for all major file
+systems supported by the kernel Linux including XFS, ext4, and Btrfs, but also
+virtual and network file systems such as NFS, 9P, and the overlay file system.
+
+The packaged @command{check} script is not in @env{PATH} but can be invoked
+with the included @command{xfstests-check} helper.")
+      (license license:gpl2))))
+
 (define-public zfs
  (package
    (name "zfs")
@@ -1919,10 +2072,6 @@ local file system using FUSE.")
       (sha256
        (base32 "09409sjncz7n9m2ia5nfzy10q7c23dvpgjdkc3j9bjs4f5hvc9aq"))))
    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-backend #~'custom
-      #:test-flags #~(list "bitmasklist_test.py")))
    (native-inputs
     (list python-setuptools
           python-setuptools-scm))
@@ -71,6 +71,7 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system haskell)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system go)
@@ -99,7 +100,7 @@
  #:use-module (gnu packages emacs)
  #:use-module (gnu packages emacs-xyz)
  #:use-module (gnu packages dbm)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages glib)
@@ -129,6 +130,7 @@
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages networking)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages nss)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pdf)
@@ -649,6 +651,49 @@ It's not clear at the moment whether one day it will be possible to
 do so.")
    (license license:agpl3+)))

+(define-public libbwt-jni
+  (package
+    (name "libbwt-jni")
+    (version "0.2.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/bwt-dev/libbwt-jni")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1xbb8ad6rlpg972rnf7fipgzz6ry7yzbnxacgisqpkcjnw768zy5"))
+              (snippet
+               '(begin
+                  (use-modules (guix build utils))
+                  (delete-file-recursively "bwt")
+                  (substitute* "Cargo.toml"
+                    (("path = \"./bwt\"")
+                     "version = \"0.2.4\""))))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:install-source? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-lib
+            (lambda _
+              (install-file "target/release/libbwt_jni.so"
+                            (string-append #$output "/lib")))))))
+    (inputs (cons (package-source bwt)
+                  (cargo-inputs 'libbwt-jni)))
+    (home-page "https://github.com/bwt-dev/libbwt-jni")
+    (synopsis "Java Native Interface bindings for Bitcoin Wallet Tracker")
+    (description "Libbwt-jni is Java Native Interface bindings for Bitcoin
+Wallet Tracker, a lightweight personal indexer for Bitcoin wallets.
+Libbwt-jni allows you to programmatically manage bwt's Electrum RPC and HTTP
+API servers.  It can be used as a compatibility layer for easily upgrading
+Electrum-backed wallets to support a Bitcoin Core full node backend (by
+running the Electrum server in the wallet), or for shipping software that
+integrates bwt's HTTP API as an all-in-one package.")
+    (license license:expat)))
+
 (define-public python-electrum-ecc
  (package
    (name "python-electrum-ecc")
@@ -1283,7 +1328,7 @@ Ledger Blue/Nano S.")
 (define-public python-trezor
  (package
    (name "python-trezor")
-    (version "0.20.0")
+    (version "0.13.7")
    (source
     (origin
       (method git-fetch)
@@ -1292,7 +1337,7 @@ Ledger Blue/Nano S.")
             (commit (string-append "python/v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "06d4mw8iydgv2c3qxa47482k7dqpg89a2b6wd8f4g15ydn3gsfmn"))
+        (base32 "13wyl9b15c8iscfakprwfvh2akw180hfqdjww79b78ywz51y7hdh"))
       (modules
        '((guix build utils)
          (srfi srfi-26)
@@ -1330,32 +1375,26 @@ Ledger Blue/Nano S.")
                          "test_legacy_basic"
                          "test_unsigned"
                          "test_vendor_header")
-                    " and not "))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              (substitute* "pyproject.toml"
-                (("platformdirs>=4.4.0") "platformdirs")))))))
+                    " and not "))))
    (propagated-inputs
-     (list python-click
-           python-construct
+     (list python-attrs
+           python-click
           python-construct-classes
-           python-cryptography
-           python-keyring
+           python-ecdsa
+           python-hidapi
           python-libusb1
           python-mnemonic
-           python-noiseprotocol
-           python-platformdirs
           python-requests
-           python-shamir-mnemonic
-           python-slip10
           python-typing-extensions))
-    (native-inputs
+    (native-inputs ; Only needed for running the tests
     (list nss-certs-for-test
-           python-hatchling
-           python-setuptools
-           python-pytest))
+           protobuf
+           python-pytest
+           python-pillow
+           python-protobuf
+           python-pyqt
+           python-pytest
+           python-simple-rlp))
    (home-page "https://github.com/trezor/python-trezor")
    (synopsis "Python library for communicating with TREZOR Hardware Wallet")
    (description "@code{trezor} is a Python library for communicating with
@@ -1582,7 +1621,10 @@ features:
       (sha256
        (base32 "0yir8hka3vmpk0qhiaffagkdjg3mjgai808s0razsggbd5cn80bb"))))
    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-setuptools))
+    (native-inputs
+     (list python-pytest
+           python-pytest-cov
+           python-setuptools))
    (home-page "https://arthurdejong.org/python-stdnum/")
    (synopsis "Python module to handle standardized number and code formats")
    (description
@@ -1674,26 +1716,19 @@ main features are:
 (define-public silkaj
  (package
    (name "silkaj")
-    ;; 0.12.1 (2025-07-08), all tests passed on the latest commit, revert back
-    ;; to git tag when released.
-    (properties '((commit . "dabe484ba1871030be33a1473ee473004e102763")
-                  (revision . "0")))
-    (version (git-version "0.12.1"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
+    (version "0.12.1")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://git.duniter.org/clients/python/silkaj")
-              (commit (assoc-ref properties 'commit))))
+             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "08wg4q3y747apj5phq4ghjgg9cdr8mnyzjspjvd8v9qz08v5zg6b"))))
+        (base32 "0prglgwvzi676h4lyw9266sqiqbfs2l0mv0bmjvplvdxzzcs63bv"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 224 passed, 4 skipped, 2 deselected
      #:test-flags
      ;; They require Poetry in the PATH.
      #~(list "--ignore=tests/integration/"
@@ -2112,10 +2147,7 @@ it can easily generate custom reports specific to accounting purposes.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0zlanw88dq7czgsdvqwz2fgxamyrfnx15ymv4d7fnjrj04glpg47"))
-       ;; TODO: Remove in the next release:
-       ;; https://github.com/beancount/beangulp/commit/254bfb38ffed
-       (patches (search-patches "python-beangulp-click-8.2-compat.patch"))))
+        (base32 "0zlanw88dq7czgsdvqwz2fgxamyrfnx15ymv4d7fnjrj04glpg47"))))
    (build-system pyproject-build-system)
    (propagated-inputs
     (list beancount
@@ -2183,18 +2215,12 @@ software Beancount with a focus on features and usability.")
       (sha256
        (base32 "18kdic6rg9qizam6cgd2ljpapwiqh2dc3s6wsaz46kjc1yhhwjqy"))))
    (build-system pyproject-build-system)
-    (arguments
-     (list #:tests? #f))        ;no tests
    (propagated-inputs (list fava))
    (native-inputs (list python-pdm-backend))
    (home-page "https://github.com/stenius/fava-envelope-airmail")
    (synopsis "Envelope budgeting for Fava/Beancount")
-    (description
-     "Envelope budgeting for Fava/Beancount with stats, scheduled
-transactions, and color-coded UI.  It's a fork of
-@url{https://github.com/memst/fava-envelope} (itself a fork of
-@url{https://github.com/polarmutex/fava-envelope}) that adds several
-enhancements for envelope budgeting.")
+    (description "Envelope budgeting for Fava/Beancount with stats, scheduled
+transactions, and color-coded UI.")
    (license license:expat)))

 (define-public emacs-beancount
@@ -2481,6 +2507,10 @@ analysis of financial market data.")
        (base32 "13g5338aa8vgkx8g94vz5d8ynfq3jndvyh1nz6dlhw4axwr4x8dp"))))
    (properties '(("upstream-name" #{.}# "mt-940")))
    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "-c" "/dev/null")))       ; Remove custom --cov flags.
    (native-inputs (list python-pytest python-pyyaml python-setuptools))
    (home-page "https://mt940.readthedocs.io/")
    (synopsis "Python parser for MT940-encoded SWIFT data")
@@ -47,6 +47,7 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system trivial)
  #:use-module (gnu packages)
@@ -68,7 +69,7 @@
  #:use-module (gnu packages elf)
  #:use-module (gnu packages embedded)
  #:use-module (gnu packages flashing-tools)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gawk)
@@ -49,6 +49,7 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -72,7 +73,7 @@
  #:use-module (gnu packages electronics)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages embedded)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages ghostscript)
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages golang-xyz)
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
+;;; Copyright © 2012, 2013, 2014, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,9 +19,65 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages flex)
-  #:use-module (gnu packages compiler-tools)
-  #:use-module (guix deprecation))
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages man)
+  #:use-module (gnu packages bison)
+  #:use-module (srfi srfi-1))

-;; XXX: Deprecated on 2026-05-28.
-(define-deprecated/public-alias flex
-  (@ (gnu packages compiler-tools) flex))
+(define-public flex
+  (package
+    (name "flex")
+    (version "2.6.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/westes/flex"
+                    "/releases/download/v" version "/"
+                    "flex-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))))
+    (build-system gnu-build-system)
+    (inputs
+     (let ((bison-for-tests
+            (package
+              (inherit bison)
+              (arguments
+               ;; Disable tests, since they require flex.
+               (substitute-keyword-arguments arguments
+                 ((#:tests? _ #f) #f)))
+              (inputs (alist-delete "flex" (package-inputs bison))))))
+       `(("bison" ,bison-for-tests))))
+    (arguments
+     (if (%current-target-system)
+         (list #:configure-flags
+               #~'("ac_cv_func_malloc_0_nonnull=yes"
+                   "ac_cv_func_realloc_0_nonnull=yes"))
+         '()))
+    ;; m4 is not present in PATH when cross-building
+    (native-inputs
+     (list help2man m4))
+    (propagated-inputs (list m4))
+    (home-page "https://github.com/westes/flex")
+    (synopsis "Fast lexical analyser generator")
+    (description
+     "Flex is a tool for generating scanners.  A scanner, sometimes
+called a tokenizer, is a program which recognizes lexical patterns in
+text.  The flex program reads user-specified input files, or its standard
+input if no file names are given, for a description of a scanner to
+generate.  The description is in the form of pairs of regular expressions
+and C code, called rules.  Flex generates a C source file named,
+\"lex.yy.c\", which defines the function yylex().  The file \"lex.yy.c\"
+can be compiled and linked to produce an executable.  When the executable
+is run, it analyzes its input for occurrences of text matching the
+regular expressions for each rule.  Whenever it finds a match, it
+executes the corresponding C code.")
+    (license (non-copyleft "file://COPYING"
+                           "See COPYING in the distribution."))))
@@ -74,7 +74,6 @@
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2026 Joan Vilardaga Castro <codeberg-hn80@joanvc.cat>
 ;;; Copyright © 2026 Sughosha <sughosha@disroot.org>
-;;; Copyright © 2026 bdunahu <bdunahu@operationnull.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -335,14 +334,14 @@ mediums.")
    (version "4.1")
    (source
     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/rsms/inter/releases/download/"
-             "v" version "/Inter-" version ".zip"))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/rsms/inter")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
       (sha256
-        (base32 "07miarbl5ain7pg7sxlrb2j4m9prbriacyqpv1mvckwxlkagv0wq"))))
+        (base32 "1g54vl3jkpan0s1mzrb1s8zjqzy9787ffjg9sfy6yjy4k3qg8xhx"))))
    (build-system font-build-system)
-    (outputs '("out" "ttf" "woff"))
    (home-page "https://rsms.me/inter")
    (synopsis "Variable font family optimized for screen readability")
    (description
@@ -400,30 +399,6 @@ Lisnoti is available in regular, italic, bold and bold-italic
 variants.")
      (license license:silofl1.1))))

-(define-public font-literata
-  (package
-    (name "font-literata")
-    (version "3.103")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/googlefonts/literata")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1nnr5y6fz7da06ihinmna2a1g79q8l41bgr62l6jpl43p1dw93dn"))))
-    (build-system font-build-system)
-    (outputs (list "out" "woff"))
-    (home-page "https://github.com/googlefonts/literata")
-    (synopsis "Contemporary serif typeface for long-form reading")
-    (description
-     "Literata is a serif screen font family.  It was conceived for intensive
-editorial use, especially on screens of all sorts.  Its main potential is in
-digital publishing, whether on the web, electronic press, or mobile
-applications.")
-    (license license:silofl1.1)))
-
 (define-public font-inconsolata
  (package
    (name "font-inconsolata")
@@ -2842,32 +2817,6 @@ family.")
 (define-deprecated-package font-adobe-source-serif-pro
  font-adobe-source-serif)

-(define-public font-medieval-sharp
-  ;; No releases, use newest commit.
-  (let ((commit "ee7510b6b13854fd340e7d2e44c218780f672cd1")
-        (revision "1"))
-    (package
-      (name "font-medieval-sharp")
-      ;; From FONTLOG.txt.
-      (version (git-version "3.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/wmk69/Medieval-Sharp")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1r300591pra4nxpm5kppl5q3ihsp01wk2zh24f9pvv0jgf1ik87x"))))
-      (build-system font-build-system)
-      (home-page "https://github.com/wmk69/Medieval-Sharp")
-      (synopsis "Font based on gothic letters")
-      (description
-       "Medieval Sharp is a font created for inscriptions on stone, based on
-gothic letters.")
-      (license license:silofl1.1))))
-
 (define-public font-microsoft-cascadia
  (package
    (name "font-microsoft-cascadia")
@@ -4311,7 +4260,7 @@ typographical palette.")
 (define-public font-mona-sans
  (package
    (name "font-mona-sans")
-    (version "2.0.27")
+    (version "2.0.26")
    (source
     (origin
       (method git-fetch)
@@ -4321,7 +4270,7 @@ typographical palette.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "10xbs857d21zrfx0cpzcsyyk76j921qq68qpz5r2kl4jr3gz541z"))))
+         "09b6apxq659y4dkkm5swy683q6hviibv1cd48ragm5rd1376hsaz"))))
    (build-system font-build-system)
    (outputs '("out" "ttf" "woff"))
    (home-page "https://github.com/mona-sans")
@@ -47,12 +47,11 @@
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages bison)
-  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages check)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages docbook)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages fribidi)
@@ -70,6 +69,7 @@
  #:use-module (gnu packages linux)
  #:use-module (gnu packages man)
  #:use-module (gnu packages mc)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
@@ -96,6 +96,7 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix utils)
  #:use-module (srfi srfi-1))

@@ -472,53 +473,6 @@ font design software, it allows you to join, split, offset, and perform many
 other operations on paths.")
    (license license:expat)))

-(define-public python-booleanoperations
-  (package
-    (name "python-booleanoperations")
-    (version "0.9.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/typemytype/booleanOperations")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0ahfgamyq1ndwbr9n8sdx8qhqc2195xnbahylgjpk877hbr2gxav"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; Some tests fail due to small differences in the expected result (see:
-      ;; <https://github.com/typemytype/booleanOperations/issues/69>).
-      #:test-flags
-      #~(list "-k"
-              (string-join
-               (list "not test_QTail_reversed_difference"
-                     "test_QTail_reversed_intersection"
-                     "test_QTail_reversed_union"
-                     "test_QTail_reversed_xor"
-                     "test_Q_difference"
-                     "test_Q_intersection"
-                     "test_Q_union"
-                     "test_Q_xor")
-               " and not "))))
-    (native-inputs
-     (list python-defcon-bootstrap
-           python-fontpens-bootstrap
-           python-pytest
-           python-setuptools
-           python-setuptools-scm))
-    (propagated-inputs
-     (list python-fonttools-minimal
-           python-pyclipper))
-    (home-page "https://github.com/typemytype/booleanOperations")
-    (synopsis "Boolean operations on paths")
-    (description
-     "Boolean operations on paths which uses a super fast
-@url{http://www.angusj.com/delphi/clipper.php, polygon clipper library by
-Angus Johnson}.")
-    (license license:expat)))
-
 (define-public python-cffsubr
  (package
    (name "python-cffsubr")
@@ -620,6 +574,7 @@ for fontTools.")
     (list python-cython
           python-defcon
           python-pytest
+           python-pytest-runner
           python-setuptools
           python-setuptools-scm
           python-wheel
@@ -746,7 +701,8 @@ implementing the pen protocol for manipulating glyphs.")
      (modify-inputs native-inputs
        (append python-fontparts-bootstrap
                python-fontpens-bootstrap
-                python-pytest))))))
+                python-pytest
+                python-pytest-runner))))))

 ;;; A variant used to break a cycle with python-fontpens.
 (define-public python-fontparts-bootstrap
@@ -1027,6 +983,7 @@ suite of the @code{psautohint} package.")
    (native-inputs
     (list psautohint-font-data
           python-pytest
+           python-pytest-cov
           python-pytest-xdist
           python-setuptools-scm
           python-setuptools
@@ -1870,10 +1827,6 @@ definitions.")
           pango
           potrace
           python
-           ;; XXX: Python 3.12 lacks distutils:
-           ;; ModuleNotFoundError: No module named 'distutils'
-           ;; Remove when package is updated.
-           python-setuptools-bootstrap
           zlib))
    (arguments
     (append
@@ -75,6 +75,7 @@
  #:use-module (guix build-system meson)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system qt)
  #:use-module (guix search-paths)
@@ -1378,43 +1379,41 @@ For information about libevdev, see:
    (license license:expat)))

 (define-public python-pyxdg
-  ;; Latest unreleased commits add Python 3.12, 3.14 and 3.15 support.
-  (let ((commit "63033ac306aa26d32e1439417e59ae8f8a4c9820")
-        (revision "0"))
-    (package
-      (name "python-pyxdg")
-      (version "0.28")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://gitlab.freedesktop.org/xdg/pyxdg")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "10wk95rmcr2fglmvmv1a6ad9hkw9587r0rlww0gq6kbfz85whgmd"))))
-      (build-system pyproject-build-system)
-      (arguments
-       (list
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-before 'check 'pre-check
-              (lambda _
-                (setenv "XDG_DATA_DIRS"
-                        (string-append #$(this-package-native-input "shared-mime-info")
-                                       "/share/")))))))
-      (native-inputs
-       (list shared-mime-info
-             hicolor-icon-theme
-             python-pytest
-             python-setuptools))
-      (home-page "https://www.freedesktop.org/wiki/Software/pyxdg")
-      (synopsis "Implementations of freedesktop.org standards in Python")
-      (description
-       "PyXDG is a collection of implementations of freedesktop.org standards in
+  (package
+    (name "python-pyxdg")
+    (version "0.28")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pyxdg" version))
+       (sha256
+        (base32
+         "1d48bqwkbnpid80cpwz6h62i112laxl0ivpj58hdyd79fhqbnrrj"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      ;; Tests failing with error: AssertionError: 'image' != 'inode'
+      #~(list "--deselect=test/test_mime.py::MimeTest::test_get_type"
+              "--deselect=test/test_mime.py::MimeTest::test_get_type2")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda _
+              (setenv "XDG_DATA_DIRS"
+                      (string-append #$(this-package-native-input "shared-mime-info")
+                                     "/share/")))))))
+    (native-inputs
+     (list shared-mime-info
+           hicolor-icon-theme
+           python-pytest
+           python-setuptools))
+    (home-page "https://www.freedesktop.org/wiki/Software/pyxdg")
+    (synopsis "Implementations of freedesktop.org standards in Python")
+    (description
+     "PyXDG is a collection of implementations of freedesktop.org standards in
 Python.")
-      (license license:lgpl2.0))))
+    (license license:lgpl2.0)))

 (define-public hyprland-protocols
  (package
@@ -1972,10 +1971,6 @@ message bus.")
         "-Dsystemdsystemunitdir=/tmp/empty")
       #:phases
       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-python-incompatibilities
-           (lambda _
-             (substitute* (find-files "tests" "\\.py$")
-               (("assertEquals") "assertEqual"))))
         (add-after 'unpack 'patch-paths
           (lambda* (#:key inputs #:allow-other-keys)
             (substitute* "meson_post_install.py"
@@ -2183,7 +2178,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
           libxslt                      ;for xsltproc
           pkg-config
           python-minimal
-           python-dbus                  ;for test
+           python-dbus-1.2              ;for test
           python-pygobject             ;for test
           vala))
    (propagated-inputs
@@ -2377,7 +2372,7 @@ different sorts of messages in different formats.")
          (base32 "02wb61h2k3hhis5y2xi5rhc6pmikd13x722hk620sqb9b3m5pn3s"))))
      (build-system gnu-build-system)
      (native-inputs (list autoconf automake libtool pkg-config))
-      (inputs (list libxslt python-wrapper python-dbus))
+      (inputs (list libxslt python-wrapper python-dbus-1.2))
      (propagated-inputs (list telepathy-glib))
      (home-page "https://telepathy.freedesktop.org/")
      (synopsis "Telepathy IRC connection manager")
@@ -70,6 +70,7 @@
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system renpy)
  #:use-module (guix build-system scons)
  #:use-module (gnu packages)
@@ -1750,16 +1751,13 @@ color switches, and many more, with multiple options to customize.")
 (define-public python-pygame-ce
  (package
    (name "python-pygame-ce")
-    (version "2.5.7")
+    (version "2.5.5")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/pygame-community/pygame-ce")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pygame_ce" version))
       (sha256
-        (base32 "1awvs4wa9fgm8xldsxzdx1knijjpzz560lzj3rjvks3gcw8szhzx"))))
+        (base32 "0sxfchimdg606z65qychgvm66mq0aybs2isxsqb5zqy64g19gwm7"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -98,7 +98,6 @@
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2026 Nikita Alkhovik <forgoty13@gmail.com>
-;;; Copyright © 2026 bdunahu <bdunahu@operationnull.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -144,7 +143,7 @@
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages emacs)
  #:use-module (gnu packages emulators)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fltk)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages fontutils)
@@ -201,6 +200,7 @@
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages netpbm)
  #:use-module (gnu packages networking)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages ocaml)
  #:use-module (gnu packages oneapi)
  #:use-module (gnu packages opencl)
@@ -1957,7 +1957,7 @@ real-time combat.")
 (define-public golly
  (package
    (name "golly")
-    (version "5.0")
+    (version "4.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/golly/golly/golly-"
@@ -1965,53 +1965,47 @@ real-time combat.")
                                  "-src.tar.gz"))
              (sha256
               (base32
-                "049n634abxfpgh4imh3s5qqfn9nbwmcl6jm91f29ngqm53jcsdaq"))))
+                "0pg9cp83nxc354lizgza5bqdy7z5wh36863203zw6r6s4flji4an"))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      #:make-flags
-      #~(list "CC=gcc"
-              (string-append "GOLLYDIR="
-                             #$output
-                             "/share/golly"))
-      #:tests? #f ; no check target
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)
-          (replace 'build
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (with-directory-excursion "gui-wx"
-                (apply invoke `("make" ,@make-flags "-f" "makefile-gtk")))))
-          (replace 'install
-            (lambda _
-                (let* ((bin (string-append #$output "/bin"))
-                     (doc (string-append #$output "/share/doc/golly"))
-                     (pixmaps (string-append #$output "/share/pixmaps"))
-                     (share (string-append #$output "/share/golly")))
-                (for-each (lambda (binary)
-                            (install-file binary bin))
-                          (list "bgolly" "golly"))
-                (for-each (lambda (document)
-                            (install-file
-                             (string-append "docs/" document ".html")
-                             doc))
-                          (list "License" "ReadMe" "ToDo"))
-                (install-file "gui-wx/icons/appicon.xpm" pixmaps)
-                (for-each (lambda (folder)
-                            (copy-recursively
-                             folder
-                             (string-append share "/" folder)))
-                          (list "Help" "Patterns" "Rules" "Scripts"))))))))
+     '(#:make-flags (list "CC=gcc"
+                          (string-append "GOLLYDIR="
+                                         (assoc-ref %outputs "out")
+                                         "/share/golly"))
+       #:tests? #f ; no check target
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'build
+           (lambda* (#:key make-flags outputs #:allow-other-keys)
+             (with-directory-excursion "gui-wx"
+               (apply invoke `("make" ,@make-flags "-f" "makefile-gtk")))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (doc (string-append out "/share/doc/golly"))
+                    (pixmaps (string-append out "/share/pixmaps"))
+                    (share (string-append out "/share/golly")))
+               (for-each (lambda (binary)
+                           (install-file binary bin))
+                         '("bgolly" "golly"))
+               (for-each (lambda (document)
+                           (install-file
+                            (string-append "docs/" document ".html")
+                            doc))
+                         '("License" "ReadMe" "ToDo"))
+               (install-file "gui-wx/icons/appicon.xpm" pixmaps)
+               (for-each (lambda (folder)
+                           (copy-recursively
+                            folder
+                            (string-append share "/" folder)))
+                         '("Help" "Patterns" "Rules" "Scripts")))
+             #t)))))
    (native-inputs
-     (list lua
-           python-setuptools))
+     (list lua))
    (inputs
-     (list glu
-           mesa
-           python
-           sdl2
-           wxwidgets
-           zlib))
+     (list glu mesa python sdl2 wxwidgets zlib))
    (home-page "https://golly.sourceforge.net/")
    (synopsis "Software for exploring cellular automata")
    (description
@@ -3988,26 +3982,27 @@ that beneath its ruins lay buried an ancient evil.")
        (base32 "0hgzdvlh0j42w4q9kch9xvhnbvcrypac01xhpksw35gj9my887cp"))
       (modules '((guix build utils)))
       (snippet
+        ;; So, some of the sounds/graphics/tilesets are under different
+        ;; licenses... some of them even nonfree!  This is a console-only
+        ;; version of this package so we just remove them.
+        ;; In the future, if someone tries to make a graphical variant of
+        ;; this package, they can deal with that mess themselves. :)
        '(begin
-           (for-each delete-file-recursively
-                     '("lib/tiles/shockbolt" ;nonfree
-                       "src/win"))      ;contains .dlls!
-           ;; Don't build the shockbolt directory either.
-           (substitute* "lib/tiles/Makefile"
-             (("shockbolt") ""))))
-       (patches (search-patches "angband-remove-nonfree-tile-options.patch"))))
+           (for-each (lambda (subdir)
+                       (let ((lib-subdir (string-append "lib/" subdir)))
+                         (delete-file-recursively lib-subdir)))
+                     '("fonts" "icons" "sounds" "tiles"))
+           (substitute* "lib/Makefile"
+             ;; And don't try to invoke makefiles in the directories we removed.
+             (("gamedata customize help screens fonts tiles sounds icons user")
+              "gamedata customize help screens user"))
+           ;; Remove nonfree .dll files too.
+           (delete-file-recursively "src/win")))))
    (build-system gnu-build-system)
    (arguments
-     `(#:configure-flags (list (string-append "--bindir=" %output "/bin")
-                               "--disable-x11")
+     `(#:configure-flags (list (string-append "--bindir=" %output "/bin"))
       #:phases
       (modify-phases %standard-phases
-         (add-after 'unpack 'disable-graphics-and-sounds
-           (lambda _
-             (substitute* "lib/Makefile"
-               ;; Do not build any graphics for this version.
-               (("gamedata customize help screens fonts tiles sounds icons user")
-                "gamedata customize help screens user"))))
         (add-before 'build 'fix-infinite-loop-on-sighup
           ;; XXX Release 4.2.6 has a major bug where sending the process a
           ;; SIGHUP when closing the terminal causes it to infinite loop
@@ -4057,59 +4052,6 @@ the depths below Angband, seeking riches, fighting monsters, and preparing to
 fight Morgoth, the Lord of Darkness.")
    (license license:gpl2)))

-(define-public angband-sdl2
-  (package
-    (inherit angband)
-    (name "angband-sdl2")
-    (arguments
-     (substitute-keyword-arguments
-         (package-arguments angband)
-       ((#:configure-flags flags)
-        #~(cons* "--enable-sdl2" #$flags))
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (delete 'disable-graphics-and-sounds)
-            (add-after 'unpack 'patch-sdl-wrapper-headers
-              (lambda _
-                (with-directory-excursion "src"
-                  (substitute* '("snd-sdl.c"
-                                 "main-sdl2.c"
-                                 "sdl2/pui-win.h")
-                    (("\"SDL_image.h\"") "\"SDL2/SDL_image.h\"")
-                    (("\"SDL_mixer.h\"") "\"SDL2/SDL_mixer.h\"")
-                    (("\"SDL_ttf.h\"") "\"SDL2/SDL_ttf.h\"")))))
-            (add-after 'unpack 'patch-desktop-file
-              (lambda* (#:key outputs #:allow-other-keys)
-                 (let ((out (assoc-ref outputs "out")))
-                   (substitute* "lib/icons/angband-sdl2.desktop"
-                     (("Exec=angband" _)
-                      (string-append "Exec=" #$output "/bin/angband-sdl2"))))))
-            (add-after 'install 'rename-binary
-              (lambda _
-                (with-directory-excursion #$output
-                  ;; allows parallel installation with angband
-                  (rename-file "bin/angband"
-                               "bin/angband-sdl2"))))))))
-    (inputs
-     (modify-inputs inputs
-       (prepend sdl2
-                sdl2-image
-                sdl2-mixer
-                sdl2-ttf)))
-    (description "Angband is a Classic dungeon exploration roguelike.  Explore
-the depths below Angband, seeking riches, fighting monsters, and preparing to
-fight Morgoth, the Lord of Darkness.
-
-This version includes the SDL2 frontend, providing tilesets and sounds which
-can be enabled through in-game options.")
-    ;; XXX: fonts and adam bolt tileset are free but being clarified:
-    ;; https://github.com/angband/angband/issues/6608
-    ;; For the rest, see:
-    ;; https://github.com/angband/angband/blob/master/docs/copying.rst
-    (license (list license:gpl2            ;code, nomad+old tilesets
-                   license:cc-by-sa3.0     ;david gervais tileset
-                   license:cc-by-sa4.0)))) ;sounds
-
 (define-public pingus
  ;; Latest release is from 2021-12-24.
  (let ((commit "7d65221e1cd1026053c8a5a08ad911fbdd13d3ed")
@@ -6959,7 +6901,7 @@ tactics.")
 (define-public widelands
  (package
    (name "widelands")
-    (version "1.3.1")
+    (version "1.3")
    (source
     (origin
       (method git-fetch)
@@ -6968,7 +6910,7 @@ tactics.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0ab9s1imqdq1krfwlba1ipx3pwnvy91aqqzr15ssfzixy4wj5mww"))
+        (base32 "1j288rkflqmzxbacrrx35y8qm4mvbvd30c03cmkvh8b29jkgz3gp"))
       (modules '((guix build utils)))
       (snippet
        #~(delete-file-recursively "src/third_party/minizip"))))
@@ -51,7 +51,7 @@
  #:use-module (gnu packages docbook)
  #:use-module (gnu packages graphviz)
  #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages perl)
  #:use-module (guix packages)
  #:use-module (guix download)
@@ -31,7 +31,7 @@
  #:use-module (gnu packages bison)
  #:use-module (gnu packages cross-base)
  #:use-module (gnu packages dejagnu)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages guile)
  #:use-module (gnu packages hurd)
  #:use-module (gnu packages llvm)
@@ -80,14 +80,14 @@
 (define-public gdb-17
  (package
    (name "gdb")
-    (version "17.2")
+    (version "17.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/gdb/gdb-"
                                  version ".tar.xz"))
              (sha256
               (base32
-                "1312lccryan1jfkjwkbw9mpxgyfnmlr8dj4lbkxx3cz4f86nq0qw"))))
+                "0xnqqv3j463r5rnfmblj3zwhf0l0lyy4bp1zaid8zxn9fignz68l"))))
    (build-system gnu-build-system)
    (outputs '("out" "debug"))
    (arguments
@@ -1,7 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2026 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,15 +18,13 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages genealogy)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system pyproject)
-  #:use-module (guix gexp)
  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix gexp)
  #:use-module (guix packages)
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
-  #:use-module (gnu packages check)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages geo)
@@ -37,7 +34,6 @@
  #:use-module (gnu packages gnome)
  #:use-module (gnu packages graphviz)
  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages iso-codes)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-xyz)
@@ -61,42 +57,15 @@
    (build-system pyproject-build-system)
    (arguments
     (list
-      #:imported-modules (append %glib-or-gtk-build-system-modules
-                                 %pyproject-build-system-modules)
+      #:imported-modules
+      `((guix build glib-or-gtk-build-system)
+        ,@%pyproject-build-system-modules)
      #:modules
      `((ice-9 match)
        (srfi srfi-1)
        (guix build pyproject-build-system)
        ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
        (guix build utils))
-      ;; tests: 32408 passed, 44 skipped, 9 deselected, 1 warning, 65730 subtests passed
-      #:test-flags
-      ;; Tests failing during collection.
-      #~(list "--ignore=gramps/gen/merge/test/merge_ref_test.py"
-              "--ignore=po/test/po_test.py"
-              "--ignore=test/LosHawlos_db_test.py"
-              "--ignore=test/blob_to_json_test.py"
-              ;; Assertions are not equal for these tests.
-              #$@(map (lambda (ls) (string-append "--deselect=gramps/"
-                                                  (string-join ls "::")))
-                      '(("gen/proxy/test/proxies_test.py"
-                         "LivingProxyTest" "test_person_count")
-                        ("gen/proxy/test/proxies_test.py"
-                         "LivingPrivateProxyTest" "test_person_count")
-                        ("plugins/test/reports_test.py"
-                         "TestDynamic" "test_export_gedcom")
-                        ("plugins/test/reports_test.py"
-                         "TestDynamic" "test_export_gpkg")
-                        ("plugins/test/reports_test.py"
-                         "TestDynamic" "test_indiv_complete")
-                        ("plugins/test/reports_test.py"
-                         "TestDynamic" "test_navwebpage")
-                        ("plugins/test/reports_test.py"
-                         "TestDynamic" "test_tool_check")
-                        ("plugins/test/tools_test.py"
-                         "ToolControl" "test_tcg_and_check_and_repair")
-                        ("plugins/test/db_undo_and_signals_test.py"
-                         "TestSQLite" "test_one"))))
      #:phases
      #~(modify-phases %standard-phases
          (add-before 'build 'fix-gexiv2-dependency
@@ -104,19 +73,15 @@
              ;; Use our own version
              (substitute* (find-files "." ".*\\.py$")
                (("\"GExiv2\", \"0.10\"") "\"GExiv2\", \"0.16\""))))
-          (add-after 'unpack 'swap-bsddb3-with-berkeleydb
-            ;; bsddb3 was renamed upstream to berkeleydb.
-            (lambda _
-              (substitute* (find-files "." ".*\\.py")
-                (("bsddb3") "berkeleydb"))))
          (add-before 'check 'prepare-tests
            (lambda _
-              (setenv "GDK_BACKEND" "-")
-              (setenv "HOME" "/tmp")
+              (setenv "HOME" (getenv "TMPDIR"))
              ;; Presence of .git directory is used to determine whether this
              ;; is a final installation.  Without it, tests fail to determine
              ;; resource path.
-              (mkdir ".git")))
+              (mkdir ".git")
+              ;; Test is failing
+              (delete-file "gramps/gen/utils/test/file_test.py")))
          (add-before 'wrap 'wrap-with-GI_TYPELIB_PATH
            (lambda* (#:key inputs #:allow-other-keys)
              (wrap-program (string-append #$output "/bin/gramps")
@@ -133,11 +98,8 @@
          (add-after 'wrap 'glib-or-gtk-wrap
            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
    (native-inputs
-     (list gettext-minimal
-           intltool
-           python-jsonschema
-           python-mock
-           python-pytest
+     (list gettext-minimal intltool
+           glibc-utf8-locales ;for one test
           python-setuptools))
    (inputs
     (list bash-minimal
@@ -153,12 +115,12 @@
           (librsvg-for-system)
           osm-gps-map
           pango
-           python-berkeleydb
-           python-imagesize
+           python-bsddb3
+           python-jsonschema
+           python-lxml
           python-orjson
           python-pillow
           python-pycairo
-           python-pycountry
           python-pygobject
           python-pyicu
           rcs
@@ -55,6 +55,7 @@
  #:use-module (guix build-system go)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system r)
  #:use-module (guix build-system zig)
@@ -91,7 +92,7 @@
  #:use-module (gnu packages docbook)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
@@ -128,6 +129,7 @@
  #:use-module (gnu packages mpi)
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages ninja)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages perl)
@@ -296,7 +298,7 @@ than 600 operators available.")
 (define-public h3
  (package
    (name "h3")
-    (version "4.4.1")
+    (version "4.1.0")
    (source
     (origin
       (method git-fetch)
@@ -305,7 +307,7 @@ than 600 operators available.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1ijnbr4a54ph7bkn8waqwgnxmxlylv9yly9mwjdj69lkmdfjgaml"))))
+        (base32 "0x764xzna8ka6yhgv2y4hb158a61y3g9a6835qckqp7wfkpqvb7f"))))
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
@@ -317,25 +319,48 @@ combining the benefits of a hexagonal grid with S2's hierarchical
 subdivisions.")
    (license license:asl2.0)))

-(define-public python-h3
+;; For python-timezonefinder, remove it when it starts supporting newer
+;; version.
+(define-public h3-3
  (package
-    (name "python-h3")
-    (version "4.4.2")
+    (inherit h3)
+    (name "h3")
+    (version "3.7.2")
    (source
     (origin
       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/uber/h3")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0bvsljfxmjvl23v9gxykc4aynjzh5xfy3wg02bxad7cknr1amx9j"))))))
+
+(define-public python-h3
+  (package
+    (name "python-h3")
+    (version "4.0.0b2")
+    (source
+     (origin
+       (method git-fetch) ; no tests data in PyPi package
       (uri (git-reference
             (url "https://github.com/uber/h3-py")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "02gry51hn8x2bl80y1ipcyrg0ghcif4vjch26qil215wdzz1yrzv"))
+        (base32 "1k1n256hhlh05gjcj64pqh08zlaz6962jkb6nk1aazsgg8p41zs0"))
       (modules '((guix build utils)))
       ;; Remove bundled H3 lib.
       (snippet #~(begin (delete-file-recursively "src/h3lib")))))
    (build-system pyproject-build-system)
    (arguments
     (list
+      ;; FIXME: Check why these tests are failing.
+      ;; test_versions - assert (4, 1) == (4, 0)
+      ;; test_resolution - h3._cy.error_system.H3Failed
+      #:test-flags #~(list "-k" (string-append
+                                 "not test_versions"
+                                 " and not test_resolution"))
      #:phases
      #~(modify-phases %standard-phases
          ;; Use packaged in Guix h3 source.
@@ -356,7 +381,10 @@ subdivisions.")
           python-cython
           python-numpy
           python-pytest
-           python-scikit-build-core))
+           python-scikit-build
+           python-setuptools
+           python-setuptools-scm
+           python-wheel))
    (inputs (list h3))
    (home-page "https://uber.github.io/h3-py")
    (synopsis "Python bindings for H3")
@@ -364,6 +392,26 @@ subdivisions.")
 hierarchical hexagonal geospatial indexing system")
    (license license:asl2.0)))

+;; For python-timezonefinder, remove it when it starts supporting newer
+;; version.
+(define-public python-h3-3
+  (package
+    (inherit python-h3)
+    (name "python-h3")
+    (version "3.7.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/uber/h3-py")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16gxa1sivghxw179rik87r918mjasars2qkzidlwq83qfa4axn20"))))
+    (inputs
+     (modify-inputs inputs
+       (replace "h3" h3-3)))))
+
 (define-public geos
  (package
    (name "geos")
@@ -1076,6 +1124,7 @@ for seismology.")
    (inputs (list gdal))
    (native-inputs (list python-cython
                         python-pytest
+                         python-pytest-cov
                         python-setuptools
                         python-tomli
                         python-versioneer
@@ -1175,7 +1224,7 @@ projections and coordinate transformations library.")
 (define-public python-fiona
  (package
    (name "python-fiona")
-    (version "1.10.1")
+    (version "1.9.6")
    (source
     (origin
       (method git-fetch)
@@ -1184,38 +1233,24 @@ projections and coordinate transformations library.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0xribbcy5wvrm5y3bq281dry86vhjcnphg9772yp9s3y30y7mlz4"))))
+        (base32 "08whhjrspp194qasjhr9kf70fl342ms47k78rwpcf5q6ikf0rfii"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 757 passed, 161 skipped, 24 deselected, 1 xfailed, 6 xpassed
      #:test-flags
      #~(list "-m" "not network and not wheel"
-              #$@(map (lambda (test) (string-append "--deselect=tests/" test))
-                      ;; UserWarning: The parameter --where is used more than
-                      ;; once. Remove its duplicate as parameters should be
-                      ;; unique.
-                      (list "test_fio_cat.py::test_bbox_json_yes"
-                            "test_fio_cat.py::test_bbox_no"
-                            "test_fio_cat.py::test_bbox_where"
-                            "test_fio_cat.py::test_bbox_yes"
-                            "test_fio_cat.py::test_bbox_yes_two_files"
-                            "test_fio_cat.py::test_dst_crs_epsg3857"
-                            "test_fio_cat.py::test_multi_layer"
-                            "test_fio_cat.py::test_one"
-                            "test_fio_cat.py::test_two"
-                            "test_fio_cat.py::test_vfs"
-                            "test_fio_cat.py::test_where_no"
-                            "test_fio_cat.py::test_where_yes"
-                            "test_fio_cat.py::test_where_yes_two_files"
-                            ;; FileNotFoundError:
-                            ;; https://github.com/Toblerity/Fiona/files/\
-                            ;; 11151652/coutwildrnp.zip
-                            "test_pyopener.py::test_opener_fsspec_zip_http_fs")))
+              ;; FIXME: Find why the
+              ;; test_no_append_driver_cannot_append[PCIDSK] test is failing.
+              "-k" "not test_no_append_driver_cannot_append")
      #:phases
      #~(modify-phases %standard-phases
-          (add-before 'check 'remove-local-source
+          (add-before 'build 'set-configure-flags
            (lambda _
+              (setenv "CFLAGS" "-Wno-error=incompatible-pointer-types")))
+          (add-before 'check 'remove-local-fiona
+            (lambda _
+              ;; This would otherwise interfere with finding the installed
+              ;; fiona when running tests.
              (delete-file-recursively "fiona"))))))
    (inputs
     (list gdal))
@@ -1223,19 +1258,19 @@ projections and coordinate transformations library.")
     (list python-attrs
           python-certifi
           python-click
-           python-click-plugins
+           python-click-plugins-1
           python-cligj))
    (native-inputs
     (list gdal ; for gdal-config
           python-boto3
           python-cython
-           python-fsspec
           python-pytest
+           python-pytest-cov
           python-pytz
-           python-setuptools
-           python-shapely))
+           python-setuptools))
    (home-page "https://github.com/Toblerity/Fiona")
-    (synopsis "Fiona reads and writes spatial data files")
+    (synopsis
+     "Fiona reads and writes spatial data files")
    (description
     "Fiona is GDAL’s neat and nimble vector API for Python programmers. Fiona
 is designed to be simple and dependable.  It focuses on reading and writing
@@ -1498,6 +1533,7 @@ street bearings/orientations, and speed/travel time.")
           python-pyproj
           python-pyyaml
           python-pytest
+           python-pytest-cov
           python-pytest-httpserver
           python-pytz
           python-requests
@@ -1829,7 +1865,10 @@ utilities for data translation and processing.")
      ;; This test requires internet access.
      '(list "--deselect" "test_shapefile.py::test_reader_url")))
    (native-inputs
-     (list python-pytest python-setuptools python-wheel))
+     (list python-pytest
+           python-pytest-runner
+           python-setuptools
+           python-wheel))
    (home-page "https://github.com/GeospatialPython/pyshp")
    (synopsis "Read/write support for ESRI Shapefile format")
    (description
@@ -3539,9 +3578,10 @@ orienteering sport.")
       (list
        #:tests? #f                    ; No tests
        #:modules `((guix build gnu-build-system)
-                    ((guix build pyproject-build-system) #:prefix python:)
+                    ((guix build python-build-system) #:prefix python:)
                    (guix build utils))
-        #:imported-modules %pyproject-build-system-modules
+        #:imported-modules `(,@%default-gnu-imported-modules
+                             (guix build python-build-system))
        #:configure-flags
        #~(list "--with-blas"
                "--with-bzlib"
@@ -3713,13 +3753,13 @@ growing set of geoscientific methods.")
    (build-system cmake-build-system)
    (arguments
     (list
-      #:imported-modules (append %cmake-build-system-modules
-                                 %pyproject-build-system-modules
-                                 '((guix build qt-utils)))
      #:modules '((guix build cmake-build-system)
-                  ((guix build pyproject-build-system) #:prefix py:)
+                  ((guix build python-build-system) #:prefix python:)
                  (guix build qt-utils)
                  (guix build utils))
+      #:imported-modules `(,@%cmake-build-system-modules
+                           (guix build python-build-system)
+                           (guix build qt-utils))
      #:configure-flags
      #~(list "-DWITH_QTWEBKIT=NO")
      #:phases
@@ -3880,10 +3920,11 @@ growing set of geoscientific methods.")
            ;; Configure correct path to PyQt5 SIP directory
            (add-after 'unpack 'configure-pyqt5-sip-path
              (lambda* (#:key inputs #:allow-other-keys)
-                (let* ((pyqt (assoc-ref inputs "python-pyqt+qscintilla"))
-                       (sip-dir (string-append
-                                 (py:site-packages inputs `(("out" . ,pyqt)))
-                                 "/PyQt5/bindings")))
+                (let ((sip-dir (string-append
+                                (assoc-ref inputs "python-pyqt+qscintilla")
+                                "/lib/python"
+                                (python:python-version (assoc-ref inputs "python"))
+                                "/site-packages/PyQt5/bindings")))
                  (substitute* "cmake/FindPyQt5.py"
                    (("sip_dir = cfg.default_sip_dir")
                     (string-append "sip_dir = \"" sip-dir "\"")))
@@ -3913,7 +3954,7 @@ SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)")
                              "-E" (string-join ignored-tests "|")))
                    (format #t "test suite not run~%"))))
            (add-after 'install 'wrap-python
-              (assoc-ref py:%standard-phases 'wrap))
+              (assoc-ref python:%standard-phases 'wrap))
            (add-after 'wrap-python 'wrap-qt
              (lambda* (#:key inputs #:allow-other-keys)
                (wrap-qt-program "qgis" #:output #$output #:inputs inputs)))
@@ -476,31 +476,17 @@ inverse fourier transform.")
  (package
    (name "libmypaint")
    (version "1.6.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/mypaint/libmypaint")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178"))))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/mypaint/libmypaint/"
+                                  "releases/download/v" version "/libmypaint-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "0priwpmc7dizccqvn21ig6d649bprl3xl1hmjj7nddznjgr585vl"))))
    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'bootstrap 'overwrite-automake-and-aclocal-versions
-            (lambda _
-              (setenv "AUTOMAKE" "automake")
-              (setenv "ACLOCAL" "aclocal"))))))
    (native-inputs
-     (list autoconf
-           automake
-           intltool
-           libtool
-           pkg-config
-           python))
+     (list intltool pkg-config))
    ;; As needed by 'libmypaint.pc'.
    (propagated-inputs
     (list json-c gobject-introspection))
@@ -512,26 +498,6 @@ brushstrokes which is used by MyPaint and GIMP.")
    (home-page "http://mypaint.org")
    (license license:isc)))

-;; To update mypaint, remove when a fresh version is released.
-(define-public libmypaint-next
-  (package
-    (inherit libmypaint)
-    (name "libmypaint")
-    (properties '((commit . "551dfb9ca5d2b82f2361a5a8a9e7f386f35fd320")
-                  (revision . "0")))
-    (version (git-version "1.6.1"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/mypaint/libmypaint")
-              (commit (assoc-ref properties 'commit))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0pl8cma6gfkrqx364fs1xw7f491f7y6pzxqjq1cdqlrf9r8gg0sk"))))))
-
 (define-public mypaint-brushes
  (package
    (name "mypaint-brushes")
@@ -50,7 +50,7 @@
  #:use-module (gnu packages compression)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages elf)
-  #:use-module (gnu packages compiler-tools)
+  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gettext)
@@ -79,6 +79,7 @@
  #:use-module (guix build-system cargo)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system python)
  #:use-module (guix build-system pyproject)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
@@ -1419,8 +1420,8 @@ original glmark benchmark by Ben Smith.")
    (license license:bsd-2)))

 (define-public piglit
-  (let ((revision "2")
-        (commit "040ed91f234abb6a502d3a6910f1b0e54bd239a7"))
+  (let ((revision "1")
+        (commit "814046fe6942eac660ee4a6cc5fcc54011a49945"))
    (package
     (name "piglit")
     (version (git-version "0.0.0" revision commit))
@@ -1431,7 +1432,7 @@ original glmark benchmark by Ben Smith.")
                    (commit commit)))
              (file-name (git-file-name name version))
              (sha256
-               (base32 "1j5dmkym1mmz410xgwygimnjk2aswsqmcpjwz4s98pgmymh1yjvf"))))
+               (base32 "1bzaalcxskckfnwprw77sbbmfqi59by2j8imaq8ghnlzhlxv7mk7"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DPIGLIT_SSE2=OFF")
@@ -1450,21 +1451,16 @@ original glmark benchmark by Ben Smith.")
                                      "'")))))
                (add-after 'install 'wrap
                  (lambda* (#:key outputs #:allow-other-keys)
-                    (wrap-script (string-append #$output "/bin/piglit")
+                    (wrap-script (string-append (assoc-ref outputs "out")
+                                                "/bin/piglit")
                      `("GUIX_PYTHONPATH" prefix
                        (,(getenv "GUIX_PYTHONPATH")))))))))
-     (inputs (list glslang
-                   guile-3.0            ; for wrap-script
+     (inputs (list guile-3.0            ; for wrap-script
                   libxkbcommon
-                   python
-                   wayland-protocols
-                   vulkan-headers
-                   vulkan-loader
+                   python python-lxml python-mako python-numpy-1
+                   glslang vulkan-headers vulkan-loader
                   waffle))
-     (native-inputs (list pkg-config
-                          python-lxml
-                          python-mako
-                          python-numpy))
+     (native-inputs (list pkg-config))
     (home-page "https://piglit.freedesktop.org/")
     (synopsis "Test OpenGL implementations")
     (description "Piglit is a collection of automated tests for OpenGL and
--- a/Show More
+++ b/Show More