gnu: gnu-make-mesboot0: Downgrade to 3.80.

* gnu/packages/commencement.scm (gnu-make-mesboot0): Downgrade to 3.80. Change-Id: I00b1f6ac934b573bf7845d78e8d4ac78dcd1d0f6
WIP: use musl path to build hello-mesboot
2026-07-07 20:44:04 +02:00 · 2026-03-02 09:29:46 +02:00 · 2026-02-16 10:22:51 +02:00 · 2026-02-16 10:20:39 +02:00 · 2026-02-16 10:17:51 +02:00 · 2026-02-16 10:16:41 +02:00
706 changed files with 87889 additions and 128031 deletions
@@ -10,7 +10,6 @@ gnu/packages/machine-learning\.scm                 @guix/ai

 gnu/packages/audio\.scm                            @guix/audio
 gnu/packages/fluidplug\.scm                        @guix/audio
-gnu/packages/music\.scm                            @guix/audio
 gnu/packages/xiph\.scm                             @guix/audio

 gnu/packages/elixir(-.+|)\.scm$                    @guix/beam
@@ -24,18 +23,9 @@ guix/scripts/import/hexpm\.scm                     @guix/beam

 gnu/packages/bioinformatics\.scm                   @guix/bioinformatics

-gnu/packages/bootstrap\.scm                        @guix/bootstrap
 gnu/packages/commencement\.scm                     @guix/bootstrap
 gnu/packages/mes\.scm                              @guix/bootstrap

-gnu/packages/assembly\.scm                         @guix/build-tools
-gnu/packages/autogen\.scm                          @guix/build-tools
-gnu/packages/autotools\.scm                        @guix/build-tools
-gnu/packages/bison\.scm                            @guix/build-tools
-gnu/packages/m4\.scm                               @guix/build-tools
-gnu/packages/oyacc\.scm                            @guix/build-tools
-gnu/packages/re2c\.scm                             @guix/build-tools
-
 gnu/build-system/cmake\.scm                        @guix/cpp
 gnu/build/cmake-build-system\.scm                  @guix/cpp
 gnu/packages/c\.scm                                @guix/cpp
@@ -44,7 +34,6 @@ gnu/packages/cpp\.scm                              @guix/cpp
 gnu/packages/ninja\.scm                            @guix/cpp
 gnu/packages/valgrind\.scm                         @guix/cpp

-etc/teams\.scm                                     @guix/core
 guix/avahi\.scm                                    @guix/core
 guix/base16\.scm                                   @guix/core
 guix/base32\.scm                                   @guix/core
@@ -105,7 +94,6 @@ guix/quirks\.scm                                   @guix/core
 guix/read-print\.scm                               @guix/core
 guix/records\.scm                                  @guix/core
 guix/remote\.scm                                   @guix/core
-guix/remote-procedures\.scm                        @guix/core
 guix/repl\.scm                                     @guix/core
 guix/search-paths\.scm                             @guix/core
 guix/self\.scm                                     @guix/core
@@ -142,15 +130,12 @@ guix/build/utils\.scm                              @guix/core-packages
 guix/build-system/gnu\.scm                         @guix/core-packages

 gnu/packages/(.*-|)crypto\.scm$                    @guix/crypto
-gnu/packages/cryptsetup\.scm                       @guix/crypto
-gnu/packages/cybersecurity\.scm                    @guix/crypto
 gnu/packages/gnupg\.scm                            @guix/crypto
 gnu/packages/nettle\.scm                           @guix/crypto
 gnu/packages/password-utils\.scm                   @guix/crypto
 gnu/packages/security-token\.scm                   @guix/crypto
 gnu/packages/ssh\.scm                              @guix/crypto
 gnu/packages/tls\.scm                              @guix/crypto
-gnu/packages/vpn\.scm                              @guix/crypto

 gnu/packages/debian\.scm                           @guix/debian

@@ -195,7 +180,6 @@ gnu/packages/glib\.scm                             @guix/gnome
 gnu/packages/gstreamer\.scm                        @guix/gnome
 gnu/packages/gtk\.scm                              @guix/gnome
 gnu/packages/gnome\.scm                            @guix/gnome
-gnu/packages/gnome-circle\.scm                     @guix/gnome
 gnu/packages/gnome-xyz\.scm                        @guix/gnome
 gnu/packages/webkit\.scm                           @guix/gnome
 gnu/services/desktop\.scm                          @guix/gnome
@@ -212,12 +196,6 @@ guix/import/go\.scm                                @guix/go
 guix/scripts/import/go\.scm                        @guix/go
 tests/import/go\.scm                               @guix/go

-gnu/packages/guile\.scm                            @guix/guile
-gnu/packages/guile-wm\.scm                         @guix/guile
-gnu/packages/guile-xyz\.scm                        @guix/guile
-guix/build-system/guile\.scm                       @guix/guile
-guix/build/guile-build-system\.scm                 @guix/guile
-
 gnu/packages/hare\.scm                             @guix/hare
 gnu/packages/hare-apps\.scm                        @guix/hare
 gnu/packages/hare-xyz\.scm                         @guix/hare
@@ -244,8 +222,6 @@ gnu/packages/oneapi\.scm                           @guix/hpc
 gnu/packages/opencl\.scm                           @guix/hpc
 gnu/packages/parallel\.scm                         @guix/hpc
 gnu/packages/rocm\.scm                             @guix/hpc
-gnu/packages/rocm-tools\.scm                       @guix/hpc
-gnu/packages/rocm-libs\.scm                        @guix/hpc
 gnu/packages/sycl\.scm                             @guix/hpc
 gnu/packages/tbb\.scm                              @guix/hpc
 gnu/packages/vulkan\.scm                           @guix/hpc
@@ -258,17 +234,13 @@ gnu/packages/hurd\.scm                             @guix/hurd

 gnu/installer(\.scm$|/)                            @guix/installer

-gnu/packages/clojure\.scm                          @guix/java
 gnu/packages/java(-.+|)\.scm$                      @guix/java
 gnu/packages/maven(-.+|)\.scm$                     @guix/java
 guix/build/ant-build-system\.scm                   @guix/java
-guix/build/clojure-build-system\.scm               @guix/java
-guix/build/clojure-utils\.scm                      @guix/java
 guix/build/java-utils\.scm                         @guix/java
 guix/build/maven-build-system\.scm                 @guix/java
 guix/build/maven/                                  @guix/java
 guix/build-system/ant\.scm                         @guix/java
-guix/build-system/clojure\.scm                     @guix/java
 guix/build-system/maven\.scm                       @guix/java

 gnu/packages/node-xyz\.scm                         @guix/javascript
@@ -301,9 +273,6 @@ gnu/packages/fcitx5\.scm                           @guix/localization
 gnu/packages/fonts\.scm                            @guix/localization
 gnu/packages/ibus\.scm                             @guix/localization

-gnu/packages/lua\.scm                              @guix/lua
-gnu/packages/luanti\.scm                           @guix/lua
-
 gnu/packages/lxqt\.scm                             @guix/lxqt

 gnu/packages/mate\.scm                             @guix/mate
@@ -316,7 +285,6 @@ gnu/packages/librewolf\.scm                        @guix/mozilla
 gnu/packages/tor-browsers\.scm                     @guix/mozilla

 gnu/packages/ocaml\.scm                            @guix/ocaml
-gnu/packages/ocaml5\.scm                           @guix/ocaml
 gnu/packages/coq\.scm                              @guix/ocaml
 guix/build/ocaml-build-system\.scm                 @guix/ocaml
 guix/build/dune-build-system\.scm                  @guix/ocaml
@@ -326,39 +294,18 @@ guix/import/opam\.scm                              @guix/ocaml
 guix/scripts/import/opam\.scm                      @guix/ocaml
 tests/import/opam\.scm                             @guix/ocaml

-gnu/packages/perl(-.+|)\.scm$                      @guix/perl
-guix/build/perl-build-system\.scm                  @guix/perl
-guix/build/rakudo-build-system\.scm                @guix/perl
-guix/build-system/perl\.scm                        @guix/perl
-guix/build-system/rakudo\.scm                      @guix/perl
-guix/import/cpan\.scm                              @guix/perl
-guix/scripts/import/cpan\.scm                      @guix/perl
-
 gnu/packages/django\.scm                           @guix/python
 gnu/packages/jupyter\.scm                          @guix/python
 gnu/packages/python(-.+|)\.scm$                    @guix/python
 gnu/packages/sphinx\.scm                           @guix/python
 gnu/packages/tryton\.scm                           @guix/python
-guix/build-system/pyproject\.scm                   @guix/python
-guix/build-system/python\.scm                      @guix/python
 guix/build/pyproject-build-system\.scm             @guix/python
+guix/build-system/pyproject\.scm                   @guix/python
 guix/build/python-build-system\.scm                @guix/python
-guix/build/toml\.scm                               @guix/python
+guix/build-system/python\.scm                      @guix/python
 guix/import/pypi\.scm                              @guix/python
 guix/scripts/import/pypi\.scm                      @guix/python
 tests/import/pypi\.scm                             @guix/python
-tests/toml\.scm                                    @guix/python
-
-gnu/ci\.scm                                        @guix/qa-packages
-gnu/packages/benchmark\.scm                        @guix/qa-packages
-gnu/packages/check\.scm                            @guix/qa-packages
-gnu/packages/ci\.scm                               @guix/qa-packages
-gnu/packages/code\.scm                             @guix/qa-packages
-gnu/packages/debug\.scm                            @guix/qa-packages
-gnu/packages/dezyne\.scm                           @guix/qa-packages
-gnu/packages/libunwind\.scm                        @guix/qa-packages
-gnu/services/ci\.scm                               @guix/qa-packages
-gnu/tests/ci\.scm                                  @guix/qa-packages

 gnu/packages/qt\.scm                               @guix/qt
 guix/build-system/qt\.scm                          @guix/qt
@@ -408,7 +355,6 @@ gnu/packages/graph\.scm                            @guix/science
 gnu/packages/lean\.scm                             @guix/science
 gnu/packages/maths\.scm                            @guix/science
 gnu/packages/medical\.scm                          @guix/science
-gnu/packages/physics\.scm                          @guix/science
 gnu/packages/sagemath\.scm                         @guix/science
 gnu/packages/statistics\.scm                       @guix/science

@@ -421,7 +367,7 @@ gnu/packages/antivirus\.scm                        @guix/sysadmin
 gnu/packages/apparmor\.scm                         @guix/sysadmin
 gnu/packages/authentication\.scm                   @guix/sysadmin
 gnu/packages/cluster\.scm                          @guix/sysadmin
-gnu/packages/configuration-management\.scm         @guix/sysadmin
+gnu/packages/configuration-management              @guix/sysadmin
 gnu/packages/databases\.scm                        @guix/sysadmin
 gnu/packages/distributed\.scm                      @guix/sysadmin
 gnu/packages/dns\.scm                              @guix/sysadmin
@@ -441,25 +387,6 @@ gnu/packages/task-runners\.scm                     @guix/sysadmin
 gnu/packages/terraform\.scm                        @guix/sysadmin
 gnu/packages/virtualization\.scm                   @guix/sysadmin
 gnu/packages/vnc\.scm                              @guix/sysadmin
-gnu/services/admin\.scm                            @guix/sysadmin
-gnu/services/authentication\.scm                   @guix/sysadmin
-gnu/services/databases\.scm                        @guix/sysadmin
-gnu/services/dns\.scm                              @guix/sysadmin
-gnu/services/high-availability\.scm                @guix/sysadmin
-gnu/services/kerberos\.scm                         @guix/sysadmin
-gnu/services/monitoring\.scm                       @guix/sysadmin
-gnu/services/nfs\.scm                              @guix/sysadmin
-gnu/services/samba\.scm                            @guix/sysadmin
-gnu/services/virtualization\.scm                   @guix/sysadmin
-gnu/services/vnc\.scm                              @guix/sysadmin
-gnu/tests/databases\.scm                           @guix/sysadmin
-gnu/tests/dns\.scm                                 @guix/sysadmin
-gnu/tests/high-availability\.scm                   @guix/sysadmin
-gnu/tests/monitoring\.scm                          @guix/sysadmin
-gnu/tests/nfs\.scm                                 @guix/sysadmin
-gnu/tests/samba\.scm                               @guix/sysadmin
-gnu/tests/virtualization\.scm                      @guix/sysadmin
-gnu/tests/vnc\.scm                                 @guix/sysadmin

 gnu/build/jami-service\.scm                        @guix/telephony
 gnu/packages/jami\.scm                             @guix/telephony
@@ -14,7 +14,7 @@
 # Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
 # Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 # Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
-# Copyright © 2020, 2021, 2023, 2025, 2026 Maxim Cournoyer <maxim@guixotic.coop>
+# Copyright © 2020, 2021, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 # Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 # Copyright © 2021 Andrew Tropin <andrew@trop.in>
 # Copyright © 2023 Clément Lassieur <clement@lassieur.org>
@@ -268,6 +268,7 @@ MODULES =					\
  guix/build/kconfig.scm			\
  guix/build/linux-module-build-system.scm	\
  guix/build/store-copy.scm			\
+  guix/build/json.scm				\
  guix/build/pack.scm				\
  guix/build/utils.scm				\
  guix/build/union.scm				\
@@ -454,12 +455,10 @@ AUX_FILES =						\
  gnu/packages/aux-files/findclass.php			\
  gnu/packages/aux-files/guix.vim			\
  gnu/packages/aux-files/guix-nvim.vim			\
-  gnu/packages/aux-files/linux-libre/6.19-arm64.conf	\
-  gnu/packages/aux-files/linux-libre/6.19-i686.conf	\
-  gnu/packages/aux-files/linux-libre/6.19-x86_64.conf	\
-  gnu/packages/aux-files/linux-libre/6.18-arm64.conf	\
-  gnu/packages/aux-files/linux-libre/6.18-i686.conf	\
-  gnu/packages/aux-files/linux-libre/6.18-x86_64.conf	\
+  gnu/packages/aux-files/linux-libre/6.17-arm64.conf	\
+  gnu/packages/aux-files/linux-libre/6.17-i686.conf	\
+  gnu/packages/aux-files/linux-libre/6.17-riscv.conf	\
+  gnu/packages/aux-files/linux-libre/6.17-x86_64.conf	\
  gnu/packages/aux-files/linux-libre/6.12-arm.conf	\
  gnu/packages/aux-files/linux-libre/6.12-arm64.conf	\
  gnu/packages/aux-files/linux-libre/6.12-i686.conf	\
@@ -481,6 +480,10 @@ AUX_FILES =						\
  gnu/packages/aux-files/linux-libre/5.10-arm64.conf	\
  gnu/packages/aux-files/linux-libre/5.10-i686.conf	\
  gnu/packages/aux-files/linux-libre/5.10-x86_64.conf	\
+  gnu/packages/aux-files/linux-libre/5.4-arm.conf	\
+  gnu/packages/aux-files/linux-libre/5.4-arm64.conf	\
+  gnu/packages/aux-files/linux-libre/5.4-i686.conf	\
+  gnu/packages/aux-files/linux-libre/5.4-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/sanity-check.py		\
@@ -492,6 +495,7 @@ AUX_FILES =						\

 # Templates, examples.
 EXAMPLES =					\
+  gnu/system/examples/asus-c201.tmpl		\
  gnu/system/examples/bare-bones.tmpl		\
  gnu/system/examples/bare-hurd.tmpl		\
  gnu/system/examples/bare-hurd64.tmpl		\
@@ -1262,49 +1266,42 @@ cuirass-jobs: $(GOBJECTS)
 .PHONY: clean-go make-go as-derivation
 .PHONY: update-guix-package update-NEWS cuirass-jobs release

-if in_git_p
 # Git auto-configuration.
+.git/hooks/:
+	$(AM_V_at)if test -d .git; then \
+	mkdir "$@"; \
+	fi

-# Note: the following git commands may fail and produce empty variables,
-# e.g. when working on a work tree in a container.
-GIT_HOOKS_DIR := $(shell git rev-parse --git-path hooks 2>/dev/null)
-GIT_CONFIG_FILE := $(shell git rev-parse --git-path config 2>/dev/null)
-$(GIT_HOOKS_DIR):
-	if [ -n "$(GIT_HOOKS_DIR)" ]; then mkdir -p "$@"; fi
+.git/hooks/%: etc/git/% | .git/hooks/
+	$(AM_V_at)if test -d .git; then \
+	cp "$<" "$@"; \
+	fi

-$(GIT_HOOKS_DIR)/%: etc/git/% | $(GIT_HOOKS_DIR)/
-	if [ -n "$(GIT_HOOKS_DIR)" ]; then cp "$<" "$@"; fi
-
-$(GIT_CONFIG_FILE): etc/git/gitconfig
-	if [ -n "$(GIT_CONFIG_FILE)" ]; then \
-	  git config --fixed-value --replace-all include.path \
-	    ../etc/git/gitconfig ../etc/git/gitconfig; \
+.git/config: etc/git/gitconfig
+	$(AM_V_at)if command -v git >/dev/null && test -d .git; then \
+	git config --fixed-value --replace-all include.path \
+	  ../etc/git/gitconfig ../etc/git/gitconfig; \
 	fi

 COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg=
-$(GIT_HOOKS_DIR)/commit-msg: etc/git/commit-msg | $(GIT_HOOKS_DIR)
-	if [ -n "$(GIT_HOOKS_DIR)" ]; then \
-	  if test -f $@  && ! grep -qF $(COMMIT_MSG_MAGIC) $@; then \
-	    mkdir -p $@.d && mv $@ $@.d && \
-	    echo user commit-msg hook moved to $@.d/commit-msg; \
-	  fi && \
-	  cp etc/git/commit-msg $@; \
+.git/hooks/commit-msg: etc/git/commit-msg | .git/hooks/
+	$(AM_V_at)if test -d .git; then \
+	if test -f $@  && ! grep -qF $(COMMIT_MSG_MAGIC) $@; then \
+	  mkdir -p $@.d && mv $@ $@.d && \
+	@ echo user commit-msg hook moved to $@.d/commit-msg; \
+	fi; \
+	cp etc/git/commit-msg $@; \
 	fi

-# Convenience targets.
-GIT_HOOKS_SOURCE_FILES := $(shell find etc/git -type f -executable)
-.PHONY: git-config git-hooks invalidate-hooks
-git-hooks: $(addprefix $(GIT_HOOKS_DIR)/,$(notdir $(GIT_HOOKS_SOURCE_FILES)))
-git-config: $(GIT_CONFIG_FILE) git-hooks
-
 # The etc/git/ config files are not distributed and have no use when building
 # from a tarball.  Do not add dependencies on these to *_DATA when building
 # from a tarball, as that breaks the build.
+if in_git_p
 nodist_noinst_DATA =				\
-  $(GIT_HOOKS_DIR)/pre-push			\
-  $(GIT_HOOKS_DIR)/post-merge			\
-  $(GIT_CONFIG_FILE)				\
-  $(GIT_HOOKS_DIR)/commit-msg
+  .git/hooks/pre-push				\
+  .git/hooks/post-merge				\
+  .git/config					\
+  .git/hooks/commit-msg
 endif

 # Downloading up-to-date PO files.
@@ -14,10 +14,6 @@ Copyright © 2026 Noé Lopez <noelopez@free.fr>

 Please send Guix bug reports to bug-guix@gnu.org.

-* Changes in 1.6.0 (since 1.5.0)
-** Distribution
-*** GNOME updated to version 48
-
 * Changes in 1.5.0 (since 1.4.0)
 ** Package management
 *** New ‘rpm’ format for the ‘guix pack’ command
@@ -111,9 +111,6 @@ build daemon, from within the generated build program."
                  #~(begin
                      (use-modules (ice-9 match))

-                      ;; To avoid lots of readlink calls
-                      (fluid-set! %file-port-name-canonicalization #f)
-
                      (eval-when (expand load eval)
                        ;; (gnu packages …) modules are going to be looked up
                        ;; under SOURCE.  (guix config) is looked up in FRONT.
@@ -172,13 +169,6 @@ build daemon, from within the generated build program."
                           ;; build output.
                           (connect sock AF_UNIX build-output)

-                           (when (integer? proto)
-                             ;; port->connection doesn't setup buffering, so
-                             ;; do this here
-                             (setvbuf (store-connection-socket store)
-                                      'block
-                                      %default-store-connection-buffer-size))
-
                           (display
                            (and=>
                             ;; Silence autoload warnings and the likes.
@@ -249,9 +239,6 @@ Display a spinner when nothing happens."
                #:rest rest)
  "Return a derivation that unpacks SOURCE into STORE and compiles Scheme
 files."
-  ;; Avoid lots of readlink calls
-  (fluid-set! %file-port-name-canonicalization #f)
-
  ;; Build the build program and then use it as a trampoline to build from
  ;; SOURCE.
  (mlet %store-monad ((build  (build-program source version guile-version
@@ -337,7 +324,7 @@ files."
                      (message (format #f "You found a bug: the program '~a'
 failed to compute the derivation for Guix (version: ~s; system: ~s;
 host version: ~s; pull-version: ~s).
-Please report the COMPLETE output above to <~a>.~%"
+Please report the COMPLETE output above by email to <~a>.~%"
                                       (derivation->output-path build)
                                       version system %guix-version pull-version
                                       %guix-bug-report-address))))))))))))
@@ -20,9 +20,6 @@

 (use-modules (srfi srfi-26))

-;; Avoid lots of readlink calls
-(fluid-set! %file-port-name-canonicalization #f)
-
 ;; Add ~/.config/guix/current to the search path.
 (eval-when (expand load eval)
  (and=> (or (getenv "XDG_CONFIG_HOME")
@@ -44,10 +41,6 @@

 (match (command-line)
  ((program source)
-   ;; The build procedure outputs to this port, so setup buffering to avoid
-   ;; one char per syscall.
-   (setvbuf (current-error-port) 'line)
-
   (with-error-handling
     (with-store store
       (let* ((script (string-append source "/build-aux/build-self.scm"))
@@ -128,13 +128,13 @@ COMMIT.  PROC receives the temporary directory file name as an argument."
 (define %guix-git-repo-push-url-regexp
  "(git.guix.gnu.org|codeberg.org/guix|git@codeberg.org:guix)/guix(.git)? \\(push\\)")

-(define (with-input-pipe-to-string prog . args)
-  (let* ((input-pipe (apply open-pipe* OPEN_READ prog args))
+(define-syntax-rule (with-input-pipe-to-string prog arg ...)
+  (let* ((input-pipe (open-pipe* OPEN_READ prog arg ...))
 	 (output (get-string-all input-pipe))
 	 (exit-val (status:exit-val (close-pipe input-pipe))))
    (unless (zero? exit-val)
      (error (format #f "Command ~s exited with non-zero exit status: ~s"
-                     (string-join (cons prog args)) exit-val)))
+                     (string-join (list prog arg ...)) exit-val)))
    (string-trim-both output)))

 (define (find-origin-remote)
@@ -1514,30 +1514,37 @@ satisfied.
@subsection Python Modules

@cindex python
-The standard way to generate a package definition is to use
-@code{guix import pypi <name>}, where @var{name} is the name of the
-Python package on @url{https://pypi.org, PyPI}, see @pxref{Invoking guix
-import}.  Please check with @code{guix lint <package-name>} that the
-generated package is valid.
+We currently package Python 2 and Python 3, under the Scheme variable names
+@code{python-2} and @code{python} as explained in @ref{Version Numbers}.
+To avoid confusion and naming clashes with other programming languages, it
+seems desirable that the name of a package for a Python module contains
+the word @code{python}.

-To avoid confusion and naming clashes with other programming languages,
-Python module packages should be prefixed with @code{python-}.
+Some modules are compatible with only one version of Python, others with
+both.  If the package Foo is compiled with Python 3, we name it
+@code{python-foo}.  If it is compiled with Python 2, we name it
+@code{python2-foo}.  Python 2 packages are being removed from the
+distribution; please do no not submit any new Python 2 packages.

-If a project already contains the word @code{python}, please do not
-repeat it; for instance, the module python-dateutil is packaged under
-the name @code{python-dateutil}.  If the project name starts with
-@code{py}, it is kept and prefixed as described above (e.g.@:
-@code{python-pytz}).
+If a project already contains the word @code{python}, we drop this;
+for instance, the module python-dateutil is packaged under the names
+@code{python-dateutil} and @code{python2-dateutil}.  If the project name
+starts with @code{py} (e.g.@: @code{pytz}), we keep it and prefix it as
+described above.

@quotation Note
-The standard build system for Python packages is Guix's implementation
-of the @url{https://peps.python.org/pep-0517/, formal Python standard}
-for specifying build requirements: @var{pyproject-build-system}.
-The @var{python-build-system} which corresponds to the way Python
-packages were built before PEP517, using the informally specified
-@file{setup.py} file, is now deprecated.  @var{pyproject-build-system}
-will eventually be deprecated and renamed into
-@var{python-build-system} after its removal.
+Currently there are two different build systems for Python packages in Guix:
+@var{python-build-system} and @var{pyproject-build-system}.  For the
+longest time, Python packages were built from an informally specified
+@file{setup.py} file.  That worked amazingly well, considering Python's
+success, but was difficult to build tooling around.  As a result, a host
+of alternative build systems emerged and the community eventually settled on a
+@url{https://peps.python.org/pep-0517/, formal standard} for specifying build
+requirements.  @var{pyproject-build-system} is Guix's implementation of this
+standard.  It is considered ``experimental'' in that it does not yet support
+all the various PEP-517 @emph{build backends}, but you are encouraged to try
+it for new Python packages and report any problems.  It will eventually be
+deprecated and merged into @var{python-build-system}.
@end quotation

@subsubsection Specifying Dependencies
@@ -1549,20 +1556,21 @@ package source tree, with varying degrees of accuracy: in the
@file{requirements.txt}, or in @file{tox.ini} (the latter mostly for
 test dependencies).

-When editing a recipe for a Python package, the goal is to map these
-dependencies to the appropriate type of ``input'' (@pxref{package
+Your mission, when writing a recipe for a Python package, is to map
+these dependencies to the appropriate type of ``input'' (@pxref{package
 Reference, inputs}).  Although the @code{pypi} importer normally does a
-good job (@pxref{Invoking guix import}), please verify the following
-check list to determine which dependency goes where.
+good job (@pxref{Invoking guix import}), you may want to check the
+following check list to determine which dependency goes where.

@itemize

@item
-Python is packaged @emph{without} @code{setuptools} and @code{pip}
-installed per default.
+We currently package Python with @code{setuptools} and @code{pip}
+installed per default.  This is about to change, and users are encouraged
+to use @code{python-toolchain} if they want a build environment for Python.

-@command{guix lint} will warn if @code{pip} or other unneeded
-native-inputs are added.
+@command{guix lint} will warn if @code{setuptools} or @code{pip} are
+added as native-inputs because they are generally not necessary.

@item
 Python dependencies required at run time go into
@@ -1577,9 +1585,9 @@ Python packages required only at build time---e.g., those listed under
 for testing---e.g., those in @code{tests_require} or @file{tox.ini}---go into
@code{native-inputs}.  The rationale is that (1) they do not need to be
 propagated because they are not needed at run time, and (2) in a
-cross-compilation context, it's the target ``native'' input.
+cross-compilation context, it's the ``native'' input that we'd want.

-Examples are the @code{pytest}, @code{mock}, and @code{stestr} test
+Examples are the @code{pytest}, @code{mock}, and @code{nose} test
 frameworks.  Of course if any of these packages is also required at
 run-time, it needs to go to @code{propagated-inputs}.

@@ -1940,60 +1948,35 @@ keyword parameters for procedures that take more than four parameters.
@node Submitting Patches
@section Submitting Patches

-@cindex pull requests
-@cindex patch submission
 Development is done using the Git distributed version control system.
 Thus, access to the repository is not strictly necessary.  We welcome
-contributions as @dfn{pull requests} (PR) at
-@url{https://codeberg.org/guix/guix/pulls/}@footnote{Before January 1st,
-2026, changes would be submitted by email to
-@email{guix-patches@@gnu.org} and could be
-@uref{https://issues.guix.gnu.org, browsed online}.  In accordance with
-@uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
-Guix Consensus Document 002}, this method is no longer supported.}.
-
-There are two ways to create a pull request:
+contributions in one of the following forms:

@itemize
@item
-By creating a personal ``fork'' of @uref{https://codeberg.org/guix/guix,
-the repository}, creating a branch with your changes, and
-@uref{https://docs.codeberg.org/collaborating/pull-requests-and-git-flow/,
-submitting a pull request for that branch}.
+@cindex pull request, for contributions
+As a @dfn{pull request} (PR) at
+@url{https://codeberg.org/guix/guix/pulls/}.  This is now the preferred
+form.

@item
-@cindex AGit workflow, for pull requests
-By following the @uref{https://forgejo.org/docs/next/user/agit-support/,
-@dfn{AGit workflow}}, which is somewhat more convenient and consumes
-less disk space at Codeberg since it removes the need to create a
-``fork''.
+Until December 31st, 2025@footnote{This date is the result of a decision
+made collectively in
+@uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
+Guix Consensus Document 002} in May 2025.}, you may also send patches as
+produced by @code{git format-patch} to the @email{guix-patches@@gnu.org}
+mailing list (@pxref{Submitting patches to a project,,, git, Git User
+Manual}).

-Assuming your local checkout is on the branch containing the changes you
-would like to submit for inclusion in the @code{master} branch, run:
-
-@example
-git push origin HEAD:refs/for/master \
-  -o topic=@var{topic} \
-  -o title=@var{title} -o description=@var{description}
-@end example
-
-@var{topic} must be an identifier without whitespace, similar to a
-branch name; @var{title} and @var{description} are arbitrary text that
-can be omitted, in which case the message of the last commit on the
-branch fills that role.
-
-To send an update to an AGit pull request of yours, run:
-
-@example
-git push origin HEAD:refs/for/master \
-  -o topic=@var{topic} -o force-push=yes
-@end example
-
-Codeberg automatically figures out which pull request @var{topic}
-corresponds to and updates the associated branch.
+This mailing list is backed by a Debbugs instance, which allows us to
+keep track of submissions (@pxref{Tracking Bugs and Changes}).
+Each message sent to that mailing list gets a new tracking number
+assigned; people can then follow up on the submission by sending email
+to @code{@var{ISSUE_NUMBER}@@debbugs.gnu.org}, where @var{ISSUE_NUMBER}
+is the tracking number (@pxref{Sending a Patch Series}).
@end itemize

-Contributors are encouraged to take a moment to set some Git
+Either way, contributors are encouraged to take a moment to set some Git
 repository options (@pxref{Configuring Git}) first, which can improve
 the readability of patches.  Seasoned Guix developers may also want to
 look at the section on commit access (@pxref{Commit Access}).
@@ -2160,13 +2143,36 @@ guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master --disable-auth

@end enumerate

+When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as
+a subject, if your patch is to be applied on a branch other than
+@code{master}, say @code{core-updates}, specify it in the subject like
+@samp{[PATCH core-updates] @dots{}}.
+
+You may use your email client, the @command{git send-email} command
+(@pxref{Sending a Patch Series}) or the @command{mumi send-email}
+command (@pxref{Debbugs User Interfaces}).  We prefer to get patches in
+plain text messages, either inline or as MIME attachments.  You are
+advised to pay attention if your email client changes anything like line
+breaks or indentation which could potentially break the patches.
+
+Expect some delay when you submit your very first patch to
+@email{guix-patches@@gnu.org}. You have to wait until you get an
+acknowledgement with the assigned tracking number. Future acknowledgements
+should not be delayed.
+
+When a bug is resolved, please close the thread by sending an email to
+@email{@var{ISSUE_NUMBER}-done@@debbugs.gnu.org}.
+
@menu
 * Configuring Git::
+* Sending a Patch Series::
@end menu

@node Configuring Git
@subsection Configuring Git
@cindex git configuration
+@cindex @code{git format-patch}
+@cindex @code{git send-email}

 If you have not done so already, you may wish to set a name and email
 that will be associated with your commits (@pxref{telling git your name,
@@ -2186,6 +2192,166 @@ changes was already submitted for review.  If you have a
@file{commit-msg} hook of your own you would like to use with Guix, you
 can place it under the @file{.git/hooks/commit-msg.d/} directory.

+@node Sending a Patch Series
+@subsection Sending a Patch Series
+@cindex patch series
+@cindex @code{git send-email}
+@cindex @code{git format-patch}
+
+@quotation Warning
+This section is about contributing code by sending patches by email.
+This option is supported until December 31st, 2025, but we recommend
+getting familiar with the @dfn{pull request} workflow, which will become
+the norm after that date.  @xref{Submitting Patches}, for more info.
+@end quotation
+
+@unnumberedsubsubsec Single Patches
+@anchor{Single Patches}
+The @command{git send-email} command is the best way to send both single
+patches and patch series (@pxref{Multiple Patches}) to the Guix mailing
+list.  Sending patches as email attachments may make them difficult to
+review in some mail clients, and @command{git diff} does not store commit
+metadata.
+
+@quotation Note
+The @command{git send-email} command is provided by the @code{send-email}
+output of the @code{git} package, i.e. @code{git:send-email}.
+@end quotation
+
+The following command will create a patch email from the latest commit,
+open it in your @var{EDITOR} or @var{VISUAL} for editing, and send it to
+the Guix mailing list to be reviewed and merged.  Assuming you have
+already configured Git according to @xref{Configuring Git}, you can
+simply use:
+
+@example
+$ git send-email --annotate -1
+@end example
+
+@quotation Tip
+To add a prefix to the subject of your patch, you may use the
+@option{--subject-prefix} option.  The Guix project uses this to
+specify that the patch is intended for a branch or repository
+other than the @code{master} branch of
+@url{https://codeberg.org/guix/guix.git}.
+
+@example
+git send-email --annotate --subject-prefix='PATCH core-updates' -1
+@end example
+@end quotation
+
+The patch email contains a three-dash separator line after the commit
+message.  You may ``annotate'' the patch with explanatory text by adding
+it under this line.  If you do not wish to annotate the email, you may
+drop the @option{--annotate} option.
+
+If you need to send a revised patch, don't resend it like this or send
+a ``fix'' patch to be applied on top of the last one; instead, use
+@command{git commit --amend} or @url{https://git-rebase.io,
+@command{git rebase}} to modify the commit, and use the
+@email{@var{ISSUE_NUMBER}@@debbugs.gnu.org} address and the @option{-v}
+flag with @command{git send-email}.
+
+@example
+$ git commit --amend
+$ git send-email --annotate -v@var{REVISION} \
+      --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org -1
+@end example
+
+@quotation Note
+Due to an apparent bug in @command{git send-email},
+@option{-v @var{REVISION}} (with the space) will not work; you
+@emph{must} use @option{-v@var{REVISION}}.
+@end quotation
+
+You can find out @var{ISSUE_NUMBER} either by searching on the mumi
+interface at @url{https://issues.guix.gnu.org} for the name of your patch or
+reading the acknowledgement email sent automatically by Debbugs in
+reply to incoming bugs and patches, which contains the bug number.
+
+@unnumberedsubsubsec Notifying Teams
+@anchor{Notifying Teams}
+@cindex teams
+If your git checkout has been correctly configured (@pxref{Configuring
+Git}), the @command{git send-email} command will automatically notify
+the appropriate team members, based on the scope of your changes.  This
+relies on the @file{etc/teams.scm} script, which can also be invoked
+manually if you do not use the preferred @command{git send-email}
+command to submit patches.  To list the available actions of the script,
+you can invoke it via the @command{etc/teams.scm help} command.  For
+more information regarding teams, @pxref{Teams}.
+
+@quotation Note
+On foreign distros, you might have to use @command{./pre-inst-env git
+send-email} for @file{etc/teams.scm} to work.
+@end quotation
+
+@unnumberedsubsubsec Multiple Patches
+@anchor{Multiple Patches}
+@cindex cover letter
+While @command{git send-email} alone will suffice for a single
+patch, an unfortunate flaw in Debbugs means you need to be more
+careful when sending multiple patches: if you send them all to the
+@email{guix-patches@@gnu.org} address, a new issue will be created
+for each patch!
+
+When sending a series of patches, it's best to send a Git ``cover
+letter'' first, to give reviewers an overview of the patch series.
+We can create a directory called @file{outgoing} containing both
+our patch series and a cover letter called @file{0000-cover-letter.patch}
+with @command{git format-patch}.
+
+@example
+$ git format-patch -@var{NUMBER_COMMITS} -o outgoing \
+      --cover-letter
+@end example
+
+@quotation Note
+@code{git format-patch} accepts a wide range of
+@uref{https://git-scm.com/docs/gitrevisions, revision range} specifiers.
+For example, if you are working in a branch, you could select all commits
+in your branch starting at @code{master}.
+
+@example
+$ git format-patch master..@var{MY_BRANCH} -o outgoing \
+      --cover-letter
+@end example
+@end quotation
+
+We can now send @emph{just} the cover letter to the
+@email{guix-patches@@gnu.org} address, which will create an issue
+that we can send the rest of the patches to.
+
+@example
+$ git send-email outgoing/0000-cover-letter.patch --annotate
+$ rm outgoing/0000-cover-letter.patch # we don't want to resend it!
+@end example
+
+Ensure you edit the email to add an appropriate subject line and
+blurb before sending it.  Note the automatically generated shortlog
+and diffstat below the blurb.
+
+Once the Debbugs mailer has replied to your cover letter email, you
+can send the actual patches to the newly-created issue address.
+
+@example
+$ git send-email outgoing/*.patch --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
+$ rm -rf outgoing # we don't need these anymore
+@end example
+
+Thankfully, this @command{git format-patch} dance is not necessary
+to send an amended patch series, since an issue already exists for
+the patchset.
+
+@example
+$ git send-email -@var{NUMBER_COMMITS} -v@var{REVISION} \
+      --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
+@end example
+
+If need be, you may use @option{--cover-letter --annotate} to send
+another cover letter, e.g. for explaining what's changed since the last
+revision, and why these changes are necessary.
+
@node Tracking Bugs and Changes
@section Tracking Bugs and Changes

@@ -2196,26 +2362,31 @@ patch submissions and topic branches.
 * The Issue Tracker::           The official bug and patch tracker.
 * Managing Patches and Branches::  How changes to Guix are managed.
 * Debbugs User Interfaces::     Ways to interact with Debbugs.
+* Debbugs Usertags::            Tag reports with custom labels.
 * Cuirass Build Notifications::  Be alerted of any breakage via RSS feeds.
@end menu

@node The Issue Tracker
@subsection The Issue Tracker

-@cindex email workflow, deprecated
-@cindex issue tracker, for the email workflow
+@cindex bug reports, tracking
+@cindex patch submissions, tracking
+@cindex issue tracking
@cindex Debbugs, issue tracking system
 Bug reports (@dfn{issues}) and patch submissions (@dfn{pull requests})
 are currently tracked at the @uref{https://codeberg.org/guix/guix,
 project's home at Codeberg}.

-Before January 1st, 2026, bug reports and patches were tracked using the
-Debbugs instance at @uref{https://bugs.gnu.org}, which can also be
-browsed at @uref{https://issues.guix.gnu.org}.  This has been
-discontinued and Codeberg is now the sole option to report new bugs and
-propose new changes@footnote{Check out
+Before May 25th, 2025, bug reports and patches were exclusively tracked
+using the Debbugs instance at @uref{https://bugs.gnu.org}; it may still
+be used for these purposes until December 31st, 2025, after which
+Codeberg will become the sole option to report new bugs and propose new
+changes@footnote{Check out
@uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
-Guix Consensus Document 002} for details on this decision.}.
+Guix Consensus Document 002} for details on this decision.}.  With
+Debbugs, bug reports are sent by email to @email{bug-guix@@gnu.org} and
+patches are sent to @email{guix-patches@@gnu.org} (@pxref{Submitting
+Patches}).

@node Managing Patches and Branches
@subsection Managing Patches and Branches
@@ -2327,10 +2498,11 @@ only then should the merge requests be created, as documented earlier.

@quotation Warning
 This section is about bug reports and patches sent by email to
-@uref{https://issues.guix.gnu.org, Debbugs}, which is discontinued.
-Since January 1st, 2026, bug reports and patches are submitted as issues
-and pull requests on @uref{https://codeberg.org/guix/guix, Codeberg}.
-@xref{Submitting Patches}, for more info.
+@uref{https://issues.guix.gnu.org, Debbugs}.  This option is supported
+until December 31st, 2025, after which
+@uref{https://codeberg.org/guix/guix, Codeberg} will be the only
+interface for submitting bug reports and changes.  @xref{Submitting
+Patches}, for more info.
@end quotation

@subsubsection Web interface
@@ -2519,6 +2691,63 @@ used.
@xref{Top,,, debbugs-ug, Debbugs User Guide}, for more information on
 this nifty tool!

+@node Debbugs Usertags
+@subsection Debbugs Usertags
+
+@cindex usertags, for debbugs
+@cindex Debbugs usertags
+Debbugs provides a feature called @dfn{usertags} that allows any user to
+tag any bug with an arbitrary label.  Bugs can be searched by usertag,
+so this is a handy way to organize bugs@footnote{The list of usertags is
+public information, and anyone can modify any user's list of usertags,
+so keep that in mind if you choose to use this feature.}.  If you use
+Emacs Debbugs, the entry-point to consult existing usertags is the
+@samp{C-u M-x debbugs-gnu-usertags} procedure.  To set a usertag, press
+@samp{C} while consulting a bug within the *Guix-Patches* buffer opened
+with @samp{C-u M-x debbugs-gnu-bugs} buffer, then select @code{usertag}
+and follow the instructions.
+
+For example, to view all the bug reports (or patches, in the case of
+@code{guix-patches}) tagged with the usertag @code{powerpc64le-linux}
+for the user @code{guix}, open a URL like the following in a web
+browser:
+@url{https://debbugs.gnu.org/cgi-bin/pkgreport.cgi?tag=powerpc64le-linux;users=guix}.
+
+For more information on how to use usertags, please refer to the
+documentation for Debbugs or the documentation for whatever tool you use
+to interact with Debbugs.
+
+In Guix, we are experimenting with usertags to keep track of
+architecture-specific issues, as well as reviewed ones.  To facilitate
+collaboration, all our usertags are associated with the single user
+@code{guix}.  The following usertags currently exist for that user:
+
+@table @code
+
+@item powerpc64le-linux
+The purpose of this usertag is to make it easy to find the issues that
+matter most for the @code{powerpc64le-linux} system type.  Please assign
+this usertag to bugs or patches that affect @code{powerpc64le-linux} but
+not other system types.  In addition, you may use it to identify issues
+that for some reason are particularly important for the
+@code{powerpc64le-linux} system type, even if the issue affects other
+system types, too.
+
+@item reproducibility
+For issues related to reproducibility.  For example, it would be
+appropriate to assign this usertag to a bug report for a package that
+fails to build reproducibly.
+
+@item reviewed-looks-good
+You have reviewed the series and it looks good to you (LGTM).
+
+@end table
+
+If you're a committer and you want to add a usertag, just start using it
+with the @code{guix} user.  If the usertag proves useful to you,
+consider updating this section of the manual so that others will know
+what your usertag means.
+
@node Cuirass Build Notifications
@subsection Cuirass Build Notifications

@@ -3020,7 +3249,7 @@ to that commit message.

 If you are not a committer, you can help others find a @emph{series} you
 have reviewed more easily by adding a @code{reviewed-looks-good} usertag
-for the @code{guix} user.
+for the @code{guix} user (@pxref{Debbugs Usertags}).

@node Updating the Guix Package
@section Updating the Guix Package
@@ -2,58 +2,7 @@
 # Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
 # Further modified by Tomas Volf <~@wolfsden.cz>.

-htmlxrefversion=2026-02-23.07; # UTC
-
-# Override URLs of manuals provided by the Documentation Center.
-
-DOCUMENTATION_CENTER = https://doc.guix.gnu.org
-
-bash             mono ${DOCUMENTATION_CENTER}/bash/latest/en/bash.html
-bash             node ${DOCUMENTATION_CENTER}/bash/latest/en/html_node
-binutils         mono ${DOCUMENTATION_CENTER}/binutils/latest/en/binutils.html
-binutils         node ${DOCUMENTATION_CENTER}/binutils/latest/en/html_node
-cuirass          mono ${DOCUMENTATION_CENTER}/cuirass/latest/en/cuirass.html
-cuirass          node ${DOCUMENTATION_CENTER}/cuirass/latest/en/html_node
-emacs-guix       mono ${DOCUMENTATION_CENTER}/emacs-guix/latest/en/emacs-guix.html
-emacs-guix       node ${DOCUMENTATION_CENTER}/emacs-guix/latest/en/html_node
-fibers           mono ${DOCUMENTATION_CENTER}/fibers/latest/en/fibers.html
-fibers           node ${DOCUMENTATION_CENTER}/fibers/latest/en/html_node
-gash             mono ${DOCUMENTATION_CENTER}/gash/latest/en/gash.html
-gash             node ${DOCUMENTATION_CENTER}/gash/latest/en/html_node
-gcrypt           mono ${DOCUMENTATION_CENTER}/gcrypt/latest/en/gcrypt.html
-gcrypt           node ${DOCUMENTATION_CENTER}/gcrypt/latest/en/html_node
-gdb              mono ${DOCUMENTATION_CENTER}/gdb/latest/en/gdb.html
-gdb              node ${DOCUMENTATION_CENTER}/gdb/latest/en/html_node
-geiser           mono ${DOCUMENTATION_CENTER}/geiser/latest/en/geiser.html
-geiser           node ${DOCUMENTATION_CENTER}/geiser/latest/en/html_node
-grub             mono ${DOCUMENTATION_CENTER}/grub/latest/en/grub.html
-grub             node ${DOCUMENTATION_CENTER}/grub/latest/en/html_node
-guile-avahi      mono ${DOCUMENTATION_CENTER}/guile-avahi/latest/en/guile-avahi.html
-guile-avahi      node ${DOCUMENTATION_CENTER}/guile-avahi/latest/en/html_node
-guile-gcrypt     mono ${DOCUMENTATION_CENTER}/guile-gcrypt/latest/en/guile-gcrypt.html
-guile-gcrypt     node ${DOCUMENTATION_CENTER}/guile-gcrypt/latest/en/html_node
-guile-gnutls     mono ${DOCUMENTATION_CENTER}/guile-gnutls/latest/en/guile-gnutls.html
-guile-gnutls     node ${DOCUMENTATION_CENTER}/guile-gnutls/latest/en/html_node
-guile-library    mono ${DOCUMENTATION_CENTER}/guile-library/latest/en/guile-library.html
-guile-library    node ${DOCUMENTATION_CENTER}/guile-library/latest/en/html_node
-guile            mono ${DOCUMENTATION_CENTER}/guile/latest/en/guile.html
-guile-netlink    mono ${DOCUMENTATION_CENTER}/guile-netlink/latest/en/guile-netlink.html
-guile-netlink    node ${DOCUMENTATION_CENTER}/guile-netlink/latest/en/html_node
-guile            node ${DOCUMENTATION_CENTER}/guile/latest/en/html_node
-guile-ssh        mono ${DOCUMENTATION_CENTER}/guile-ssh/latest/en/guile-ssh.html
-guile-ssh        node ${DOCUMENTATION_CENTER}/guile-ssh/latest/en/html_node
-inetutils        mono ${DOCUMENTATION_CENTER}/inetutils/latest/en/inetutils.html
-inetutils        node ${DOCUMENTATION_CENTER}/inetutils/latest/en/html_node
-libc             mono ${DOCUMENTATION_CENTER}/libc/latest/en/libc.html
-libc             node ${DOCUMENTATION_CENTER}/libc/latest/en/html_node
-mes              mono ${DOCUMENTATION_CENTER}/mes/latest/en/mes.html
-mes              node ${DOCUMENTATION_CENTER}/mes/latest/en/html_node
-r5rs             mono ${DOCUMENTATION_CENTER}/r5rs/latest/en/r5rs.html
-r5rs             node ${DOCUMENTATION_CENTER}/r5rs/latest/en/html_node
-recutils         mono ${DOCUMENTATION_CENTER}/recutils/latest/en/recutils.html
-recutils         node ${DOCUMENTATION_CENTER}/recutils/latest/en/html_node
-shepherd         mono ${DOCUMENTATION_CENTER}/shepherd/latest/en/shepherd.html
-shepherd         node ${DOCUMENTATION_CENTER}/shepherd/latest/en/html_node
+htmlxrefversion=2026-01-22.12; # UTC

 # Copyright 2010-2020, 2022 Free Software Foundation, Inc.
 #
@@ -51,7 +51,7 @@ profile guix-daemon @{guix_storedir}/*-{guix-daemon,guix}-*/bin/guix-daemon flag

    @{guix_storedir}/** rwlmkux,

-    owner /tmp/** rwux,
+    owner /tmp/** rw,

    @{PROC}/@{pid}/fd/ r,

@@ -796,14 +796,10 @@ export PATH="$GUIX_PROFILE/bin${PATH:+:}$PATH"
 # trailing colon so the system default search path is used.
 export INFOPATH="$GUIX_PROFILE/share/info:${INFOPATH:-}"
 export MANPATH="$GUIX_PROFILE/share/man:${MANPATH:-}"
-# Expose the latest Guix modules to Guile so guix shell and repls spawned by
-# e.g. Geiser work out of the box.
-export GUILE_LOAD_PATH="$GUIX_PROFILE/share/guile/site/3.0${GUILE_LOAD_PATH:+:$GUILE_LOAD_PATH}"
-export GUILE_LOAD_COMPILED_PATH="$GUIX_PROFILE/lib/guile/3.0/site-ccache${GUILE_LOAD_COMPILED_PATH:+:$GUILE_LOAD_COMPILED_PATH}"

 # User's default profile, if it exists
 GUIX_PROFILE="$HOME/.guix-profile"
-if [ -f "$GUIX_PROFILE/etc/profile" ]; then
+if [ -L "$GUIX_PROFILE" ]; then
  . "$GUIX_PROFILE/etc/profile"

  # see info '(guix) Application Setup'
@@ -45,7 +45,9 @@
    (_ #f)))

 (define guix-dependencies
-  (filter-map input->package (package-direct-inputs guix)))
+  (filter-map input->package
+              (fold alist-delete (package-direct-inputs guix)
+                    '("glibc-utf8-locales" "graphviz" "po4a"))))

 (define (package-without-tests p)
  (package/inherit p
@@ -5,7 +5,7 @@
 ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
 ;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
 ;; Copyright © 2019, 2020, 2021, 2023 Julien Lepiller <julien@lepiller.eu>
-;; Copyright © 2019–2026 Florian Pelz <pelzflorian@pelzflorian.de>
+;; Copyright © 2019–2025 Florian Pelz <pelzflorian@pelzflorian.de>
 ;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
 ;; Copyright © 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
 ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@@ -27,13 +27,12 @@
 ;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;; Copyright © 2024 Sebastian Dümcke <code@sam-d.com>
-;; Copyright © 2025-2026 Anderson Torres <anderson.torres.8519@gmail.com>
+;; Copyright © 2025 Anderson Torres <anderson.torres.8519@gmail.com>
 ;; Copyright © 2025 Roman Scherer <roman@burningswell.com>
 ;; Copyright © 2025 Jelle Licht <jlicht@fsfe.org>
 ;; Copyright © 2025 Rivulet Cedar <rivulet_cedar@yeah.net>
 ;; Copyright © 2025 jgart <jgart@dismail.de>
 ;; Copyright © 2025 Steve George <steve@futurile.net>
-;; Copyright © 2026 Noé Lopez <noelopez@free.fr>

 ;;
 ;; Copying and distribution of this file, with or without modification, are
@@ -43,64 +42,6 @@
 (channel-news
 (version 0)

- (entry (commit "b52ce9041ad58aeababd2d50d3e72bc23dffff60")
-        (title
-         (en "GNOME 48 is now available")
-         (fr "GNOME 48 maintenant disponible")
-         (de "GNOME 48 jetzt verfügbar"))
-        (body
-         (en "The GNOME desktop was updated from version 46 to 48, bringing
-accent colors, an improved Files (Nautilus) application, a new image
-viewer (Loupe), and more:
-
-@itemize
-@item @url{https://release.gnome.org/47/, GNOME 47 release notes}
-@item @url{https://release.gnome.org/48/, GNOME 48 release notes}
-@end itemize")
-         (fr "La version 48 de l’environnement de bureau GNOME est maintenant
-disponible. Les nouvelles fonctionnalitées incluent: les couleurs d’accent,
-l’application Fichiers (Nautilus) améliorée, un nouveau visionneur
-d’images (Loupe), et plus:
-
-@itemize
-@item @url{https://release.gnome.org/47/, GNOME 47 release notes}
-@item @url{https://release.gnome.org/48/, GNOME 48 release notes}
-@end itemize")
-         (de "Die GNOME-Desktopumgebung wurde von Version 46 auf 48
-aktualisiert. Neue Funktionen in dieser Version sind die Möglichkeit, eine
-Akzentfarbe zu wählen, Verbesserungen in der Dateien-Anwendung (Nautilus), ein
-neuer Bildbetrachter (Loupe), und mehr. Für eine ausführlichere Liste an
-Änderungen, siehe:
-
-@itemize
-@item @url{https://release.gnome.org/47/, GNOME 47 release notes}
-@item @url{https://release.gnome.org/48/, GNOME 48 release notes}
-@end itemize")))
-
- (entry (commit "d659fe8666c4bc38fcbdbe7b7a35101f2d7cc41b")
-        (title
-         (en "Potential security vulnerability in glibc")
-         (de "Mögliche Sicherheitslücke in glibc")
-         (pt "Potencial vulnerabilidade de segurança em glibc"))
-        (body
-         (en "Guix adds the environment variable @code{GUIX_LOCPATH} to glibc,
-however it was not added to potentially unsafe variables to be unset in
-privileged environments.  A CVE number is pending for this issue.  This has
-been fixed with a graft to glibc and users should update all profiles,
-reconfigure their system, and reboot.")
-         (de "Guix fügt die Umgebungsvariable @code{GUIX_LOCPATH} zu glibc
-hinzu, aber sie wurde nicht zu den möglicherweise unsicheren Variablen
-hinzugefügt, die in privilegierten Umgebungen zurückgesetzt werden.  Eine
-CVE-Nummer hierfür wird noch zugewiesen.  Um den Fehler zu beheben, stellen
-wir eine Veredelung für glibc bereit; Nutzerinnen und Nutzer sollten all ihre
-Profile aktualisieren, ihr System rekonfigurieren und neustarten.")
-         (pt "Guix adiciona a variável de ambiente @code{GUIX_LOCPATH} à
-glibc, todavia ela não foi adicionada às variáveis potencialmente inseguras
-a serem desabilitadas em ambientes privilegiados.  Este incidente está
-pendente de um identificador CVE.  Isto foi resolvido com um enxerto à glibc,
-e os usuários devem atualizar todos os seus perfis, reconfigurando seu
-sistema e reiniciando-o.")))
-
 (entry (commit "6d4cb99a15da7f4fd55f956c55f4f4aacfcc7742")
        (title
         (en "@code{%desktop-services} now includes GDM on AArch64")
@@ -14,7 +14,7 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@"
 ;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2025 Jelle Licht <jlicht@fsfe.org>
 ;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
-;;; Copyright © 2025-2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2025 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -285,25 +285,14 @@ PARAMETERS."

 ;; API documentation at <https://codeberg.org/api/swagger>.

-(define-forgejo-request (organization-teams/paginated organization page)
-  "Return the list of teams of ORGANIZATION, for the given PAGE (1-indexed)."
+(define-forgejo-request (organization-teams organization)
+  "Return the list of teams of ORGANIZATION."
  (GET "orgs" organization "teams"
-       & `(("page" . ,(number->string page))))
+       & '(("limit" . "100")))                    ;get up to 100 teams
  => 200
  (lambda (port)
    (map json->forgejo-team (vector->list (json->scm port)))))

-(define (organization-teams token organization)
-  "Return the list of teams of ORGANIZATION."
-  (let loop ((index 1)
-             (pages '()))
-    (match (organization-teams/paginated token organization index)
-      (()
-       (concatenate (reverse pages)))
-      (lst
-       (loop (+ 1 index)
-             (cons lst pages))))))
-
 (define-forgejo-request (create-team organization team)
  "Create TEAM, a Forgejo team, under ORGANIZATION."
  (POST "orgs" organization "teams")
@@ -474,7 +463,6 @@ already exists.  Lookup team IDs among CURRENT-TEAMS."
        #:description "Audio related packages."
        #:scope (list "gnu/packages/audio.scm"
                      "gnu/packages/fluidplug.scm"
-                      "gnu/packages/music.scm"
                      "gnu/packages/xiph.scm")))

 (define-team beam
@@ -501,22 +489,9 @@ of Rebar and Mix build systems and Hex.pm importer."
  (team 'bootstrap
        #:name "Bootstrap"
        #:description "Full-source bootstrap: stage0, Mes, Gash, etc."
-        #:scope (list "gnu/packages/bootstrap.scm"
-                      "gnu/packages/commencement.scm"
+        #:scope (list "gnu/packages/commencement.scm"
                      "gnu/packages/mes.scm")))

-(define-team build-tools
-  (team 'build-tools
-        #:name "Build tools team"
-        #:description "Build tools and parser generators."
-        #:scope (list "gnu/packages/assembly.scm"
-                      "gnu/packages/autogen.scm"
-                      "gnu/packages/autotools.scm"
-                      "gnu/packages/bison.scm"
-                      "gnu/packages/m4.scm"
-                      "gnu/packages/oyacc.scm"
-                      "gnu/packages/re2c.scm")))
-
 (define-team c++
  (team 'c++
        #:name "C/C++ team"
@@ -534,8 +509,7 @@ of Rebar and Mix build systems and Hex.pm importer."
  (team 'core
        #:name "Core / Tools / Internals"
        #:scope
-        (list "etc/teams.scm"
-              "guix/avahi.scm"
+        (list "guix/avahi.scm"
              "guix/base16.scm"
              "guix/base32.scm"
              "guix/base64.scm"
@@ -595,7 +569,6 @@ of Rebar and Mix build systems and Hex.pm importer."
              "guix/read-print.scm"
              "guix/records.scm"
              "guix/remote.scm"
-              "guix/remote-procedures.scm"
              "guix/repl.scm"
              "guix/search-paths.scm"
              "guix/self.scm"
@@ -709,7 +682,6 @@ GLib/GIO, GTK, GStreamer and Webkit."
                      "gnu/packages/gstreamer.scm"
                      "gnu/packages/gtk.scm"
                      "gnu/packages/gnome.scm"
-                      "gnu/packages/gnome-circle.scm"
                      "gnu/packages/gnome-xyz.scm"
                      "gnu/packages/webkit.scm"
                      "gnu/services/desktop.scm"
@@ -729,17 +701,6 @@ GLib/GIO, GTK, GStreamer and Webkit."
                      "guix/scripts/import/go.scm"
                      "tests/import/go.scm")))

-(define-team guile
-  (team 'guile
-        #:name "Guile team"
-        #:description
-        "Team for the Guile platform, libraries, and build system."
-        #:scope (list "gnu/packages/guile.scm"
-                      "gnu/packages/guile-wm.scm"
-                      "gnu/packages/guile-xyz.scm"
-                      "guix/build-system/guile.scm"
-                      "guix/build/guile-build-system.scm")))
-
 (define-team hare
  (team 'hare
        #:name "Hare"
@@ -784,8 +745,6 @@ the haskell-build-system."
                      "gnu/packages/opencl.scm"
                      "gnu/packages/parallel.scm"
                      "gnu/packages/rocm.scm"
-                      "gnu/packages/rocm-tools.scm"
-                      "gnu/packages/rocm-libs.scm"
                      "gnu/packages/sycl.scm"
                      "gnu/packages/tbb.scm"
                      "gnu/packages/vulkan.scm")))
@@ -812,20 +771,16 @@ the haskell-build-system."
        "The JDK and JRE, the Maven build system, Java packages, the ant-build-system,
 and the maven-build-system."
        #:scope
-        (list "gnu/packages/clojure.scm"
-              ;; Match java.scm and java-*.scm.
+        (list ;; Match java.scm and java-*.scm.
              (make-regexp* "^gnu/packages/java(-.+|)\\.scm$")
              ;; Match maven.scm and maven-*.scm
              (make-regexp* "^gnu/packages/maven(-.+|)\\.scm$")
              "guix/build/ant-build-system.scm"
-              "guix/build/clojure-build-system.scm"
-              "guix/build/clojure-utils.scm"
              "guix/build/java-utils.scm"
              "guix/build/maven-build-system.scm"
              ;; The maven directory
              (make-regexp* "^guix/build/maven/")
              "guix/build-system/ant.scm"
-              "guix/build-system/clojure.scm"
              "guix/build-system/maven.scm")))

 (define-team javascript
@@ -887,14 +842,6 @@ asdf-build-system."
                      "gnu/packages/fonts.scm"
                      "gnu/packages/ibus.scm")))

-(define-team lua
-  (team 'lua
-        #:name "Lua team"
-        #:description
-        "Lua, Fennel, and related packages."
-        #:scope (list "gnu/packages/lua.scm"
-                      "gnu/packages/luanti.scm")))
-
 (define-team lxqt
  (team 'lxqt
        #:name "LXQt team"
@@ -933,7 +880,6 @@ and Firefox."
 importer, and the ocaml-build-system."
        #:scope
        (list "gnu/packages/ocaml.scm"
-              "gnu/packages/ocaml5.scm"
              "gnu/packages/coq.scm"
              "guix/build/ocaml-build-system.scm"
              "guix/build/dune-build-system.scm"
@@ -943,21 +889,6 @@ importer, and the ocaml-build-system."
              "guix/scripts/import/opam.scm"
              "tests/import/opam.scm")))

-(define-team perl
-  (team 'perl
-        #:name "Perl and Raku team"
-        #:description
-        "Perl & Raku packages, the \"cpan\" importer, and the
-perl-build-system as well as the rakudo-build-system."
-        #:scope
-        (list (make-regexp* "^gnu/packages/perl(-.+|)\\.scm$")
-              "guix/build/perl-build-system.scm"
-              "guix/build/rakudo-build-system.scm"
-              "guix/build-system/perl.scm"
-              "guix/build-system/rakudo.scm"
-              "guix/import/cpan.scm"
-              "guix/scripts/import/cpan.scm")))
-
 (define-team python
  (team 'python
        #:name "Python team"
@@ -969,32 +900,13 @@ perl-build-system as well as the rakudo-build-system."
              (make-regexp* "^gnu/packages/python(-.+|)\\.scm$")
              "gnu/packages/sphinx.scm"
              "gnu/packages/tryton.scm"
-              "guix/build-system/pyproject.scm"
-              "guix/build-system/python.scm"
              "guix/build/pyproject-build-system.scm"
+              "guix/build-system/pyproject.scm"
              "guix/build/python-build-system.scm"
-              "guix/build/toml.scm" ;temporary, until other build system will use it
+              "guix/build-system/python.scm"
              "guix/import/pypi.scm"
              "guix/scripts/import/pypi.scm"
-              "tests/import/pypi.scm"
-              "tests/toml.scm")))
-
-(define-team qa-packages
-  (team 'qa-packages
-        #:name "Team for quality assurance packages"
-        #:description
-        "Quality assurance software (CI/CD, testing, analysis;
-no direct relation to Guix's QA)."
-        #:scope (list "gnu/ci.scm"
-                      "gnu/packages/benchmark.scm"
-                      "gnu/packages/check.scm"
-                      "gnu/packages/ci.scm"
-                      "gnu/packages/code.scm"
-                      "gnu/packages/debug.scm"
-                      "gnu/packages/dezyne.scm"
-                      "gnu/packages/libunwind.scm"
-                      "gnu/services/ci.scm"
-                      "gnu/tests/ci.scm")))
+              "tests/import/pypi.scm")))

 (define-team qt
  (team 'qt
@@ -1077,15 +989,12 @@ release."
        #:description
        "Secrets, passwords, cryptography and security related packages."
        #:scope (list (make-regexp* "^gnu/packages/(.*-|)crypto\\.scm$")
-                      "gnu/packages/cryptsetup.scm"
-                      "gnu/packages/cybersecurity.scm"
                      "gnu/packages/gnupg.scm"
                      "gnu/packages/nettle.scm"
                      "gnu/packages/password-utils.scm"
                      "gnu/packages/security-token.scm"
                      "gnu/packages/ssh.scm"
-                      "gnu/packages/tls.scm"
-                      "gnu/packages/vpn.scm")))
+                      "gnu/packages/tls.scm")))

 (define-team science
  (team 'science
@@ -1101,7 +1010,6 @@ packages (e.g. Astronomy, Chemistry, Math, Physics etc.)"
                      "gnu/packages/lean.scm"
                      "gnu/packages/maths.scm"
                      "gnu/packages/medical.scm"
-                      "gnu/packages/physics.scm"
                      "gnu/packages/sagemath.scm"
                      "gnu/packages/statistics.scm")))

@@ -1124,7 +1032,7 @@ packages (e.g. Astronomy, Chemistry, Math, Physics etc.)"
                      "gnu/packages/apparmor.scm"
                      "gnu/packages/authentication.scm"
                      "gnu/packages/cluster.scm"
-                      "gnu/packages/configuration-management.scm"
+                      "gnu/packages/configuration-management"
                      "gnu/packages/databases.scm"
                      "gnu/packages/distributed.scm"
                      "gnu/packages/dns.scm"
@@ -1143,26 +1051,7 @@ packages (e.g. Astronomy, Chemistry, Math, Physics etc.)"
                      "gnu/packages/task-runners.scm"
                      "gnu/packages/terraform.scm"
                      "gnu/packages/virtualization.scm"
-                      "gnu/packages/vnc.scm"
-                      "gnu/services/admin.scm"
-                      "gnu/services/authentication.scm"
-                      "gnu/services/databases.scm"
-                      "gnu/services/dns.scm"
-                      "gnu/services/high-availability.scm"
-                      "gnu/services/kerberos.scm"
-                      "gnu/services/monitoring.scm"
-                      "gnu/services/nfs.scm"
-                      "gnu/services/samba.scm"
-                      "gnu/services/virtualization.scm"
-                      "gnu/services/vnc.scm"
-                      "gnu/tests/databases.scm"
-                      "gnu/tests/dns.scm"
-                      "gnu/tests/high-availability.scm"
-                      "gnu/tests/monitoring.scm"
-                      "gnu/tests/nfs.scm"
-                      "gnu/tests/samba.scm"
-                      "gnu/tests/virtualization.scm"
-                      "gnu/tests/vnc.scm")))
+                      "gnu/packages/vnc.scm")))

 (define-team telephony
  (team 'telephony
@@ -1228,12 +1117,12 @@ the \"texlive\" importer."
                       "ludo@gnu.org"
                       "civodul")
  core core-packages hpc installer
-  guile)
+  mentors)

 (define-member (person "Andreas Enge"
                       "andreas@enge.fr"
                       "enge")
-  bootstrap c++ core-packages crypto lxqt science tex)
+  bootstrap core-packages crypto lxqt science tex)

 (define-member (person "Tanguy Le Carrour"
                       "tanguy@bioneland.org"
@@ -1293,7 +1182,7 @@ the \"texlive\" importer."
 (define-member (person "Liliana Marie Prikler"
                       "liliana.prikler@gmail.com"
                       "lilyp")
-  emacs games gnome qa-packages)
+  emacs games gnome)

 (define-member (person "Ricardo Wurmus"
                       "rekado@elephly.net"
@@ -1310,11 +1199,6 @@ the \"texlive\" importer."
                       "abcdw")
  home emacs)

-(define-member (person "Trevor Richards"
-                       "trev@trevdev.ca"
-                       "trevdev")
-  emacs lisp)
-
 (define-member (person "pukkamustard"
                       "pukkamustard@posteo.net"
                       "pukkamustard")
@@ -1338,7 +1222,7 @@ the \"texlive\" importer."
 (define-member (person "Vagrant Cascadian"
                       "vagrant@debian.org"
                       "vagrantc")
-  debian embedded kernel)
+  debian embedded)

 (define-member (person "Vagrant Cascadian"        ;XXX: duplicate
                       "vagrant@reproducible-builds.org"
@@ -1353,12 +1237,12 @@ the \"texlive\" importer."
 (define-member (person "Katherine Cox-Buday"
                       "cox.katherine.e+guix@gmail.com"
                       "katco")
-  emacs lisp)
+  emacs go lisp)

 (define-member (person "Munyoki Kilyungi"
                       "me@bonfacemunyoki.com"
                       "BonfaceKilz")
-  python guile)
+  python lisp)

 (define-member (person "Gabriel Wicki"
                       "gabriel@erlikon.ch"
@@ -1385,11 +1269,6 @@ the \"texlive\" importer."
                       "Hellseher")
  go julia python science sysadmin)

-(define-member (person "Arthur Rodrigues"
-                       "arthurhdrodrigues@proton.me"
-                       "arthurhdrodrigues")
-  go)
-
 (define-member (person "Mark H Weaver"
                       "mhw@netris.org"
                       "mhw")
@@ -1413,7 +1292,7 @@ the \"texlive\" importer."
 (define-member (person "Janneke Nieuwenhuizen"
                       "janneke@gnu.org"
                       "janneke")
-  bootstrap build-tools core-packages home hurd installer qa-packages)
+  bootstrap core-packages home hurd installer)

 (define-member (person "Ian Eure"
                       "ian@retrospec.tv"
@@ -1423,7 +1302,7 @@ the \"texlive\" importer."
 (define-member (person "Zheng Junjie"
                       "z572@z572.online"
                       "Z572")
-  core-packages)
+  core-packages qt kde)

 (define-member (person "Sughosha"
                       "sughosha@disroot.org"
@@ -1492,12 +1371,7 @@ the \"texlive\" importer."
 (define-member (person "Rodion Goritskov"
                       "rodion@goritskov.com"
                       "rodion-goritskov")
-  games java kde kernel release)
-
-(define-member (person "Jason Conroy"
-                       "jconroy@tscripta.net"
-                       "conroj")
-  ocaml)
+  release)

 (define-member (person "Rutherther"
                       "rutherther@ditigal.xyz"
@@ -1532,7 +1406,7 @@ the \"texlive\" importer."
 (define-member (person "Nguyễn Gia Phong"
                       "cnx@loang.net"
                       "cnx")
-  build-tools python qa-packages sysadmin)
+  python sysadmin)

 (define-member (person "Lilah Tascheter"
                       "lilah@lunabee.space"
@@ -1548,62 +1422,6 @@ the \"texlive\" importer."
                       "reza@housseini.me"
                       "rhou")
  python science c++)
-
-(define-member (person "Yunqi Shao"
-                       "me@yqshao.se"
-                       "yqshao")
-  sysadmin)
-
-(define-member (person "Collin Doering"
-                       "collin@rekahsoft.ca"
-                       "rekahsoft")
-  embedded electronics haskell sysadmin)
-
-(define-member (person "Mathieu Lirzin"
-                       "mthl@gnu.org"
-                       "mthl")
-  java)
-
-(define-member (person "Hugo Buddelmeijer"
-                       "hugo@buddelmeijer.nl"
-                       "hugobuddel")
-  python)
-
-(define-member (person "Yan Abu Arab"
-                       "yanabuarab@gmail.com"
-                       "tux1c")
-  python sysadmin)
-
-(define-member (person "Wilko Meyer"
-                       "w@wmeyer.eu"
-                       "theesm")
-  kernel perl)
-
-(define-member (person "Untrusem"
-                       "mysticmoksh@riseup.net"
-                       "untrusem")
-  mozilla)
-
-(define-member (person "David Thompson"
-                       "dthompson2@worcester.edu"
-                       "flockofbirbs")
-  guile)
-
-(define-member (person "Sergio Pastor Pérez"
-                       "sergio.pastorperez@gmail.com"
-                       "pastor")
-  guile hpc kde)
-
-(define-member (person "Carlo Zancanaro"
-                       "carlo@zancanaro.id.au"
-                       "czan")
-  lua ruby)
-
-(define-member (person "Folât Pjêrsômêj"
-                       "folaht@protonmail.com"
-                       "folaht")
-  documentation)
-

 (define (find-team name)
  (or (hash-ref %teams (string->symbol name))
@@ -73,9 +73,7 @@ C < ':'
 NL < '\n'")

 (define %names
-  '(("adwaita-fonts" . "font-adwaita")
-    ("pygobject" . "python-pygobject")
-    ("pyatspi" . "python-pyatspi")))
+  '(("adwaita-fonts" . "font-adwaita")))

 (define (parse-releng data)
  "Return the complete parse tree for DATA, a string representing the content of
@@ -1,34 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 jgart <jgart@dismail.de>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; This file returns a manifest of packages built using the go-build-system.
-;;; It is used to assist continuous integration of the go-team branch.
-
-(use-modules (guix packages)
-             (guix profiles)
-             (guix build-system))
-
-(manifest
- (map package->manifest-entry
-      (fold-packages
-       (lambda (package lst)
-         (if (or (eq? 'go (build-system-name (package-build-system package)))
-                 (string=? "go" (package-name package)))
-             (cons package lst)
-             lst))
-       '())))
@@ -1,36 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 jgart <jgart@dismail.de>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; This file returns a manifest of packages built using the perl-build-system.
-;;; It is used to assist continuous integration of the perl-team branch.
-
-(use-modules (guix packages)
-             (guix profiles)
-             (guix build-system))
-
-(manifest
- (map package->manifest-entry
-      (fold-packages
-       (lambda (package lst)
-         (if (or (eq? 'perl (build-system-name (package-build-system package)))
-                 (eq? 'rakudo (build-system-name (package-build-system package)))
-                 (string=? "perl" (package-name package))
-                 (string=? "rakudo" (package-name package)))
-             (cons package lst)
-             lst))
-       '())))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2024, 2026 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,9 +27,8 @@
  (map package->manifest-entry
       (fold-packages
         (lambda (package lst)
-           (if (and (eq? (build-system-name (package-build-system package))
-                         (quote cargo))
-                    (supported-package? package))
-               (cons package lst)
-               lst))
+           (if (eq? (build-system-name (package-build-system package))
+                    (quote cargo))
+             (cons package lst)
+             lst))
         (list))))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2024, 2026 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,9 +17,10 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 ;;; This file returns a manifest of packages built using the cargo-build-system
-;;; and the packages which use rust itself as an input.  This is a short list of
-;;; packages which can be checked to see if a rust update has gone smoothly.  It
-;;; is used to assist continuous integration of the rust-team branch.
+;;; which are NOT prefixed with 'rust-' and the packages which use rust itself
+;;; as an input.  This is a short list of packages which can be checked to see
+;;; if a rust update has gone smoothly.  It is used to assist continuous
+;;; integration of the rust-team branch.

 (use-modules (guix packages)
             (guix profiles)
@@ -30,15 +31,15 @@
  (map package->manifest-entry
       (fold-packages
         (lambda (package lst)
-           (if (and (supported-package? package)
-                    (or (eq? (build-system-name (package-build-system package))
-                             (quote cargo))
-                        (any
-                          (lambda (pkg)
-                            (member (specification->package "rust") pkg))
-                          (append (package-native-inputs package)
-                                  (package-propagated-inputs package)
-                                  (package-inputs package)))))
-               (cons package lst)
-               lst))
+           (if (or
+                 (eq? (build-system-name (package-build-system package))
+                      (quote cargo))
+                 (any
+                   (lambda (pkg)
+                     (member (specification->package "rust") pkg))
+                   (append (package-native-inputs package)
+                           (package-propagated-inputs package)
+                           (package-inputs package))))
+             (cons package lst)
+             lst))
         (list))))
@@ -1,37 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 jgart <jgart@dismail.de>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; This file returns a manifest of packages built using the texlive-build-system.
-;;; It is used to assist continuous integration of the tex-team branch.
-
-(use-modules (guix packages)
-             (guix profiles)
-             (guix build-system)
-             (gnu packages tex))
-
-(define %sundry-texlive-packages
-  (list bibtool
-        dvisvgm
-        rubber
-        texmaker
-        texstudio
-        lyx))
-
-(packages->manifest
-  (cons texlive-scheme-full
-        %sundry-texlive-packages))
@@ -0,0 +1,108 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu bootloader depthcharge)
+  #:use-module (gnu bootloader extlinux)
+  #:use-module (gnu bootloader)
+  #:use-module (gnu packages bootloaders)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
+  #:use-module (ice-9 match)
+  #:export (depthcharge-bootloader))
+
+(define (signed-kernel kernel kernel-arguments initrd)
+  (define builder
+    (with-imported-modules '((guix build utils))
+      #~(begin
+          (use-modules (guix build utils)
+                       (ice-9 binary-ports)
+                       (rnrs bytevectors))
+          (set-path-environment-variable "PATH" '("bin") (list #$dtc))
+
+          ;; TODO: These files have to be writable, so we copy them.
+          ;; This can probably be fixed by using a ".its" file, just
+          ;; be careful not to break initrd loading.
+          (copy-file #$kernel "zImage")
+          (chmod "zImage" #o755)
+          (copy-file (string-append (dirname #$kernel) "/lib/dtbs/"
+                                    "rk3288-veyron-speedy.dtb")
+                     "rk3288-veyron-speedy.dtb")
+          (chmod "rk3288-veyron-speedy.dtb" #o644)
+          (copy-file #$initrd "initrd")
+          (chmod "initrd" #o644)
+
+          (invoke (string-append #$u-boot-tools "/bin/mkimage")
+                  "-D" "-I dts -O dtb -p 2048"
+		  "-f" "auto"
+                  "-A" "arm"
+                  "-O" "linux"
+                  "-T" "kernel"
+                  "-C" "None"
+                  "-d" "zImage"
+                  "-a" "0"
+                  "-b" "rk3288-veyron-speedy.dtb"
+                  "-i" "initrd"
+	          "image.itb")
+          (call-with-output-file "bootloader.bin"
+            (lambda (port)
+              (put-bytevector port (make-bytevector 512 0))))
+          (with-output-to-file "kernel-arguments"
+	    (lambda ()
+	      (display (string-join (list #$@kernel-arguments)))))
+          (invoke (string-append #$vboot-utils "/bin/vbutil_kernel")
+                  "--pack" #$output
+                  "--version" "1"
+                  "--vmlinuz" "image.itb"
+		  "--arch" "arm"
+		  "--keyblock" (string-append #$vboot-utils
+                                              "/share/vboot-utils/devkeys/"
+                                              "kernel.keyblock")
+		  "--signprivate" (string-append #$vboot-utils
+                                                 "/share/vboot-utils/devkeys/"
+                                                 "kernel_data_key.vbprivk")
+                  "--config" "kernel-arguments"
+                  "--bootloader" "bootloader.bin"))))
+  (computed-file "vmlinux.kpart" builder))
+
+(define* (depthcharge-configuration-file config entries
+                                         #:key
+                                         (system (%current-system))
+                                         (old-entries '())
+                                         #:allow-other-keys)
+  (match entries
+    ((entry)
+     (let ((kernel (menu-entry-linux entry))
+           (kernel-arguments (menu-entry-linux-arguments entry))
+           (initrd (menu-entry-initrd entry)))
+       ;; XXX: Make this a symlink.
+       (signed-kernel kernel kernel-arguments initrd)))
+    (_ (error "Too many bootloader menu entries!"))))
+
+(define install-depthcharge
+  #~(lambda (bootloader device mount-point)
+      (let ((kpart (string-append mount-point
+                                  "/boot/depthcharge/vmlinux.kpart")))
+        (write-file-on-device kpart (stat:size (stat kpart)) device 0))))
+
+(define depthcharge-bootloader
+  (bootloader
+   (name 'depthcharge)
+   (package #f)
+   (installer install-depthcharge)
+   (configuration-file "/boot/depthcharge/vmlinux.kpart")
+   (configuration-file-generator depthcharge-configuration-file)))
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2019, 2020, 2023, 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
 ;;; Copyright © 2020 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
@@ -427,11 +427,8 @@ when booting a root file system on a Btrfs subvolume."
               (arguments (menu-entry-multiboot-arguments entry))
               ;; Choose between device names as understood by Mach's built-in
               ;; IDE driver ("hdX") and those understood by rumpdisk ("wdX"
-               ;; in the "noide" case).  There are no IDE drivers in Mach for
-               ;; hurd64, so always use rumpdisk there.
-               (rumpdisk? (or (target-hurd64?)
-                              (member "noide" arguments)))
-               (disk (if rumpdisk? "w" "h"))
+               ;; in the "noide" case).
+               (disk (if (member "noide" arguments) "w" "h"))
               (device-spec (and=> device file-system-device->string))
               (device-name (and=> device-spec device-spec->device-name))
               (modules (menu-entry-multiboot-modules entry)))
@@ -36,11 +36,11 @@
            u-boot-a20-olinuxino-lime2-bootloader
            u-boot-a20-olinuxino-micro-bootloader
            u-boot-bananapi-m2-ultra-bootloader
-            u-boot-am335x-evm-bootloader
            u-boot-beaglebone-black-bootloader
            u-boot-cubietruck-bootloader
            u-boot-firefly-rk3399-bootloader
            u-boot-mx6cuboxi-bootloader
+            u-boot-nintendo-nes-classic-edition-bootloader
            u-boot-novena-bootloader
            u-boot-orangepi-r1-plus-lts-rk3328-bootloader
            u-boot-orangepi-zero2w-bootloader
@@ -97,48 +97,6 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
      (if bootloader
        (error "Failed to install U-Boot"))))

-(define install-am335x-evm-u-boot
-  (write-u-boot-image
-   ;; According to the "26.1.8.5.5 MMC/SD Read Sector Procedure in Raw Mode"
-   ;; section in the "AM335x and AMIC110 Sitara™ Processors Technical
-   ;; Reference Manual", we have offset, the bootrom tries to load code at the
-   ;; offsets 0x0, 0x20000 (128KB), 0x40000 (256KB) and 0x60000 (384KB).
-   ;;
-   ;; The MBR is 512 Bytes
-   ;; (https://en.wikipedia.org/wiki/Master_boot_record#Sector_layout).
-   ;;
-   ;; At the time of writing, u-boot.img is 1.4 MiB, and it is at offset
-   ;; 0x60000 (384KB) as per CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR.
-   ;;
-   ;; We also need to align the first partition to make sure read/writes are
-   ;; properly aligned.
-   ;;
-   ;; Given these constraints, we chose the following partitioning:
-   ;;
-   ;; 0   512 Bytes    128 KiB
-   ;; |       |        (0x20000)   256 KiB
-   ;; |       |           /        (0x40000)       384 KiB            4 MiB
-   ;; |       |          /            |            (0x60000)           |
-   ;; |       |         /             |               |                |
-   ;; v       v        /              v               v                v
-   ;; +-------+        +--------------+---------------+----------------+
-   ;; |  MBR  |   ...  |  First MLO   |  Second MLO   |   u-boot.img   |
-   ;; +-------+        +--------------+---------------+----------------+
-   ;; <-512 B->   ...  <-- 128 KiB --> <-- 128 KiB --> <-- 3712 KiB -->
-   ;;
-   ;; The rationale for that is as follows:
-   ;;
-   ;; - We add a second copy of the MLO at 256 KiB for improving reliability
-   ;;   as the doc/board/ti/am335x_evm.rst documentation in u-boot advise us
-   ;;   to do that, and also because the space there isn't used.
-   ;;
-   ;; - All can fit into 2MiB (u-boot.img can grow up to 1664 KiB), but we
-   ;;   want a bit more space in case u-boot.img grows over time, so we allow
-   ;;   u-boot to grow until the 4 MiB offset.
-   '(("MLO" 256 256) ;; First MLO
-     ("MLO" 256 512) ;; Second MLO
-     ("u-boot.img" 7424 768)) 512))
-
 (define install-beaglebone-black-u-boot
  ;; http://wiki.beyondlogic.org/index.php?title=BeagleBoneBlack_Upgrading_uBoot
  ;; This first stage bootloader called MLO (U-Boot SPL) is expected at
@@ -200,33 +158,6 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
   (installer #f)
   (disk-image-installer install-u-boot)))

-(define u-boot-am335x-evm-bootloader
-  (bootloader
-   (inherit u-boot-bootloader)
-   ;; This bootloader supports the following computers:
-   ;; - SanCloud BeagleBone Enhanced
-   ;; - SanCloud BeagleBone Enhanced Extended WiFi
-   ;; - SanCloud BeagleBone Enhanced Lite
-   ;; - Seeed Studio BeagleBone Green Eco
-   ;; - TI AM3359 ICE-V2
-   ;; - TI AM335x BeagleBone
-   ;; - TI AM335x BeagleBone Black
-   ;; - TI AM335x BeagleBone Green
-   ;; - TI AM335x EVM
-   ;; - TI AM335x EVM-SK
-   ;; - TI AM335x PocketBeagle
-   ;;
-   ;; This list was made by retrieving the list of Devicetrees used in
-   ;; configs/am335x_evm_defconfig in u-boot source code. Once we have that we
-   ;; can look at each Devicetree in arch/arm/boot/dts/ti/omap/ inside Linux,
-   ;; and in each file, look at the model property to find the name of the
-   ;; computers that this image supports.
-   (package u-boot-am335x-evm)
-   ;; At the time of writing, our u-boot.img is 1.4 MiB. This is why we can't
-   ;; reuse install-beaglebone-black-u-boot. And having the same image being
-   ;; able to boot on multiple computers is useful.
-   (disk-image-installer install-am335x-evm-u-boot)))
-
 (define u-boot-beaglebone-black-bootloader
  (bootloader
   (inherit u-boot-bootloader)
@@ -254,6 +185,11 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
   (inherit u-boot-bootloader)
   (disk-image-installer install-rockchip-u-boot)))

+(define u-boot-nintendo-nes-classic-edition-bootloader
+  (bootloader
+    (inherit u-boot-allwinner-bootloader)
+    (package u-boot-nintendo-nes-classic-edition)))
+
 (define u-boot-a20-olinuxino-lime-bootloader
  (bootloader
   (inherit u-boot-allwinner-bootloader)
@@ -141,13 +141,12 @@ and bits are set according to the default behaviour of 'mkdir'."
                                 #:key
                                 (directory %skeleton-directory)
                                 uid gid)
-  "Copy the account skeletons from DIRECTORY to HOME and make them writable.
-When UID is an integer, make it the owner of all the files created except the
-home directory; likewise for GID."
-  (define (set-permission file)
+  "Copy the account skeletons from DIRECTORY to HOME.  When UID is an integer,
+make it the owner of all the files created except the home directory; likewise
+for GID."
+  (define (set-owner file)
    (when (or uid gid)
-      (chown file (or uid -1) (or gid -1)))
-    (make-file-writable file))
+      (chown file (or uid -1) (or gid -1))))

  (let ((files (scandir directory (negate dot-or-dot-dot?)
                        string<?)))
@@ -157,9 +156,10 @@ home directory; likewise for GID."
                  (copy-recursively (string-append directory "/" file)
                                    target
                                    #:log (%make-void-port "w"))
-                  (for-each set-permission
+                  (for-each set-owner
                            (find-files target (const #t)
-                                        #:directories? #t))))
+                                        #:directories? #t))
+                  (make-file-writable target)))
              files)))

 (define* (make-skeletons-writable home
@@ -37,7 +37,6 @@
  #:use-module (guix i18n)
  #:use-module (rnrs io ports)
  #:use-module (rnrs bytevectors)
-  #:use-module (ice-9 exceptions)
  #:use-module (ice-9 match)
  #:use-module (ice-9 rdelim)
  #:use-module (ice-9 regex)
@@ -46,8 +45,6 @@
  #:autoload   (system repl repl) (start-repl)
  #:use-module (srfi srfi-1)
  #:use-module (srfi srfi-26)
-  #:use-module (srfi srfi-34)
-  #:use-module (srfi srfi-35)
  #:export (disk-partitions
            partition-label-predicate
            partition-uuid-predicate
@@ -68,9 +65,6 @@

            cleanly-unmounted-ext2?

-            partition-lookup-error?
-            &partition-lookup-error
-
            bind-mount

            system*/tty
@@ -1188,10 +1182,6 @@ were found."
 (define find-partition-by-luks-uuid
  (find-partition luks-partition-uuid-predicate))

-(define-condition-type &partition-lookup-error &condition
-  partition-lookup-error?
-  (spec partition-lookup-error-spec))
-

 (define (canonicalize-device-spec spec)
  "Return the device name corresponding to SPEC, which can be a <uuid>, a
@@ -1211,25 +1201,22 @@ file name or an nfs-root containing ':/')."
            ;; Some devices take a bit of time to appear, most notably USB
            ;; storage devices.  Thus, wait for the device to appear.
            (if (> count max-trials)
-                (raise (condition
-                        (&partition-lookup-error
-                         (spec (fmt spec)))))
+                (error "failed to resolve partition" (fmt spec))
                (begin
                  (format #t "waiting for partition '~a' to appear...~%"
                          (fmt spec))
                  (sleep 1)
                  (loop (+ 1 count))))))))

-  (define (device-exists? device)
-    (and (file-exists? device)
-         device))
-
  (match spec
    ((? string?)
-     (if (string-prefix? "/dev/" spec)
+     (if (or (string-contains spec ":/") ;nfs
+             (and (>= (string-length spec) 2)
+                  (equal? (string-take spec 2) "//")) ;cifs
+             (string=? spec "none"))
+         spec                  ; do not resolve NFS / CIFS / tmpfs devices
         ;; Nothing to do, but wait until SPEC shows up.
-         (resolve device-exists? spec identity)
-         spec)) ; do not resolve NFS / CIFS / tmpfs devices
+         (resolve identity spec identity)))
    ((? file-system-label?)
     ;; Resolve the label.
     (resolve find-partition-by-label
@@ -1332,14 +1319,6 @@ corresponds to the symbols listed in FLAGS."
      (()
       0))))

-(define kind-and-args-exception?
-  (exception-predicate &exception-with-kind-and-args))
-
-(define (system-error? exception)
-  "Return true if EXCEPTION is a Guile 'system-error exception."
-  (and (kind-and-args-exception? exception)
-       (eq? 'system-error (exception-kind exception))))
-
 (define* (mount-file-system fs #:key (root "/root")
                            (check? (file-system-check? fs))
                            (skip-check-if-clean?
@@ -1360,8 +1339,8 @@ corresponds to the symbols listed in FLAGS."
           (host-part (string-take source idx))
           ;; Strip [] from around host if present
           (host (match (string-split host-part (string->char-set "[]"))
-                   (("" h "") h)
-                   ((h) h)))
+                 (("" h "") h)
+                 ((h) h)))
           (inet-addr (host-to-ip host "nfs")))
      ;; Mounting an NFS file system requires passing the address
      ;; of the server in the addr= option
@@ -1447,37 +1426,26 @@ corresponds to the symbols listed in FLAGS."
                                             "," 'prefix)
                                "")))))

-  (guard (c ((partition-lookup-error? c)
-             (format (current-error-port)
-                     "could not find the partition: ~a~%"
-                     (partition-lookup-error-spec c))
-             (unless (file-system-mount-may-fail? fs)
-               (raise c)))
-            ((system-error? c)
-             (format (current-error-port)
-                     "could not mount partition ~a: ~a~%"
-                     (file-system-device fs)
-                     (exception-message c))
-             (unless (file-system-mount-may-fail? fs)
-               (raise c))))
-      (let* ((type    (file-system-type fs))
-             (source  (canonicalize-device-spec (file-system-device fs)))
-             (target  (string-append root "/"
-                                     (file-system-mount-point fs)))
-             (flags   (logior (mount-flags->bit-mask (file-system-flags fs))
+  (let* ((type    (file-system-type fs))
+         (source  (canonicalize-device-spec (file-system-device fs)))
+         (target  (string-append root "/"
+                                 (file-system-mount-point fs)))
+         (flags   (logior (mount-flags->bit-mask (file-system-flags fs))

-                              ;; For bind mounts, preserve the original flags such
-                              ;; as MS_NOSUID, etc.  Failing to do that, the
-                              ;; MS_REMOUNT call below fails with EPERM.
-                              ;; See <https://bugs.gnu.org/46292>
-                              (if (memq 'bind-mount (file-system-flags fs))
-                                  (statfs-flags->mount-flags
-                                   (file-system-mount-flags (statfs source)))
-                                  0)))
-             (options (file-system-options fs)))
-        (when check?
-          (check-file-system source type (not skip-check-if-clean?) repair))
+                          ;; For bind mounts, preserve the original flags such
+                          ;; as MS_NOSUID, etc.  Failing to do that, the
+                          ;; MS_REMOUNT call below fails with EPERM.
+                          ;; See <https://bugs.gnu.org/46292>
+                          (if (memq 'bind-mount (file-system-flags fs))
+                              (statfs-flags->mount-flags
+                               (file-system-mount-flags (statfs source)))
+                              0)))
+         (options (file-system-options fs)))
+    (when check?
+      (check-file-system source type (not skip-check-if-clean?) repair))

+    (catch 'system-error
+      (lambda ()
        ;; Create the mount point.  Most of the time this is a directory, but
        ;; in the case of a bind mount, a regular file or socket may be
        ;; needed.
@@ -1506,7 +1474,10 @@ corresponds to the symbols listed in FLAGS."
        (when (and (= MS_BIND (logand flags MS_BIND))
                   (= MS_RDONLY (logand flags MS_RDONLY)))
          (let ((flags (logior MS_REMOUNT flags)))
-            (mount source target type flags options))))))
+            (mount source target type flags options))))
+      (lambda args
+        (or (file-system-mount-may-fail? fs)
+            (apply throw args))))))

 (define %device-name-regexp "/dev/[hsvw]d([abcd])([0-9]*)")
 (define %hurd-device-name-regexp "part:([0-9]*):device:[hw]d([0-9]*)")
@@ -107,8 +107,8 @@ QEMU monitor and to the guest's backdoor REPL."
  (define extra-options
    (list "-nographic"
          "-monitor" (string-append "unix:" socket-directory "/monitor")
-          "-chardev" (string-append "socket,id=repl,path="
-                                    socket-directory "/repl")
+          "-chardev" (string-append "socket,id=repl,path=" socket-directory
+                                    "/repl,reconnect=1")
          "-chardev" (string-append "socket,id=qga,server=on,wait=off,path="
                                    socket-directory "/qemu-ga")

@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2024, 2026 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2017, 2020, 2026 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2020, 2021 Mathieu Othacehe <othacehe@gnu.org>
@@ -232,18 +232,17 @@ SYSTEM."

 (define* (guix-jobs store systems #:key source commit)
  "Return a list of jobs for Guix itself."
-  (define instance
-    (checkout->channel-instance source
-                                #:url (channel-url %default-guix-channel)
-                                #:commit commit))
+  (define build
+    (primitive-load (string-append source "/build-aux/build-self.scm")))

  (map
   (lambda (system)
     (let ((name (string->symbol
                  (string-append "guix." system)))
           (drv (run-with-store store
-                  (channel-instances->derivation (list instance)
-                                                 #:system system))))
+                  (build source #:version commit #:system system
+                         #:pull-version 1
+                         #:guile-version "2.2"))))
       (derivation->job name drv)))
   systems))

@@ -255,7 +254,6 @@ SYSTEM."

 (define %guix-system-images
  (list hurd-barebones-qcow2-image
-        hurd64-barebones-qcow2-image
        pine64-barebones-raw-image
        pinebook-pro-barebones-raw-image
        novena-barebones-raw-image
@@ -3,7 +3,6 @@
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2022-2023, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2023 Carlo Zancanaro <carlo@zancanaro.id.au>
-;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -52,7 +51,6 @@
            home-activation-service-type
            home-run-on-change-service-type
            home-provenance-service-type
-            home-gc-root-service-type

            literal-string
            literal-string?
@@ -759,16 +757,6 @@ environment, and its configuration file, when available.")))
 (define sexp->home-provenance sexp->system-provenance)
 (define home-provenance system-provenance)

-
-;;;
-;;; Garbage collector roots.
-;;;
-
-(define home-gc-root-service-type
-  (service-type
-    (inherit (system->home-service-type gc-root-service-type))
-    (default-value '())))
-

 ;;;
 ;;; Searching
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2024 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2024, 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
+;;; Copyright © 2024 Giacomo Leidi <therewasa@fishinthecalculator.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,9 +45,7 @@
 (define %home-dotfiles-excluded
  '(".*~"
    ".*\\.swp"
-    ;; This first / is safe until regexp-exec in directory-contents
-    ;; is passed an absolute file name.
-    "/\\.git/.*"
+    "\\.git"
    "\\.gitignore"))

 (define %home-dotfiles-layouts
@@ -62,7 +60,10 @@
 or 'stow, but ~a was found.")
        value))))

-(define-maybe/no-serialization list-of-strings)
+(define list-of-strings?
+  (list-of string?))
+
+(define-maybe list-of-strings)

 (define-configuration/no-serialization home-dotfiles-configuration
  (source-directory
@@ -137,7 +138,8 @@ value, excluding files that match any of the patterns configured."
    (define (filter-files directory)
      (find-files directory
                  (lambda (file stat)
-                    (not (regexp-exec exclusion-rx file)))))
+                    (not (regexp-exec exclusion-rx
+                                      (basename file))))))
    (if (and stow? packages (maybe-value-set? packages))
        (append-map filter-files
                    (map (lambda (pkg)
@@ -95,10 +95,6 @@ PulseAudio clients to use PipeWire transparently.")
             (list (home-pipewire-pulseaudio-shepherd-service config))
             '())))

-(define (home-pipewire-profile-service config)
-  (list (home-pipewire-configuration-pipewire config)
-        (home-pipewire-configuration-wireplumber config)))
-
 (define (home-pipewire-asoundrc config)
  (match-record config <home-pipewire-configuration>
                (pipewire extra-content)
@@ -130,8 +126,6 @@ PulseAudio clients to use PipeWire transparently.")
   (extensions
    (list (service-extension home-shepherd-service-type
                             home-pipewire-shepherd-services)
-          (service-extension home-profile-service-type
-                             home-pipewire-profile-service)
          (service-extension home-xdg-configuration-files-service-type
                             home-pipewire-xdg-configuration)))
   (description
@@ -3,7 +3,6 @@
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2026 Oleg Pykhalov <go.wigust@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -312,8 +311,6 @@ through before connecting to the server.")
                     (default #f))
  (known-hosts       home-openssh-configuration-known-hosts ;unspec | list of file-like
                     (default *unspecified*))
-  (known-hosts2      home-openssh-configuration-known-hosts2 ;unspec | list of file-like
-                     (default *unspecified*))
  (hosts             home-openssh-configuration-hosts   ;list of <openssh-host>
                     (default '()))
  (add-keys-to-agent home-openssh-configuration-add-keys-to-agent ;string with limited values
@@ -379,7 +376,6 @@ inserted after each of them."
  (let* ((ssh-config (plain-file "ssh.conf"
                                 (openssh-configuration->string config)))
         (known-hosts (home-openssh-configuration-known-hosts config))
-         (known-hosts2 (home-openssh-configuration-known-hosts2 config))
         (authorized-keys (home-openssh-configuration-authorized-keys config))
         (authorized-keys (and
                           authorized-keys
@@ -391,10 +387,6 @@ inserted after each of them."
            '()
            `((".ssh/known_hosts"
               ,(file-join "known_hosts" known-hosts "\n"))))
-      ,@(if (unspecified? known-hosts2)
-            '()
-            `((".ssh/known_hosts2"
-               ,(file-join "known_hosts2" known-hosts2 "\n"))))
      (".ssh/config" ,ssh-config))))

 (define openssh-activation
@@ -102,6 +102,17 @@
            ;; Convenient value to inherit for extensions.
            %empty-sway-configuration))

+;; Helper function.
+(define (flatmap f l)
+  (let loop ((lst (reverse l)) (acc '()))
+    (match lst
+      (() acc)
+      ((head . tail)
+       (let* ((h (f head))
+              (acc (append h acc)))
+         (loop tail acc))))))
+
+
 ;;;
 ;;; Definition of configurations.
 ;;;
@@ -882,13 +893,13 @@

               ;; Outputs.
               #$@(with-heading "Outputs."
-                                (append-map serialize-output
-                                            (sway-configuration-outputs conf)))
+                                (flatmap serialize-output
+                                         (sway-configuration-outputs conf)))

               ;; Inputs.
               #$@(with-heading "Inputs."
-                                (append-map serialize-input
-                                            (sway-configuration-inputs conf)))
+                                (flatmap serialize-input
+                                         (sway-configuration-inputs conf)))

               ;; Bar configuration:
               ;; If the bar is unset, do not include anything.
@@ -908,8 +919,8 @@

               ;; Modes.
               #$@(with-heading "Modes."
-                                (append-map serialize-mode
-                                            (sway-configuration-modes conf)))
+                                (flatmap serialize-mode
+                                         (sway-configuration-modes conf)))

               ;; Startup-Programs.
               #$@(with-heading
@@ -103,21 +103,10 @@ subdirectory from XDG_CONFIG_HOME to generate a target path."
           (define backup
             (string-append backup-directory "/" (preprocess-file file)))

-           (define (copy-file* oldfile newfile)
-             "Like 'copy-file', but also copies dangling symlinks."
-             (catch 'system-error
-               (lambda ()
-                 (copy-file oldfile newfile))
-               (lambda args
-                 (if (and (eq? 'symlink (stat:type (lstat oldfile)))
-                          (= ENOENT (system-error-errno args)))
-                     (symlink (readlink oldfile) newfile)
-                     (apply throw args)))))
-
           (mkdir-p backup-directory)
           (format #t (G_ "Backing up ~a...") (target-file file))
           (mkdir-p (dirname backup))
-           (copy-file* (target-file file) backup)
+           (copy-file (target-file file) backup)
           (delete-file (target-file file))
           (display (G_ " done\n")))

@@ -108,11 +108,10 @@ like sockets.")
@file{/var/log}, but for user.  It is not a part of XDG Base Directory
 Specification, but helps to make implementation of home services more
 consistent."
-   (serializer
-    (lambda (field-name val)
-      (when (maybe-value-set? val)
-        (warn-about-deprecation field-name #f #:replacement 'state-home))
-      (serialize-path field-name val))))
+   (lambda (field-name val)
+     (when (maybe-value-set? val)
+       (warn-about-deprecation field-name #f #:replacement 'state-home))
+     (serialize-path field-name val)))
  (state-home
   (path "$HOME/.local/state")
   "Base directory for programs to store state data that should persist
@@ -233,12 +233,11 @@ force a wifi scan."
        (lambda ()
          (when (eq? exit-reason 'exit-component)
            (cond
-             ((components=? argument exit-button)
-              (abort-to-prompt 'installer-step 'abort))
-             ((or (components=? argument scan-button)
-                  (null? service-items))
+             ((components=? argument scan-button)
              (run-wifi-scan-page)
              (run-wifi-page))
+             ((components=? argument exit-button)
+              (abort-to-prompt 'installer-step 'abort))
             ((components=? argument listbox)
              (let ((result (connect-wifi-service listbox service-items)))
                (unless result
@@ -243,33 +243,44 @@
 ;; under their own account: use 'guix search KEYWORD' to search
 ;; for packages and 'guix install PACKAGE' to install a package.\n")))))

-    `(,@(if (null? packages)
-            (if (target-hurd?)
+    (if (null? snippets)
+        `(,@(if (null? packages)
+                (if (target-hurd?)
+                    `(,@package-heading
+                      (packages %base-packages/hurd))
+                    '())
                `(,@package-heading
-                  (packages %base-packages/hurd))
-                '())
-            `(,@package-heading
-              (packages (append (list ,@packages)
-                                ,(if (target-hurd?)
-                                     '%base-packages/hurd
-                                     '%base-packages)))))
+                  (packages (append (list ,@packages)
+                                    ,(if (target-hurd?)
+                                         '%base-packages/hurd
+                                         '%base-packages)))))

-      ,@service-heading
-      ,(if (and (null? snippets)
-                (not desktop?))
-           `(services ,services)
-           `(services
-             (append (list ,@snippets
+          ,@service-heading
+          (services ,services))
+        `(,@(if (null? packages)
+                (if (target-hurd?)
+                    `(,@package-heading
+                      (packages %base-packages/hurd))
+                    '())
+                `(,@package-heading
+                  (packages (append (list ,@packages)
+                                    ,(if (target-hurd?)
+                                         '%base-packages/hurd
+                                         '%base-packages)))))

-                           ,@(if desktop?
-                                 ;; XXX: Assume 'keyboard-layout' is in scope.
-                                 `((set-xorg-configuration
-                                    (xorg-configuration
-                                      (keyboard-layout keyboard-layout))))
-                                 '()))
+          ,@service-heading
+          (services (append (list ,@snippets

-                     ,(vertical-space 1)
-                     ,(comment (G_ "\
+                                  ,@(if desktop?
+                                        ;; XXX: Assume 'keyboard-layout' is in
+                                        ;; scope.
+                                        `((set-xorg-configuration
+                                           (xorg-configuration
+                                            (keyboard-layout keyboard-layout))))
+                                        '()))
+
+                            ,(vertical-space 1)
+                            ,(comment (G_ "\
 ;; This is the default list of services we
 ;; are appending to.\n"))
-                     ,services))))))
+                            ,services))))))
@@ -7,7 +7,7 @@
 # Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
 # Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
-# Copyright © 2016-2026 Ricardo Wurmus <rekado@elephly.net>
+# Copyright © 2016-2025 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 # Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
 # Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il>
@@ -35,7 +35,7 @@
 # Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 # Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
 # Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
-# Copyright © 2020, 2023, 2025, 2026 Tanguy Le Carrour <tanguy@bioneland.org>
+# Copyright © 2020, 2023, 2025 Tanguy Le Carrour <tanguy@bioneland.org>
 # Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 # Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
 # Copyright © 2020, 2023 Vinicius Monego <monego@posteo.net>
@@ -55,7 +55,7 @@
 # Copyright © 2022 Hilton Chain <hako@ultrarare.space>
 # Copyright © 2022 Alex Griffin <a@ajgrf.com>
 # Copyright © 2022 ( <paren@disroot.org>
-# Copyright © 2022, 2026 jgart <jgart@dismail.de>
+# Copyright © 2022 jgart <jgart@dismail.de>
 # Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
 # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
 # Copyright © 2023 Andy Tai <atai@atai.org>
@@ -64,10 +64,9 @@
 # Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
 # Copyright © 2023 Herman Rimm <herman@rimm.ee>
 # Copyright © 2023 Troy Figiel <troy@troyfigiel.com>
-# Copyright © 2024-2026 David Elsing <david.elsing@posteo.net>
+# Copyright © 2024, 2025 David Elsing <david.elsing@posteo.net>
 # Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
 # Copyright © 2024 Fabio Natali <me@fabionatali.com>
-# Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 # Copyright © 2024 Noé Lopez <noelopez@free.fr>
 # Copyright © 2024 Runciter <runciter@whispers-vpn.org>
 # Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
@@ -75,7 +74,6 @@
 # Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 # Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 # Copyright © 2025 bdunahu <bdunahu@operationnull.com>
-# Copyright © 2025 Jason Conroy <jconroy@tscripta.net>
 #
 # This file is part of GNU Guix.
 #
@@ -102,6 +100,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/bootloader/grub.scm                       \
  %D%/bootloader/extlinux.scm                   \
  %D%/bootloader/u-boot.scm                     \
+  %D%/bootloader/depthcharge.scm                \
  %D%/ci.scm					\
  %D%/compression.scm				\
  %D%/home.scm					\
@@ -156,7 +155,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/appimage.scm			\
  %D%/packages/apr.scm				\
  %D%/packages/arcan.scm			\
-  %D%/packages/array-languages.scm		\
  %D%/packages/aspell.scm			\
  %D%/packages/assembly.scm			\
  %D%/packages/astronomy.scm			\
@@ -209,8 +207,8 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/commencement.scm			\
  %D%/packages/compression.scm			\
  %D%/packages/compton.scm 			\
-  %D%/packages/computer-architecture.scm	\
  %D%/packages/configuration-management.scm	\
+  %D%/packages/conky.scm			\
  %D%/packages/connman.scm			\
  %D%/packages/containers.scm			\
  %D%/packages/convmv.scm			\
@@ -323,7 +321,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/gl.scm				\
  %D%/packages/glib.scm				\
  %D%/packages/gnome.scm			\
-  %D%/packages/gnome-circle.scm			\
  %D%/packages/gnome-xyz.scm			\
  %D%/packages/gnu-doc.scm			\
  %D%/packages/gnucash.scm			\
@@ -519,7 +516,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/nvi.scm				\
  %D%/packages/nx.scm				\
  %D%/packages/ocaml.scm			\
-  %D%/packages/ocaml5.scm			\
  %D%/packages/ocr.scm				\
  %D%/packages/openkinect.scm			\
  %D%/packages/onc-rpc.scm			\
@@ -553,12 +549,10 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/phabricator.scm 			\
  %D%/packages/php.scm				\
  %D%/packages/php-xyz.scm			\
-  %D%/packages/physics.scm			\
  %D%/packages/piet.scm			\
  %D%/packages/diagram.scm			\
  %D%/packages/pkg-config.scm			\
  %D%/packages/plan9.scm			\
-  %D%/packages/playwright.scm		\
  %D%/packages/plotutils.scm			\
  %D%/packages/poedit.scm				\
  %D%/packages/polkit.scm			\
@@ -606,8 +600,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/regex.scm				\
  %D%/packages/robotics.scm			\
  %D%/packages/rocm.scm				\
-  %D%/packages/rocm-libs.scm			\
-  %D%/packages/rocm-tools.scm			\
  %D%/packages/rpc.scm				\
  %D%/packages/rpm.scm				\
  %D%/packages/rrdtool.scm			\
@@ -742,7 +734,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/services/cuirass.scm			\
  %D%/services/cups.scm				\
  %D%/services/databases.scm			\
-  %D%/services/dav.scm				\
  %D%/services/dbus.scm				\
  %D%/services/desktop.scm			\
  %D%/services/dict.scm				\
@@ -814,7 +805,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/system/vm.scm				\
 						\
  %D%/system/images/a20-olinuxino-lime2.scm			\
-  %D%/system/images/am335x-evm.scm		\
  %D%/system/images/hurd.scm			\
  %D%/system/images/novena.scm			\
  %D%/system/images/orangepi-r1-plus-lts-rk3328.scm	\
@@ -874,7 +864,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/tests/install.scm				\
  %D%/tests/ldap.scm				\
  %D%/tests/lightdm.scm			\
-  %D%/tests/linux.scm				\
  %D%/tests/linux-modules.scm			\
  %D%/tests/mail.scm				\
  %D%/tests/mcron.scm				\
@@ -982,6 +971,10 @@ dist_patch_DATA =						\
  %D%/packages/patches/adb-add-libraries.patch			\
  %D%/packages/patches/adb-libssl_11-compatibility.patch	\
  %D%/packages/patches/accountsservice-extensions.patch		\
+  %D%/packages/patches/aegisub-icu59-include-unistr.patch	\
+  %D%/packages/patches/aegisub-boost68.patch			\
+  %D%/packages/patches/aegisub-boost81.patch			\
+  %D%/packages/patches/aegisub-make43.patch			\
  %D%/packages/patches/agda-categories-remove-incompatible-flags.patch	\
  %D%/packages/patches/agda-categories-use-find.patch	\
  %D%/packages/patches/agda-categories-use-newer-stdlib.patch	\
@@ -1006,7 +999,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/aria2-unbundle-wslay.patch		\
  %D%/packages/patches/ark-skip-xar-test.patch			\
  %D%/packages/patches/asli-use-system-libs.patch		\
+  %D%/packages/patches/aspell-CVE-2019-25051.patch		\
  %D%/packages/patches/aspell-default-dict-dir.patch		\
+  %D%/packages/patches/atf-execute-with-shell.patch		\
  %D%/packages/patches/ath9k-htc-firmware-binutils.patch	\
  %D%/packages/patches/ath9k-htc-firmware-gcc.patch		\
  %D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch	\
@@ -1044,7 +1039,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/biboumi-cmake-ignore-git.patch		\
  %D%/packages/patches/brasero-fix-gcc-14-build-failure.patch	\
  %D%/packages/patches/brightnessctl-elogind-support.patch	\
-  %D%/packages/patches/bristol-c99.patch			\
  %D%/packages/patches/bsd-games-2.17-64bit.patch		\
  %D%/packages/patches/bsd-games-add-configure-config.patch	\
  %D%/packages/patches/bsd-games-add-wrapper.patch		\
@@ -1060,7 +1054,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/beignet-correct-file-names.patch		\
  %D%/packages/patches/bidiv-update-fribidi.patch		\
  %D%/packages/patches/binutils-boot-2.20.1a.patch		\
-  %D%/packages/patches/binutils-cross-windres.patch		\
  %D%/packages/patches/binutils-loongson-workaround.patch	\
  %D%/packages/patches/binutils-mingw-w64-deterministic.patch	\
  %D%/packages/patches/binutils-2.41-fix-cross.patch		\
@@ -1080,10 +1073,10 @@ dist_patch_DATA =						\
  %D%/packages/patches/calibre-remove-test-unrar.patch		\
  %D%/packages/patches/calibre-remove-test-import-modules.patch	\
  %D%/packages/patches/calligra-qt-6.9.patch                    \
+  %D%/packages/patches/calls-disable-application-test.patch	\
  %D%/packages/patches/calls-disable-sip-test.patch		\
  %D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch	\
  %D%/packages/patches/capstone-fix-python-constants.patch	\
-  %D%/packages/patches/cartridges-fix-non-parallel-build.patch	\
  %D%/packages/patches/catdoc-CVE-2017-11110.patch		\
  %D%/packages/patches/chez-irregex-import-cond-expand.patch	\
  %D%/packages/patches/chez-scheme-bin-sh.patch			\
@@ -1094,7 +1087,6 @@ dist_patch_DATA =						\
  %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			\
  %D%/packages/patches/cl-asdf-config-directories.patch		\
  %D%/packages/patches/clamav-config-llvm-libs.patch		\
  %D%/packages/patches/clamav-system-tomsfastmath.patch		\
@@ -1111,7 +1103,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/clang-17.0-link-dsymutil-latomic.patch	\
  %D%/packages/patches/clang-17.0-fix-build-with-gcc-14-on-arm.patch    \
  %D%/packages/patches/clang-18.0-libc-search-path.patch	\
-  %D%/packages/patches/clang-rocm-default-new-dtags.patch	\
  %D%/packages/patches/clang-runtime-esan-build-fixes.patch	\
  %D%/packages/patches/clang-runtime-12-remove-crypt-interceptors.patch \
  %D%/packages/patches/clang-runtime-13-glibc-2.36-compat.patch	\
@@ -1125,19 +1116,13 @@ dist_patch_DATA =						\
  %D%/packages/patches/clucene-gcc-14.patch			\
  %D%/packages/patches/clucene-pkgconfig.patch			\
  %D%/packages/patches/coda-use-system-libs.patch		\
-  %D%/packages/patches/codex-acp-0.9.2-remove-patch-sections.patch \
-  %D%/packages/patches/codex-acp-0.9.2-replace-result-flatten.patch    \
-  %D%/packages/patches/codex-0.98.0-remove-patch-sections.patch    \
  %D%/packages/patches/cogl-fix-double-free.patch		\
  %D%/packages/patches/collada-dom-boost.patch			\
  %D%/packages/patches/collectd-5.11.0-noinstallvar.patch	\
  %D%/packages/patches/collectd-5.11.0-python-3.11.patch	\
  %D%/packages/patches/combinatorial-blas-awpm.patch		\
  %D%/packages/patches/combinatorial-blas-io-fix.patch		\
-  %D%/packages/patches/composable-kernel-conditional-kernels.patch \
  %D%/packages/patches/compsize-fix-btrfs-progs-compatibility.patch	\
-  %D%/packages/patches/conda-fix-cross-platform-export-tests.patch	\
-  %D%/packages/patches/conda-fix-plugin-settings-test.patch	\
  %D%/packages/patches/containerd-create-pid-file.patch	\
  %D%/packages/patches/containerd-fix-includes.patch            \
  %D%/packages/patches/cool-retro-term-wctype.patch		\
@@ -1220,7 +1205,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/dvdbackup-with-libdvdread-6.1.0+.patch	\
  %D%/packages/patches/dvd+rw-tools-add-include.patch 		\
  %D%/packages/patches/dwarves-threading-reproducibility.patch	\
-  %D%/packages/patches/efitools-riscv64-support.patch		\
  %D%/packages/patches/efivar-fix-fprint-format.patch		\
  %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch	\
  %D%/packages/patches/einstein-build.patch			\
@@ -1251,7 +1235,10 @@ dist_patch_DATA =						\
  %D%/packages/patches/emacs-next-exec-path.patch   \
  %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch   \
  %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
+  %D%/packages/patches/emacs-pgtk-super-key-fix.patch	\
  %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch  \
+  %D%/packages/patches/emacs-shx-byte-compilation-test.patch	\
+  %D%/packages/patches/emacs-telega-path-placeholder.patch	\
  %D%/packages/patches/emacs-telega-test-env.patch		\
  %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch	\
  %D%/packages/patches/emacs-zoom-image-test-fix.patch	\
@@ -1344,7 +1331,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/freesolid-autotools.patch		\
  %D%/packages/patches/freesolid-configure.patch		\
  %D%/packages/patches/freesolid-pkgconfig.patch		\
-  %D%/packages/patches/ftgl-ftcontour-type.patch		\
  %D%/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch	\
  %D%/packages/patches/fuse-glibc-2.34.patch			\
  %D%/packages/patches/fuse-overlapping-headers.patch		\
@@ -1369,10 +1355,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/gcc-asan-missing-include.patch		\
  %D%/packages/patches/gcc-boot-2.95.3.patch			\
  %D%/packages/patches/gcc-boot-4.6.4.patch			\
+  %D%/packages/patches/gcc-boot-4.6.4-riscv64-support.patch	\
+  %D%/packages/patches/gcc-boot-4.6.4-riscv64-libstdc++-support.patch	\
  %D%/packages/patches/gcc-cross-environment-variables.patch	\
  %D%/packages/patches/gcc-cross-gxx-include-dir.patch          \
  %D%/packages/patches/gcc-fix-texi2pod.patch			\
-  %D%/packages/patches/gcc-hurd-split-stack.patch 		\
  %D%/packages/patches/gcc-libstdc++-newer-gcc.patch		\
  %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch		\
  %D%/packages/patches/gcc-4.9-inline.patch		\
@@ -1388,6 +1375,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/gcc-libvtv-runpath.patch			\
  %D%/packages/patches/gcc-strmov-store-file-names.patch	\
  %D%/packages/patches/gcc-4-compile-with-gcc-5.patch		 \
+  %D%/packages/patches/gcc-4.6-gnu-inline.patch			\
  %D%/packages/patches/gcc-4.9.3-mingw-gthr-default.patch	\
  %D%/packages/patches/gcc-5-hurd.patch				\
  %D%/packages/patches/gcc-5.0-libvtv-runpath.patch		\
@@ -1483,7 +1471,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/glibc-cross-objcopy.patch		\
  %D%/packages/patches/glibc-cross-objdump.patch		\
  %D%/packages/patches/glibc-dl-cache.patch			\
-  %D%/packages/patches/glibc-guix-locpath.patch			\
  %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch	\
  %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch	\
  %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch	\
@@ -1512,17 +1499,22 @@ dist_patch_DATA =						\
  %D%/packages/patches/gnome-control-center-firmware-security.patch	\
  %D%/packages/patches/gnome-control-center-libexecdir.patch	\
  %D%/packages/patches/gnome-dictionary-meson-i18n.patch	\
-  %D%/packages/patches/gnome-recipes-rest-in-soup.patch	\
+  %D%/packages/patches/gnome-online-miners-tracker-3.patch	\
  %D%/packages/patches/gnome-settings-daemon-gc.patch		\
+  %D%/packages/patches/gnome-settings-daemon-screensaver-error.patch	\
  %D%/packages/patches/gnome-session-support-elogind.patch	\
  %D%/packages/patches/gnome-tweaks-search-paths.patch		\
  %D%/packages/patches/gnulib-bootstrap.patch			\
+  %D%/packages/patches/gnumach-div0.patch			\
+  %D%/packages/patches/gnumach-kmsg-overflow.patch		\
  %D%/packages/patches/gnumach-version.patch			\
  %D%/packages/patches/gnupg-default-pinentry.patch		\
  %D%/packages/patches/gnupg-1-build-with-gcc10.patch		\
-  %D%/packages/patches/gnutls-no-which.patch			\
+  %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
  %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
+  %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \
  %D%/packages/patches/gobject-introspection-cc.patch		\
+  %D%/packages/patches/gobject-introspection-cc-1.72.patch	\
  %D%/packages/patches/gobject-introspection-girepository.patch	\
  %D%/packages/patches/go-fix-script-tests.patch			\
  %D%/packages/patches/go-gopkg-in-yaml-v3-32bit.patch		\
@@ -1532,7 +1524,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch \
  %D%/packages/patches/go-github-com-wraparound-wrap-free-fonts.patch \
  %D%/packages/patches/go-skip-gc-test.patch			\
-  %D%/packages/patches/godot-glslang.patch			\
+  %D%/packages/patches/godot-libjpeg-turbo-unbundle.patch	\
  %D%/packages/patches/gourmet-sqlalchemy-compat.patch		\
  %D%/packages/patches/gpaste-fix-paths.patch			\
  %D%/packages/patches/gpm-glibc-2.26.patch			\
@@ -1543,6 +1535,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/grfcodec-gcc-compat.patch		\
  %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch	\
  %D%/packages/patches/grub-efi-fat-serial-number.patch		\
+  %D%/packages/patches/grub-hurd64.patch			\
  %D%/packages/patches/grub-setup-root.patch			\
  %D%/packages/patches/guile-1.8-cpp-4.5.patch			\
  %D%/packages/patches/guile-2.2-skip-oom-test.patch            \
@@ -1582,10 +1575,10 @@ dist_patch_DATA =						\
  %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 \
-  %D%/packages/patches/gst-plugins-base-null-pointer.patch      \
  %D%/packages/patches/gzdoom-search-in-installed-share.patch	\
  %D%/packages/patches/gzdoom-find-system-libgme.patch	\
  %D%/packages/patches/hare-fallback-cache.patch 		\
+  %D%/packages/patches/hare-toolpath.patch 		\
  %D%/packages/patches/hdf4-reproducibility.patch 		\
  %D%/packages/patches/hdf4-shared-fortran.patch 		\
  %D%/packages/patches/hdf5-config-date.patch			\
@@ -1600,7 +1593,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/heimdal-CVE-2022-45142.patch		\
  %D%/packages/patches/helm-fix-gcc-9-build.patch		\
  %D%/packages/patches/highlight-gui-data-dir.patch		\
-  %D%/packages/patches/hipblaslt-python-nanobind.patch		\
  %D%/packages/patches/hplip-usb-timeout.patch			\
  %D%/packages/patches/http-parser-CVE-2020-8287.patch		\
  %D%/packages/patches/hubbub-sort-entities.patch		\
@@ -1609,6 +1601,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/hurd-refcounts-assert.patch		\
  %D%/packages/patches/hurd-rumpdisk-no-hd.patch		\
  %D%/packages/patches/hurd-startup.patch			\
+  %D%/packages/patches/hurd-streamio-select.patch		\
+  %D%/packages/patches/hurd-proc-zombies.patch			\
  %D%/packages/patches/hwloc-1-test-btrfs.patch			\
  %D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch	\
  %D%/packages/patches/i7z-gcc-10.patch				\
@@ -1655,7 +1649,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/irrlicht-link-against-needed-libs.patch	\
  %D%/packages/patches/isl-0.11.1-aarch64-support.patch		\
  %D%/packages/patches/ispell-for-linphone-cmake.patch		\
+  %D%/packages/patches/jami-allow-system-zxing-cpp.patch        \
  %D%/packages/patches/jami-avutil-link.patch   		\
+  %D%/packages/patches/jami-qwindowkit.patch			\
  %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch	\
  %D%/packages/patches/jamvm-1.5.1-armv7-support.patch	\
  %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch	\
@@ -1686,6 +1682,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/jsonnet-include-cstdint-for-gcc-13-builds.patch	\
  %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch	\
  %D%/packages/patches/julia-Use-MPFR-4.2.patch	                \
+  %D%/packages/patches/komikku-python-3.11-compat.patch	                \
+  %D%/packages/patches/komikku-future-servers-compat.patch	                \
  %D%/packages/patches/libcall-ui-make-it-installable.patch	\
  %D%/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch	\
  %D%/packages/patches/libconfuse-CVE-2022-40320.patch		\
@@ -1699,6 +1697,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch	\
  %D%/packages/patches/libguestfs-syms.patch            	\
  %D%/packages/patches/libinfinity-renew-test-certificate.patch \
+  %D%/packages/patches/libjami-pkgconf.patch                    \
+  %D%/packages/patches/libjami-simdutf.patch                    \
  %D%/packages/patches/libmaus2-fix-gcc-13-require-include-cstdint.patch	\
  %D%/packages/patches/libretro-dolphin-emu-data.patch		\
  %D%/packages/patches/libretro-dolphin-emu-gc-font-tool.patch  \
@@ -1708,7 +1708,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/librewolf-compare-paths.patch		\
  %D%/packages/patches/librewolf-neuter-locale-download.patch	\
  %D%/packages/patches/librewolf-use-system-wide-dir.patch	\
-  %D%/packages/patches/libsolv-conda-variant-priorization.patch	\
  %D%/packages/patches/libvirt-add-install-prefix.patch	\
  %D%/packages/patches/libvirt-respect-modules-path.patch	\
  %D%/packages/patches/libzmf-doxygen-1.14.patch		\
@@ -1802,14 +1801,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/libphonenumber-reproducible-build.patch	\
  %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch	\
  %D%/packages/patches/libquicktime-ffmpeg.patch 		\
+  %D%/packages/patches/libsecret-fix-test-paths.patch		\
  %D%/packages/patches/libsepol-versioned-docbook.patch		\
  %D%/packages/patches/libskk-fix-invalid-escape.patch		\
-  %D%/packages/patches/libsoup-auth-digest-fix-crash.patch      \
-  %D%/packages/patches/libsoup-deadlock-in-add_listener_in_thread.patch \
-  %D%/packages/patches/libsoup-fix-merge-of-ranges.patch        \
-  %D%/packages/patches/libsoup-memory-leak-in-soup_form_decode.patch    \
-  %D%/packages/patches/libsoup-multipart-bounds-check.patch     \
-  %D%/packages/patches/libsoup-use-libdl-instead-of-gmodule.patch       \
  %D%/packages/patches/libspatialite-libxml2-2.14.patch		\
  %D%/packages/patches/libtar-CVE-2013-4420.patch 		\
  %D%/packages/patches/libtar-CVE-2021-33643-CVE-2021-33644.patch	\
@@ -1829,7 +1823,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/libutils-remove-damaging-includes.patch	\
  %D%/packages/patches/libvdpau-va-gl-unbundle.patch		\
  %D%/packages/patches/libvpx-CVE-2016-2818.patch		\
-  %D%/packages/patches/libvpx-CVE-2026-2447.patch		\
  %D%/packages/patches/libxcb-path-max.patch			\
  %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch	\
  %D%/packages/patches/libwpd-gcc-compat.patch			\
@@ -1843,6 +1836,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/linphone-desktop-ispell.patch	\
  %D%/packages/patches/linphone-desktop-qtkeychain.patch	\
  %D%/packages/patches/linux-libre-infodocs-target.patch	\
+  %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
  %D%/packages/patches/linux-libre-arm64-mnt-reform-revert-phy-rockchip-samsung.patch	\
  %D%/packages/patches/linux-libre-arm64-mnt-reform-revert-rk-samsung-hdptx.patch	\
  %D%/packages/patches/linux-libre-arm64-mnt-reform-revert-vop2-display-modes.patch	\
@@ -1860,26 +1854,16 @@ dist_patch_DATA =						\
  %D%/packages/patches/lua51-pkgconfig.patch                    \
  %D%/packages/patches/luajit-add-riscv64-support.patch         \
  %D%/packages/patches/lua-liblua-so.patch                      \
-  %D%/packages/patches/luajit-search-paths.patch		\
-  %D%/packages/patches/lua-5.1-search-paths.patch		\
-  %D%/packages/patches/lua-5.2-search-paths.patch		\
-  %D%/packages/patches/lua-5.3-search-paths.patch		\
  %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.x-search-path-helpers.patch	\
-  %D%/packages/patches/lua-lgi-fix-pango.patch			\
-  %D%/packages/patches/lua-lgi-fix-ref.patch			\
  %D%/packages/patches/luanti-paths.patch			\
  %D%/packages/patches/lugaru-fix-sound.patch			\
  %D%/packages/patches/luit-posix.patch				\
  %D%/packages/patches/lxc-no-static-bin.patch	\
  %D%/packages/patches/lxsession-potfiles-ignore.patch		\
-  %D%/packages/patches/mate-common-honor-aclocal.patch		\
  %D%/packages/patches/mactelnet-remove-init.patch		\
  %D%/packages/patches/mailutils-variable-lookup.patch		\
  %D%/packages/patches/mandoc-support-zstd-compression.patch	\
-  %D%/packages/patches/mantid-openmp-cleanup.patch		\
  %D%/packages/patches/make-impure-dirs.patch			\
  %D%/packages/patches/makem-replace-git.patch			\
  %D%/packages/patches/marisa-fix-MARISA_WORD_SIZE.patch	\
@@ -1887,8 +1871,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/mathjax-disable-webpack.patch			\
  %D%/packages/patches/mathjax-no-a11y.patch			\
  %D%/packages/patches/mathjax-3.1.2-no-a11y.patch		\
-  %D%/packages/patches/mathjax-4.0.0-disable-webpack.patch	\
-  %D%/packages/patches/mathjax-4.0.0-no-a11y.patch		\
  %D%/packages/patches/maxima-defsystem-mkdir.patch		\
  %D%/packages/patches/maven-generate-component-xml.patch		\
  %D%/packages/patches/maven-generate-javax-inject-named.patch		\
@@ -1920,7 +1902,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/minisat-friend-declaration.patch		\
  %D%/packages/patches/minisat-install.patch			\
  %D%/packages/patches/miniz-for-pytorch.patch			\
-  %D%/packages/patches/miopen-zstd.patch			\
  %D%/packages/patches/mit-krb5-hurd.patch			\
  %D%/packages/patches/mitm-cache-head-requests.patch   	\
  %D%/packages/patches/mpc123-initialize-ao.patch		\
@@ -1971,6 +1952,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/netsurf-system-utf8proc.patch		\
  %D%/packages/patches/netsurf-y2038-tests.patch		\
  %D%/packages/patches/netsurf-longer-test-timeout.patch	\
+  %D%/packages/patches/nextpnr-imgui.patch			\
  %D%/packages/patches/nhc98-c-update.patch			\
  %D%/packages/patches/nix-dont-build-html-doc.diff		\
  %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch	\
@@ -2000,22 +1982,21 @@ dist_patch_DATA =						\
  %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch	\
  %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch	\
  %D%/packages/patches/ocaml-4.09-multiple-definitions.patch	\
-  %D%/packages/patches/ogs-6.5.7-netcdfconverter.patch \
  %D%/packages/patches/omake-fix-non-determinism.patch	\
  %D%/packages/patches/oneko-remove-nonfree-characters.patch	\
  %D%/packages/patches/onetbb-other-arches.patch	\
  %D%/packages/patches/online-judge-tools.patch		\
-  %D%/packages/patches/onnx-1.17.0-for-onnxruntime.patch	\
  %D%/packages/patches/onnx-optimizer-system-library.patch	\
  %D%/packages/patches/onnx-1.13.1-use-system-googletest.patch	\
  %D%/packages/patches/onnx-shared-libraries.patch	\
  %D%/packages/patches/onnx-skip-model-downloads.patch		\
-  %D%/packages/patches/onnxruntime-1.22.0-splittosequence-bool.patch    \
  %D%/packages/patches/openbios-aarch64-riscv64-support.patch	\
  %D%/packages/patches/openboardview-use-system-imgui.patch	\
  %D%/packages/patches/openboardview-use-system-mpc.patch	\
  %D%/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch \
  %D%/packages/patches/openbox-python3.patch			\
+  %D%/packages/patches/opendht-meson-install-headers.patch	\
+  %D%/packages/patches/opendht-meson-liburing.patch     	\
  %D%/packages/patches/openexr-2-gcc-14.patch			\
  %D%/packages/patches/openfst-for-vosk-fix-unique-ptr.patch	\
  %D%/packages/patches/openjdk-currency-time-bomb.patch		\
@@ -2050,7 +2031,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/openrgb-unbundle-hueplusplus.patch	\
  %D%/packages/patches/openscad-fix-path-in-expected-test-results-to-acommodate-diff.patch \
  %D%/packages/patches/opensles-add-license-file.patch			\
-  %D%/packages/patches/opensp-maxpathlen.patch			\
  %D%/packages/patches/openssl-1.1-c-rehash-in.patch		\
  %D%/packages/patches/openssl-3.0-c-rehash-in.patch		\
  %D%/packages/patches/openssl-hurd64.patch			\
@@ -2066,6 +2046,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/pnet-newer-libgc-fix.patch		\
  %D%/packages/patches/pnet-newer-texinfo-fix.patch		\
  %D%/packages/patches/pam-krb5-CVE-2020-10595.patch		\
+  %D%/packages/patches/pango-skip-libthai-test.patch		\
  %D%/packages/patches/password-store-tree-compat.patch		\
  %D%/packages/patches/pciutils-hurd64.patch			\
  %D%/packages/patches/pcsxr-find-harfbuzz.patch			\
@@ -2081,6 +2062,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/podofo-gcc-14.patch			\
  %D%/packages/patches/pokerth-boost.patch			\
  %D%/packages/patches/pounce-readable-checks.patch             \
+  %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch		\
  %D%/packages/patches/procps-strtod-test.patch                 \
  %D%/packages/patches/prusa-slicer-add-cmake-module.patch \
  %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch	\
@@ -2089,7 +2071,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-3.12-fix-tests.patch		\
  %D%/packages/patches/python-accupy-use-matplotx.patch		\
  %D%/packages/patches/python-accupy-fix-use-of-perfplot.patch	\
-  %D%/packages/patches/python-anyio-unuse-exceptiongroup-in-test.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		\
@@ -2097,13 +2078,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-docrepr-fix-tests.patch		\
  %D%/packages/patches/python-gpg-setup-72.patch                \
  %D%/packages/patches/python-hdmedians-replace-nose.patch	\
-  %D%/packages/patches/python-jinja2-fragments-modify-conftest-py.patch	\
  %D%/packages/patches/python-louvain-fix-test.patch		\
  %D%/packages/patches/python-mohawk-pytest.patch	\
  %D%/packages/patches/python-msal-requests.patch	\
  %D%/packages/patches/python-norns-nose.patch			\
  %D%/packages/patches/python-numpy-gcc-14.patch		\
-  %D%/packages/patches/python-onnx-asr-0.10.2-bundled-parakeet-model.patch	\
  %D%/packages/patches/python-random2-getrandbits-test.patch		\
  %D%/packages/patches/python-pillow-use-zlib-1.3.patch	\
  %D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch	\
@@ -2117,6 +2096,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-sshtunnel-pep518.patch	\
  %D%/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch	\
  %D%/packages/patches/qcodeeditor-qt6.patch			\
+  %D%/packages/patches/qgit-2.12-fix-search-style.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	\
@@ -2134,14 +2114,13 @@ dist_patch_DATA =						\
  %D%/packages/patches/sdl-pango-sans-serif.patch		\
  %D%/packages/patches/smalltalk-multiplication-overflow.patch	\
  %D%/packages/patches/soci-mysql-ddl-types.patch		\
-  %D%/packages/patches/solarus-quest-editor-qlementine-reference.patch	\
-  %D%/packages/patches/solarus-launcher-qlementine-and-qtappinstancemanager-reference.patch	\
  %D%/packages/patches/sqlite-hurd.patch			\
  %D%/packages/patches/squeak-vm-gcc-14-fix.patch		\
  %D%/packages/patches/stepmania-ffmpeg-compat.patch			\
  %D%/packages/patches/stk-5.0.1-fix-typo.patch			\
  %D%/packages/patches/strace-readlink-tests.patch		\
  %D%/packages/patches/sunxi-tools-remove-sys-io.patch	\
+  %D%/packages/patches/p11-kit-hurd.patch			\
  %D%/packages/patches/patch-hurd-path-max.patch		\
  %D%/packages/patches/perl-5.14-autosplit-default-time.patch	\
  %D%/packages/patches/perl-5.14-module-pluggable-search.patch	\
@@ -2229,7 +2208,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-pillow-CVE-2022-45199.patch	\
  %D%/packages/patches/python-libxml2-utf8.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		\
  %D%/packages/patches/python-pandas-2-no-pytz_datetime.patch		\
  %D%/packages/patches/python-property-cached-asyncio-3_11.patch	\
@@ -2250,6 +2228,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/qdigidoc-bundle-config-files.patch       \
  %D%/packages/patches/qdigidoc-bundle-tsl-files.patch          \
  %D%/packages/patches/qemu-build-info-manual.patch		\
+  %D%/packages/patches/qemu-glibc-2.27.patch 			\
+  %D%/packages/patches/qemu-glibc-2.30.patch 			\
  %D%/packages/patches/qemu-fix-agent-paths.patch 		\
  %D%/packages/patches/qemu-fix-test-virtio-version.patch       \
  %D%/packages/patches/qemu-disable-aarch64-migration-test.patch	\
@@ -2267,62 +2247,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/quickjs-ng-fix-atomics.pause-on-32-bit.patch	\
  %D%/packages/patches/quilt-grep-compat.patch 			\
  %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch 	\
+  %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch	\
+  %D%/packages/patches/qtwayland-cleanup-callbacks.patch	\
  %D%/packages/patches/qtwayland-update-wayland-xml.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0001-client-announce-an-output-after-receiving-more-compl.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0002-fix-issue-with-repeated-window-size-changes.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0003-client-connect-drags-being-accepted-to-updating-the-.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0004-client-disconnect-registry-listener-on-destruction.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0005-client-set-xdgshell-size-hints-before-the-first-comm.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0006-fix-build.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0007-fix-remove-listener.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0008-hook-up-querykeyboardmodifers.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0009-correctly-detect-if-image-format-is-supported-by-qim.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0010-client-don-t-always-recreate-frame-callbacks.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0011-client-always-destroy-frame-callback-in-the-actual-c.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0012-wayland-client-use-wl_keyboard-to-determine-active-s.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0013-client-do-not-empty-clipboard-when-a-new-popup-windo.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0014-client-implement-datadevicev3.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0015-client-delay-deletion-of-qdrag-object-until-after-we.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0016-client-avoid-processing-of-events-when-showing-windo.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0017-handle-registry_global-out-of-constructor.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0018-connect-flushrequest-after-forceroundtrip.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0019-move-the-wayland-socket-polling-to-a-separate-event-.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0020-client-remove-mwaitingforupdatedelivery.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0021-client-simplify-round-trip-behavior.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0022-client-fix-opaque-region-setter.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0023-use-proper-dependencies-in-compile-tests.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0024-revert-client-remove-mwaitingforupdatedelivery.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0025-fix-race-condition-on-mwaitingforupdatedelivery.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0026-use-poll-2-when-reading-from-clipboard.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0027-reduce-memory-leakage.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0028-only-close-popup-in-the-the-hierchary.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0029-check-pointer-for-null-before-use-in-assert.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0030-use-wl_surface.damage_buffer-on-the-client-side.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0031-client-clear-focus-on-touch-cancel.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0032-guard-mresizedirty-by-the-correctmutex.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0033-fix-compile-tests.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0034-call-finishdrag-in-qwaylanddatadevice-dragsourcecanc.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0035-hold-surface-read-lock-throughout-qwaylandeglwindow-.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0036-keep-toplevel-windows-in-the-top-left-corner-of-the-.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0037-client-add-f_seal_shrink-seal-to-shm-backing-file.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0038-client-call-wl_output_release-upon-qwaylandscreen-de.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0039-client-bump-wl_output-version.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0040-fix-frame-sync-related-to-unprotected-multithread-ac.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0041-client-handle-zwp_primary_selection_device_manager_v.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0042-fixes-the-build-on-centos.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0043-client-avoid-protocol-error-with-invalid-min-max-siz.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0044-client-fix-handling-of-qt-blankcursor.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0045-client-force-a-roundtrip-when-an-xdgoutput-is-not-re.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0046-destroy-frame-queue-before-display.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0047-client-fix-crash-on-dnd-updates-after-client-facing-.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0048-convert-cursor-bitmap-to-supported-format.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0049-replace-scale-with-devicepixelratio-for-non-integer-.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0050-client-fix-buffer-damage.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0051-client-commit-the-initial-surface-state-explicitly.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0052-tests-fix-tst_xdgshell-minmaxsize.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0053-client-remove-some-surface-commits.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0054-client-avoid-locking-resizing-in-qwaylandshmbackings.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0055-bradient-use-qwaylandwindow-actual-window-title.patch	\
  %D%/packages/patches/qtwebsockets-6.9-fix-tst_QWebSocket.patch\
  %D%/packages/patches/rabbitmq-defaults.patch		\
  %D%/packages/patches/radare2-fix-meson-build-to-use-sys-qjs.patch	\
@@ -2361,7 +2288,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/rocm-bandwidth-test-fix-external-packages-search.patch	\
  %D%/packages/patches/rocm-bandwidth-test-fix-hsa-include-file-lookup.patch	\
  %D%/packages/patches/rocm-bandwidth-test-take-default-gpus-from-environment.patch	\
-  %D%/packages/patches/rocprim-placement-new-delete.patch	\
  %D%/packages/patches/rottlog-direntry.patch 			\
  %D%/packages/patches/ruby-actionpack-remove-browser-tests.patch	\
  %D%/packages/patches/ruby-activesupport-fix-deprecation-warning.patch	\
@@ -2380,13 +2306,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/rust-1.70-fix-rustix-build.patch	\
  %D%/packages/patches/rust-1.78-unwinding-fix.patch		\
  %D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch	\
-  %D%/packages/patches/rust-codex-0.98.0-arg0-file-lock.patch	\
-  %D%/packages/patches/rust-codex-0.98.0-core-file-lock.patch	\
-  %D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch	\
-  %D%/packages/patches/rust-codex-0.98.0-execpolicy-file-lock.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-ring-0.17-ring-core.patch		\
  %D%/packages/patches/rw-igraph-0.10.patch			\
  %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch	\
@@ -2402,7 +2321,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch	\
  %D%/packages/patches/sbcl-ciel-repl.patch			\
  %D%/packages/patches/sbcl-clml-fix-types.patch		\
-  %D%/packages/patches/sbcl-cl-posix-mqueue-mqattr-size.patch	\
  %D%/packages/patches/sbcl-cl-redis-replace-sbcl-specific-calls.patch	\
  %D%/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch	\
  %D%/packages/patches/sbcl-lack-fix-tests.patch		\
@@ -2470,12 +2388,10 @@ dist_patch_DATA =						\
  %D%/packages/patches/tao-fix-parser-types.patch		\
  %D%/packages/patches/tar-remove-wholesparse-check.patch	\
  %D%/packages/patches/tar-skip-unreliable-tests.patch		\
-  %D%/packages/patches/taskwarrior-link-taskchampion-cpp-with-sqlite3.patch \
  %D%/packages/patches/tbb-gcc-14.patch				\
  %D%/packages/patches/tbb-other-arches.patch			\
  %D%/packages/patches/tclxml-3.2-install.patch			\
  %D%/packages/patches/tcsh-fix-autotest.patch			\
-  %D%/packages/patches/tkremind-fix-fontchooser.patch		\
  %D%/packages/patches/teensy-loader-cli-help.patch		\
  %D%/packages/patches/tensorflow-c-api-fix.patch		\
  %D%/packages/patches/texinfo-headings-single.patch		\
@@ -2485,7 +2401,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/telegram-desktop-unbundle-cppgir.patch   \
  %D%/packages/patches/telegram-purple-adjust-test.patch	\
  %D%/packages/patches/telepathy-glib-fix-test.patch	\
-  %D%/packages/patches/tensile-copy-if-not-exist.patch		\
+  %D%/packages/patches/teuchos-remove-duplicate-using.patch	\
  %D%/packages/patches/texi2html-document-encoding.patch	\
  %D%/packages/patches/texi2html-i18n.patch			\
  %D%/packages/patches/texmacs-wayland-hidpi.patch	\
@@ -2504,13 +2420,19 @@ dist_patch_DATA =						\
  %D%/packages/patches/torbrowser-compare-paths.patch           \
  %D%/packages/patches/torbrowser-use-system-wide-dir.patch     \
  %D%/packages/patches/torbrowsers-add-store-to-rdd-allowlist.patch     \
+  %D%/packages/patches/tpetra-remove-duplicate-using.patch	\
  %D%/packages/patches/transcode-ffmpeg.patch	\
+  %D%/packages/patches/transmission-4.0.6-fix-build.patch	\
  %D%/packages/patches/trytond-add-guix_trytond_path.patch	\
  %D%/packages/patches/ttf2eot-cstddef.patch			\
+  %D%/packages/patches/turbovnc-custom-paths.patch		\
+  %D%/packages/patches/turbovnc-find-system-packages.patch	\
  %D%/packages/patches/tuxpaint-stamps-path.patch		\
  %D%/packages/patches/tvm_fix_cpptest_build.patch              \
  %D%/packages/patches/twinkle-bcg729.patch			\
  %D%/packages/patches/u-boot-allow-disabling-openssl.patch	\
+  %D%/packages/patches/u-boot-nintendo-nes-serial.patch		\
+  %D%/packages/patches/u-boot-rockchip-inno-usb.patch		\
  %D%/packages/patches/ucx-tcp-iface-ioctl.patch		\
  %D%/packages/patches/uftrace-fix-tests.patch			\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
@@ -2562,10 +2484,13 @@ dist_patch_DATA =						\
  %D%/packages/patches/vagrant-bin-vagrant-silence-warning-about-installer.patch	\
  %D%/packages/patches/vagrant-Support-system-installed-plugins.patch	\
  %D%/packages/patches/vagrant-Use-a-private-temporary-dir.patch	\
-  %D%/packages/patches/vala-0.52-fix-valagirparser.patch	\
+  %D%/packages/patches/vboot-utils-fix-format-load-address.patch	\
+  %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch	\
+  %D%/packages/patches/vboot-utils-skip-test-workbuf.patch	\
  %D%/packages/patches/vcmi-disable-privacy-breach.patch	\
  %D%/packages/patches/vinagre-newer-freerdp.patch             \
  %D%/packages/patches/vinagre-newer-rdp-parameters.patch      \
+  %D%/packages/patches/vlc-livemedia-2024.11.28.patch          \
  %D%/packages/patches/vsearch-unbundle-cityhash.patch		\
  %D%/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch	\
  %D%/packages/patches/vte-CVE-2012-2738-pt1.patch			\
@@ -2594,6 +2519,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/x2goclient-fix-makefile.patch            \
  %D%/packages/patches/x265-arm-flags.patch			\
  %D%/packages/patches/x265-4-arm-flags.patch			\
+  %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\
+  %D%/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch\
+  %D%/packages/patches/xdg-desktop-portal-1.20.3-disable-configuration-search-exit.patch\
  %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\
  %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
  %D%/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch		\
@@ -2617,7 +2545,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/xygrib-newer-proj.patch			\
  %D%/packages/patches/yajl-CVE-2023-33460.patch		\
  %D%/packages/patches/yggdrasil-extra-config.patch	\
-  %D%/packages/patches/ypsilon-Use-GNU-toolchain-as-default.patch	\
  %D%/packages/patches/zabbix-agent2-test-timezone-fix.patch	\
  %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch	\
  %D%/packages/patches/zig-0.9-fix-runpath.patch		\
@@ -32,7 +32,6 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system meson)
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
@@ -110,7 +109,7 @@
      (list latex2html
            pkg-config
            python-wrapper
-            swig-4.0)))
+            swig)))
    (inputs
     (list glib
           gtk+-2
@@ -160,11 +159,11 @@ terminals.")
         "PYTHON_ROOT=/"
         (string-append "TCL_DIR=" #$output "/lib")
         "INSTALL_WRITABLE_DIRECTORY=no-thanks")
-      #:imported-modules (append %glib-or-gtk-build-system-modules
-                                 %pyproject-build-system-modules)
+      #:imported-modules `((guix build python-build-system)
+                           ,@%glib-or-gtk-build-system-modules)
      #:modules '((guix build utils)
                  (guix build glib-or-gtk-build-system)
-                  ((guix build pyproject-build-system) #:prefix python:))
+                  ((guix build python-build-system) #:prefix python:))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'fix-errors
@@ -80,9 +80,6 @@
 ;;; Copyright © 2025 Luca Kredel <luca.kredel@web.de>
 ;;; Copyright © 2025 ROCKTAKEY <rocktakey@gmail.com>
 ;;; Copyright © 2026 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
-;;; Copyright © 2026 Andy Tai <atai@atai.org>
-;;; Copyright © 2026 marderbot <marderbot@tredecimal.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -102,7 +99,6 @@
 (define-module (gnu packages admin)
  #:use-module (guix build-system cargo)
  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
@@ -139,7 +135,6 @@
  #:use-module (gnu packages curl)
  #:use-module (gnu packages cyrus-sasl)
  #:use-module (gnu packages datastructures)
-  #:use-module (gnu packages dbm)
  #:use-module (gnu packages debian)
  #:use-module (gnu packages dns)
  #:use-module (gnu packages elf)
@@ -227,14 +222,14 @@
 (define-public aide
  (package
    (name "aide")
-    (version "0.19.3")
+    (version "0.19.2")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/aide/aide/releases/download/v"
                           version "/aide-" version ".tar.gz"))
       (sha256
-        (base32 "0irz58hmbrq3vci0aixlyap35x59i8nz0whvvl12ihmqnl5if4v5"))))
+        (base32 "1i3lbsw1mhsnq54bx48zikdiph1ihxn021ca7kmys4b1yh2jnxi3"))))
    (build-system gnu-build-system)
    (arguments
     (list #:configure-flags #~(list "--with-posix-acl"
@@ -336,24 +331,23 @@ characters can be replaced as well, as can UTF-8 characters.")
 (define-public hetznercloud-cli
  (package
    (name "hetznercloud-cli")
-    (version "1.61.0")
+    (version "1.50.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
-              (url "https://github.com/hetznercloud/cli")
-              (commit (string-append "v" version))))
+             (url "https://github.com/hetznercloud/cli")
+             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1mwiqy05s43faxqv1llk242nikmgb09wy5i7m1kjvkjg0zzjn20s"))))
+        (base32 "1d0k2g1s5x77kd8wrx8py2g3bqhaxqnm5kgm0dlmzypmfyavssg4"))))
    (build-system go-build-system)
    (arguments
     (list
-      #:tests? #f
+      #:tests? #f ; XXX: figure out hot to enable them
      #:install-source? #f
      #:import-path "github.com/hetznercloud/cli/cmd/hcloud"
-      #:unpack-path "github.com/hetznercloud/cli"
-      #:test-subdirs #~(list "../../...")))       ;test the whole library
+      #:unpack-path "github.com/hetznercloud/cli"))
    (native-inputs
     (list go-github-com-burntsushi-toml
           go-github-com-cheggaaa-pb-v3
@@ -372,10 +366,7 @@ characters can be replaced as well, as can UTF-8 characters.")
           go-github-com-swaggest-assertjson
           go-go-uber-org-mock
           go-golang-org-x-crypto
-           go-golang-org-x-exp
-           go-golang-org-x-net
-           go-golang-org-x-term
-           go-golang-org-x-text))
+           go-golang-org-x-term))
    (home-page "https://github.com/hetznercloud/cli")
    (synopsis "Command-line interface for the Hetzner Cloud service")
    (description
@@ -2608,7 +2599,7 @@ features of sudo with a fraction of the codebase.")
 (define-public wpa-supplicant-minimal
  (package
    (name "wpa-supplicant-minimal")
-    (version "2.11")
+    (version "2.10")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -2616,7 +2607,7 @@ features of sudo with a fraction of the codebase.")
                    version ".tar.gz"))
              (sha256
               (base32
-                "02pwqwdcirnyfmfzrc0xb66qs8gzrpb6905nzcv8w2p3fips0bli"))
+                "0bvvw7bx149a57llzrwzlpggyym84f8jdd4abwsk0f2b2pjpmpr0"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -2930,7 +2921,7 @@ development, not the kernel implementation of ACPI.")
 (define-public s-tui
  (package
    (name "s-tui")
-    (version "1.3.0")
+    (version "1.2.0")
    (source
     (origin
       (method git-fetch)
@@ -2939,11 +2930,12 @@ development, not the kernel implementation of ACPI.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0yqyndavlskzd0v0cby8v477ivyrpqxd58cn708y46yixz7r14h7"))))
+        (base32 "08mfclgdy6cb8xgp8sc7fpm4qxay37j71b1b3niywi6x206i5m2m"))))
    (build-system pyproject-build-system)
    (native-inputs
     (list python-pytest
-           python-setuptools))
+           python-setuptools
+           python-wheel))
    (inputs
     (list python-psutil
           python-urwid))
@@ -3294,10 +3286,6 @@ specified directories.")
 import re
 sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0])
 ")))))
-          (add-before 'build 'set-HOME
-            (lambda _
-              ;; Otherwise Ansible fails to create its config directory.
-              (setenv "HOME" "/tmp")))
          (add-after 'install 'replace-symlinks
            (lambda _
              ;; Replace symlinks with duplicate copies of the ansible
@@ -3329,6 +3317,8 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0])
         (replace 'check
           (lambda* (#:key inputs outputs tests? test-flags #:allow-other-keys)
             (when tests?
+               ;; Otherwise Ansible fails to create its config directory.
+               (setenv "HOME" "/tmp")
               ;; The test suite needs to be run with 'ansible-test', which
               ;; does some extra environment setup.  Taken from
               ;; https://raw.githubusercontent.com/ansible/ansible/\
@@ -3339,7 +3329,7 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0])
           openssl
           python-mock
           python-pycryptodome
-           python-pytest-8
+           python-pytest
           python-pytest-forked
           python-pytest-mock
           python-pytest-xdist
@@ -4076,7 +4066,7 @@ plug-in architecture to allow monitoring other system metrics.")
    (native-inputs
     (list go
           python-mock
-           python-pytest-8
+           python-pytest
           python-pytest-mock
           python-setuptools
           python-wheel))
@@ -4438,7 +4428,7 @@ buffers.")
 (define-public igt-gpu-tools
  (package
    (name "igt-gpu-tools")
-    (version "2.3")
+    (version "1.28")
    (source
     (origin
       (method git-fetch)
@@ -4447,7 +4437,7 @@ buffers.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1vyqrsvxraib98r4i6cjmxq7nis480s2ns95v78dscygcci42i8a"))))
+        (base32 "15mnsgzlpd4jkr2zy3jzx0b021g89fa61b8sdm8rjp27gxqkl8mm"))))
    (build-system meson-build-system)
    (arguments
     `(#:tests? #f              ; many of the tests try to load kernel modules
@@ -4734,7 +4724,7 @@ information tool.")
 (define-public fastfetch-minimal
  (package
    (name "fastfetch-minimal")
-    (version "2.60.0")
+    (version "2.57.0")
    (source
     (origin
       (method git-fetch)
@@ -4743,7 +4733,7 @@ information tool.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "089577qgxd63zqzd00fz381bfpmj6pwlmy2zfan9r6gbm1jvj4i8"))
+        (base32 "1cipr083bf8frqijvxnff7bgzvzczxksicaqj0m22avyhzxc7p3d"))
       (modules '((guix build utils)))
       (snippet '(begin
                   (delete-file-recursively "src/3rdparty")
@@ -4799,14 +4789,14 @@ system distribution, akin to many similar tools.")
 (define-public nnn
  (package
    (name "nnn")
-    (version "5.2")
+    (version "5.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/jarun/nnn/releases/download/v"
                           version "/nnn-v" version ".tar.gz"))
       (sha256
-        (base32 "035xn433mqx6wzzwdavv40dk09m4k4m41gzwwd25glbl1widscfb"))))
+        (base32 "0igc119c1cicravlsh0p715rn7fc0cqjxnhplqw0cbm2xv3g32n8"))))
    (build-system gnu-build-system)
    (inputs
     (list ncurses readline))
@@ -5253,34 +5243,6 @@ support forum.  It runs with the @code{/exec} command in most IRC clients.")
    (description "This package provides @code{udev} bindings for Python.")
    (license license:lgpl2.1)))

-(define-public undervolt
-  (package
-    (name "undervolt")
-    (version "0.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/georgewhewell/undervolt")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "136j8rqqra84yg57vn3nqwk1b36y9y7sjkynr0fl8pnrb7z8mq0v"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:tests? #f)) ;no tests
-    (native-inputs
-     (list python-setuptools))
-    (home-page "https://github.com/georgewhewell/undervolt")
-    (synopsis "Undervolt Intel CPUs under Linux")
-    (description
-     "Undervolt is a program for undervolting Intel CPUs under Linux.  It
-works in a similar manner to the Windows program ThrottleStop (i.e, MSR
-0x150).  A fixed voltage offset may be applied to one of 5 voltage planes,
-which overrides systems' temperature target (CPU will throttle when this
-temperature is reached).")
-    (license license:gpl2+)))
-
 (define-public vmtouch
  (package
    (name "vmtouch")
@@ -5316,7 +5278,7 @@ cache of unix and unix-like systems.")
 (define-public solaar
  (package
    (name "solaar")
-    (version "1.1.19")
+    (version "1.1.18")
    (source
     (origin
       (method git-fetch)
@@ -5325,11 +5287,10 @@ cache of unix and unix-like systems.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0pq1wy2m84ma0pg5k200f0fhywvx4qa873v8n5pz56ahc4ddcyk7"))))
+        (base32 "0wf8rkm9anxr9iw51yxaav9cifpfkf1m4cw7i9rfsq8xb3aa2n9b"))))
    (build-system pyproject-build-system)
    (native-inputs
-     (list gobject-introspection
-           python-pytest
+     (list python-pytest
           python-pytest-mock
           python-setuptools
           python-typing-extensions
@@ -5337,7 +5298,7 @@ cache of unix and unix-like systems.")
    (propagated-inputs
     (list python-pygobject
           python-pyudev
-           python-dbus
+           python-dbus-python
           python-evdev
           ;; For GUI.
           python-pyyaml
@@ -5703,7 +5664,7 @@ entries, providing commands to add, remove, comment, and search.")
 (define-public nmrpflash
  (package
    (name "nmrpflash")
-    (version "0.9.27")
+    (version "0.9.26")
    (source
     (origin
       (method git-fetch)
@@ -5712,7 +5673,7 @@ entries, providing commands to add, remove, comment, and search.")
         (url "https://github.com/jclehner/nmrpflash")
         (commit (string-append "v" version))))
       (sha256
-        (base32 "1fi64cqdllxsradh1iczyxsqgn2kcncdfaf94xll30ghpyz06jb2"))
+        (base32 "19dna96qg32nscvsalgd0xslp3da84aj196cczdm0ixhv1k9pvi3"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -6318,7 +6279,7 @@ doesn't need a Wayland compositor to be used.")
 (define-public libseat
  (package
    (name "libseat")
-    (version "0.9.2")
+    (version "0.9.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -6327,7 +6288,7 @@ doesn't need a Wayland compositor to be used.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1rmi2f38g5zx50zzy5qicy314a5jmzjwdx3giy4yzb7rfwz0hlq7"))))
+                "1q1ih1f9v5240nlas1gz44giwq4k88p3yikfq7w0a4sw58yr6pz8"))))
    (build-system meson-build-system)
    (arguments
     (list #:configure-flags #~(list "-Dlibseat-logind=elogind"
@@ -6764,39 +6725,36 @@ file or files to several hosts.")
 (define-public du-dust
  (package
    (name "du-dust")
-    (version "1.2.4")
+    (version "1.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (crate-uri "du-dust" version))
       (file-name (string-append name "-" version ".tar.gz"))
       (sha256
-        (base32 "0lksdw44s4fwyfscn79f8c8s3a5ijwfbxny539lgq0fsv5nx6bid"))))
+        (base32 "1nx3a1vij6m7jkmjybaxpjmwqygh0byjqis94f8lx02i1yyw2w1d"))))
    (build-system cargo-build-system)
    (arguments
-     (list
-       #:imported-modules (append %copy-build-system-modules
-                                  %cargo-build-system-modules)
-       #:modules '((guix build cargo-build-system)
-                   ((guix build copy-build-system) #:prefix copy:)
-                   (guix build utils))
-       #:install-source? #f
-       #:phases
-       #~(modify-phases %standard-phases
-           (add-after 'install 'install-extras
-             (lambda args
-               (apply (assoc-ref copy:%standard-phases 'install)
-                      #:install-plan
-                      '(("completions/dust.bash"
-                         "share/bash-completion/completions/dust")
-                        ("completions/dust.elv"
-                         "share/elvish/lib/dust")
-                        ("completions/dust.fish"
-                         "share/fish/vendor_completions.d/")
-                        ("completions/_dust"
-                         "share/zsh/site-functions/")
-                        ("man-page/dust.1" "share/man/man1/"))
-                      args))))))
+     (list #:install-source? #f
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'install 'install-extras
+                          (lambda* (#:key outputs #:allow-other-keys)
+                            (let* ((out (assoc-ref outputs "out"))
+                                   (share (string-append out "/share")))
+                              (install-file "man-page/dust.1"
+                                            (string-append share "/man/man1"))
+                              (mkdir-p (string-append out
+                                        "/share/bash-completion/completions"))
+                              (copy-file
+                               "completions/dust.bash"
+                               (string-append
+                                out "/share/bash-completion/completions/dust"))
+                              (install-file "completions/dust.fish"
+                                            (string-append share
+                                             "/fish/vendor_completions.d"))
+                              (install-file "completions/_dust"
+                                            (string-append share
+                                             "/zsh/site-functions"))))))))
    (inputs (cargo-inputs 'du-dust))
    (home-page "https://github.com/bootandy/dust")
    (synopsis "Graphical disk usage analyzer")
@@ -6889,14 +6847,14 @@ versions of @command{find}, including POSIX, GNU, and *BSD find.")
 (define-public rdfind
  (package
    (name "rdfind")
-    (version "1.8.0")
+    (version "1.7.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://rdfind.pauldreik.se/" name "-" version
                           ".tar.gz"))
       (sha256
-        (base32 "0ddgwx9131ba8ym75xnrz2rcy7l1rjdn8yzf6h0xrhic00r0sb8a"))))
+        (base32 "0afzwhmzlzhzzckd9iwkbx6grrzm5p4vk0zbpz8lz7hx5qan7i3q"))))
    (build-system gnu-build-system)
    (native-inputs (list which))
    (inputs (list nettle))
@@ -7110,61 +7068,6 @@ It shows which process uses the port, and its information like process tree,
 working directory, user, pid, command, and so on.")
    (license license:asl2.0)))

-(define-public radius
-  (package
-    (name "radius")
-    (version "1.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://gnu/radius/radius-" version ".tar.xz"))
-       (sha256
-        (base32 "0n9k30ma7n9xmjwlvsv9x333g52lfplbpzcyg0vh2wmm423bvy36"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:configure-flags
-      #~(list "--with-log-dir=/var/log"
-              #$@(if (target-hurd?)
-                     '()
-                     '("--with-libpam")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'skip-failing-tests
-            (lambda _
-              (for-each (lambda (test)
-                          (substitute* "tests/testsuite.at"
-                            ((test)
-                             "")))
-                        (list "execwait")))))))
-    (inputs (append (if (target-hurd?)
-                        '()
-                        (list linux-pam util-linux))
-                   (list acl
-                         gawk
-                         gdbm
-                         gettext-minimal
-                         guile-3.0
-                         libxcrypt
-                         readline)))
-    (native-inputs (list autoconf
-                         bash-minimal
-                         bison
-                         flex
-                         groff
-                         m4
-                         procps
-                         texinfo))
-    (home-page "https://www.gnu.org/software/radius/")
-    (synopsis "Authentication and accounting services and daemon")
-    (description
-     "GNU Radius is a server for remote user authentication and accounting.  It
-is generally useful for networks that require a centralized authentication
-and accounting services for its workstations.  Authentication can be
-performed in a variety of ways, such as via @file{/etc/passwd} or credentials
-stored in an SQL database.")
-    (license license:gpl3+)))
-
 (define-public xfel
  (package
    (name "xfel")
@@ -7204,37 +7107,3 @@ stored in an SQL database.")
    (description "This package contains a debugging tool for Allwinner devices
 (connects via USB OTG).")
    (license license:expat)))
-
-(define-public zzz
-  (package
-    (name "zzz")
-    (version "20250212")
-    (source
-     (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/void-linux/void-runit")
-            (commit version)))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32
-        "00nbnjmxwvqj5hf0g00ma26hb29i9mr05g8ls24icp1409c2ykkc"))))
-    (build-system copy-build-system)
-    (arguments
-     (list #:install-plan
-           #~'(("zzz" "sbin/")
-               ("zzz.8" "share/man/man8/"))
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'patch-zzz
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* "zzz"
-                     (("flock") (search-input-file inputs "bin/flock"))
-                     (("grep") (search-input-file inputs "bin/grep"))))))))
-    (inputs
-     (list grep util-linux))
-    (home-page "https://github.com/void-linux/void-runit")
-    (synopsis "Simple script to suspend or hibernate your computer")
-    (description "Simple script to suspend or hibernate your computer.  It
-supports hooks before and after suspending.")
-    (license license:cc0)))
@@ -197,7 +197,7 @@ come from Agda's standard library.")
 (define-public agda-stdlib
  (package
    (name "agda-stdlib")
-    (version "2.3")
+    (version "2.1.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -206,7 +206,7 @@ come from Agda's standard library.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "17w5vfn5pb2cgfs22zph3jfqnki52ja8y4zwyqj24zwf9rxairr4"))))
+                "1n742qvlxaj4dprnknvzrr876af6yjfwa4ps1dr4v1h814sg0xz0"))))
    (build-system agda-build-system)
    (arguments
     (list
@@ -73,30 +73,22 @@
    (build-system pyproject-build-system)
    (arguments
     (list
-      #:test-flags
-      ;; This tests if find_library was called once, but we remove the call in
-      ;; the stage below to make the library find libzbar.
-      #~(list #$@(map (lambda (test) (string-append "--deselect="
-                                                    "pyzbar/tests/"
-                                                    "test_zbar_library.py::"
-                                                    "TestLoad::"
-                                                    test))
-                      (list "test_found_non_windows"
-                            "test_not_found_non_windows")))
+      #:test-backend #~'unittest
      #:phases
      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-failing-test
+            (lambda _
+              ;; This tests if find_library was called once, but we remove
+              ;; the call in the stage below to make the library find libzbar.
+              (delete-file "pyzbar/tests/test_zbar_library.py")))
          (add-before 'build 'set-library-file-name
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "pyzbar/zbar_library.py"
-                (("find_library\\('zbar'\\)")
-                 (format #f "~s"
-                         (search-input-file inputs "/lib/libzbar.so.0")))))))))
+            (lambda _
+              (let ((libzbar #$(this-package-input "zbar")))
+                (substitute* "pyzbar/zbar_library.py"
+                  (("find_library\\('zbar'\\)")
+                   (string-append "'" libzbar "/lib/libzbar.so.0'")))))))))
    (native-inputs
-     (list pkg-config
-           python-numpy
-           python-pillow
-           python-pytest
-           python-setuptools))
+     (list pkg-config python-numpy python-pillow python-setuptools))
    (inputs
     (list zbar))
    (home-page "https://github.com/NaturalHistoryMuseum/pyzbar/")
@@ -219,6 +211,27 @@ integration of this capability into your own programs.")
    (home-page "https://github.com/zxing-cpp/zxing-cpp")
    (license license:asl2.0)))

+;;; This older variant is kept for gst-plugins-bad (see:
+;;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1684).
+(define-public zxing-cpp-1.2
+  (package/inherit zxing-cpp
+    (name "zxing-cpp")
+    (version "1.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/zxing-cpp/zxing-cpp")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (patches (search-patches "zxing-cpp-1.2.0-gcc-14.patch"))
+              (sha256
+               (base32
+                "1gjj9c7h634rrmmgzbc7cxjqsxdq0paj6113k02ncjm1s9abk7ik"))))
+    ;; Disable tests to avoid bundled dependencies.
+    (arguments '(#:tests? #f
+                 #:configure-flags '("-DBUILD_BLACKBOX_TESTS=OFF")))
+    (native-inputs '())))
+
 (define-public barcode
  (package
    (name "barcode")
@@ -350,11 +363,12 @@ This package includes the following programs:
    (build-system glib-or-gtk-build-system)
    (arguments
     (list
-      #:configure-flags
-      #~(list "--disable-static"
-              "--without-dbus" ;See <https://github.com/mchehab/zbar/issues/104>
-              "--with-gtk=auto"
-              "--with-python=auto")))
+      #:configure-flags '(list "--disable-static"
+                               "--with-gtk=auto"
+                               "--with-python=auto"
+                               (string-append "--with-dbusconfdir="
+                                              (assoc-ref %outputs "out")
+                                              "/etc"))))
    (native-inputs
     (list autoconf
           automake
@@ -366,7 +380,8 @@ This package includes the following programs:
           pkg-config
           python-wrapper))
    (inputs
-     (list imagemagick
+     (list dbus
+           imagemagick
           libjpeg-turbo
           perl
           python
@@ -17,7 +17,7 @@
 ;;; Copyright © 2022 宋文武 <iyzsong@envs.net>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2023 Mehmet Tekman <mtekman89@gmail.com>
-;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 ;;; Copyright © 2025 Skylar Hill <stellarskylark@posteo.net>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
@@ -313,7 +313,7 @@ PARI is also available as a C library to allow for faster computations.")
 (define-public gp2c
  (package
   (name "gp2c")
-   (version "0.0.14pl1")
+   (version "0.0.14")
   (source (origin
            (method url-fetch)
            (uri (string-append
@@ -321,7 +321,7 @@ PARI is also available as a C library to allow for faster computations.")
                  version ".tar.gz"))
            (sha256
              (base32
-                "1g160xg8p624vg1ms7mz34zrb9132ppwwrpqi4ldqqkqzlhf0p14"))))
+                "0c3v1g04mkb45xrcrxr9xzp61nnql38k6i6s77i5f14l0b614qdg"))))
   (build-system gnu-build-system)
   (native-inputs (list perl))
   (inputs (list pari-gp))
@@ -557,11 +557,11 @@ fast arithmetic.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 905 passed
      #:test-flags #~(list "--pyargs" "flint")))
    (native-inputs
-     (list pkg-config
-           python-meson
+     (list meson-python
+           pkg-config
+           python-cython
           python-pytest))
    (inputs
     (list gmp
@@ -985,44 +985,6 @@ gnu build version."))))
     (string-append (package-description fftw)
                    "  With OpenMPI parallelism support."))))

-(define-public python-pyflct
-  (package
-    (name "python-pyflct")
-    (version "0.3.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pyflct" version))
-       (sha256
-        (base32 "1xv4h1a4f8y3ww97g2vc7fg2scfi142vwjz556nx0r1nnpgggj41"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 6 passed
-      #:test-flags
-      #~(list "--pyargs" "pyflct")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'remove-local-source
-            (lambda _
-              (delete-file-recursively "pyflct"))))))
-    (native-inputs
-     (list python-cython
-           python-extension-helpers
-           python-pytest
-           python-setuptools
-           python-setuptools-scm))
-    (inputs
-     (list fftw))
-    (propagated-inputs
-     (list python-numpy
-           python-packaging))
-    (home-page "https://docs.sunpy.org/projects/pyflct/")
-    (synopsis "Python wrapper for Fourier Local Correlation Tracking")
-    (description
-     "This package provides a Python wrapper for Fourier Local Correlation Tracking.")
-    (license license:lgpl2.1)))
-
 (define-public java-la4j
  (package
    (name "java-la4j")
@@ -426,7 +426,7 @@ various Android core host applications.")
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (install-file "diagnose_usb.h" (string-append (assoc-ref outputs "out") "/include"))
             #t)))))
-    (native-inputs (list linux-libre-headers-5.15 gcc-11))
+    (native-inputs (list linux-libre-headers-5.4 gcc-11))
    (inputs
     (list android-libbase android-libcutils android-liblog openssl))
    (home-page "https://developer.android.com/studio/command-line/adb.html")
@@ -1077,7 +1077,7 @@ script that you can put anywhere in your path.")
    (source
     (origin
       (method url-fetch)
-       (uri (string-append "http://deb.debian.org/debian/pool/main/a/abootimg/"
+       (uri (string-append "http://http.debian.net/debian/pool/main/a/abootimg/"
                           "abootimg_" version ".orig.tar.gz"))
       (sha256
        (base32 "0sfc2k011l1ymv97821w89391gnqdh8pp0haz4sdcm5hx0axv2ba"))))
@@ -1168,6 +1168,7 @@ useful for reverse engineering, analysis of Android applications and more.")
           python-croniter
           python-cryptography
           python-defusedxml
+           python-importlib-metadata
           python-netifaces
           python-pytz
           python-pyyaml
@@ -316,7 +316,7 @@ language.")
            ;; Ensure that all required Qt plugins are found at runtime.
            (add-after 'install 'wrap-executable
              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((qt '("qtbase" "qtmultimedia" "qtwayland")))
+                (let ((qt '("qtbase" "qtmultimedia")))
                  (wrap-program (string-append #$output "/bin/Papagayo")
                    `("QT_PLUGIN_PATH" ":" prefix
                      ,(map (lambda (label)
@@ -324,7 +324,7 @@ language.")
                                             "/lib/qt5/plugins/"))
                            qt)))))))))
      (inputs
-       (list bash-minimal qtbase-5 qtmultimedia-5 qtwayland-5 libsndfile))
+       (list bash-minimal qtbase-5 qtmultimedia-5 libsndfile))
      (native-inputs
       (list qttools-5))
      (home-page "https://www.lostmarble.com/papagayo/")
@@ -352,8 +352,7 @@ waveform until they line up with the proper sounds.")
                "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
    (build-system gnu-build-system)
    (inputs
-     (list bash-minimal qtbase-5 qtxmlpatterns-5 qtmultimedia-5 qtsvg-5
-           qtwayland-5))
+     (list bash-minimal qtbase-5 qtxmlpatterns-5 qtmultimedia-5 qtsvg-5))
    (arguments
     (list
      #:phases
@@ -83,6 +83,7 @@
                  (guix build cmake-build-system)
                  (guix build utils))
      #:phases
+      (with-extensions (list (cargo-guile-json))
      #~(modify-phases %standard-phases
          (add-after 'unpack 'prepare-cargo-build-system
            (lambda args
@@ -111,7 +112,7 @@
                (substitute* "unit_tests/CMakeLists.txt"
                  (("clamd_test\\.py" test)
                   (string-append
-                    test " -k \"not test_clamd_08_VirusEvent\"")))))))))
+                    test " -k \"not test_clamd_08_VirusEvent\""))))))))))
    (native-inputs
     (append
      (list pkg-config
@@ -93,7 +93,7 @@
           perl
           python-minimal
           ruby
-           swig-4.0
+           swig
           which))
    (home-page "https://apparmor.net")
    (synopsis "Linux kernel security module")
@@ -65,16 +65,16 @@
 (define-public arcan
  (package
    (name "arcan")
-    (version "0.7.1")
+    (version "0.6.3.3")
    (source (origin
              (method git-fetch)
              (file-name (git-file-name name version))
              (uri (git-reference
-                    (url "https://codeberg.org/letoram/arcan")
+                    (url "https://github.com/letoram/arcan")
                    (commit version)))
              (sha256
               (base32
-                "1sn8rljghrw57q99n9hl03pr2ndgkzg4g3p443iaslg42bmww05c"))
+                "0rbswqqrgh9bkv0fzsswpkfw2zp1a7znwy0abgrxha5vpn13qd8c"))
              (modules '((guix build utils)))
              (snippet
               ;; Remove some bundled packages.
@@ -186,83 +186,85 @@ engine with a Lua scripting interface.")
    (synopsis "Combined display server, multimedia framework and game engine (SDL)")))

 (define-public durden
+  (let ((commit "43211acd7994836d5c4ba039d7ecc939dcf8a5aa")
+        (revision "2"))
+    (package
+      (name "durden")
+      (version (git-version "0.6.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (uri (git-reference
+               (url "https://github.com/letoram/durden")
+               (commit commit)))
+         (sha256
+          (base32 "1jns4lq959s8ydykm0yg9sddzh74k7fdvjrnbz3z91idb7abl92d"))
+         (patches (search-patches "durden-shadow-arcan.patch"))))
+      (build-system copy-build-system)
+      (arguments
+       (list
+        #:install-plan #~'(("durden/" "share/arcan/appl/durden/")
+                           ("util/" "share/arcan/appl/durden/util/")
+                           ("distr/durden" "bin/durden"))
+        #:phases #~(modify-phases %standard-phases
+                     (add-after 'unpack 'patch-paths
+                       (lambda* (#:key inputs outputs #:allow-other-keys)
+                         (substitute* "distr/durden"
+                           (("/usr/share/\\$applname")
+                            (string-append (assoc-ref outputs "out")
+                                           "/share/arcan/appl"))
+                           (("@ARCAN_STORE_PATH@")
+                            (string-append (assoc-ref inputs "arcan")
+                                           "/bin/arcan"))
+                           (("([\\([:blank:]]+)basename " _ separator)
+                            (string-append separator
+                                           (assoc-ref inputs "coreutils")
+                                           "/bin/basename "))
+                           (("([\\([:blank:]]+)date " _ separator)
+                            (string-append separator
+                                           (assoc-ref inputs "coreutils")
+                                           "/bin/date "))
+                           (("([\\([:blank:]]+)ln " _ separator)
+                            (string-append separator
+                                           (assoc-ref inputs "coreutils")
+                                           "/bin/ln "))
+                           (("([\\([:blank:]]+)mkdir " _ separator)
+                            (string-append separator
+                                           (assoc-ref inputs "coreutils")
+                                           "/bin/mkdir "))
+                           (("([\\([:blank:]]+)true; " _ separator)
+                            (string-append separator
+                                           (assoc-ref inputs "coreutils")
+                                           "/bin/true; "))
+                           (("([\\([:blank:]]+)\\[ " _ separator)
+                            (string-append separator
+                                           (assoc-ref inputs "coreutils")
+                                           "/bin/[ "))))))))
+      (inputs (list arcan coreutils))
+      (home-page "https://durden.arcan-fe.com/")
+      (synopsis "Desktop Environment for Arcan")
+      (description
+       "Durden is a desktop environment for the Arcan Display Server.
+It serves both as a reference showcase on how to take advantage of some of the
+features in Arcan, and as an entry to the advanced-user side of the desktop
+environment spectrum.")
+      (license (list license:bsd-3 license:expat license:cc-by3.0
+                     license:cc-by4.0 license:asl2.0)))))
+
+(define-public xarcan
  (package
-    (name "durden")
+    (name "xarcan")
    (version "0.6.3")
    (source
     (origin
       (method git-fetch)
       (file-name (git-file-name name version))
       (uri (git-reference
-             (url "https://codeberg.org/letoram/durden")
+             (url "https://github.com/letoram/xarcan")
             (commit version)))
       (sha256
-        (base32 "1w12mdjdbhw13134fj4kv43n1z6vrh1jhg1wc7m5hw82w8ncwqkm"))
-       (patches (search-patches "durden-shadow-arcan.patch"))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:install-plan #~'(("durden/" "share/arcan/appl/durden/")
-                         ("util/" "share/arcan/appl/durden/util/")
-                         ("distr/durden" "bin/durden"))
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'patch-paths
-                     (lambda* (#:key inputs outputs #:allow-other-keys)
-                       (substitute* "distr/durden"
-                         (("/usr/share/\\$applname")
-                          (string-append (assoc-ref outputs "out")
-                                         "/share/arcan/appl"))
-                         (("@ARCAN_STORE_PATH@")
-                          (string-append (assoc-ref inputs "arcan")
-                                         "/bin/arcan"))
-                         (("([\\([:blank:]]+)basename " _ separator)
-                          (string-append separator
-                                         (assoc-ref inputs "coreutils")
-                                         "/bin/basename "))
-                         (("([\\([:blank:]]+)date " _ separator)
-                          (string-append separator
-                                         (assoc-ref inputs "coreutils")
-                                         "/bin/date "))
-                         (("([\\([:blank:]]+)ln " _ separator)
-                          (string-append separator
-                                         (assoc-ref inputs "coreutils")
-                                         "/bin/ln "))
-                         (("([\\([:blank:]]+)mkdir " _ separator)
-                          (string-append separator
-                                         (assoc-ref inputs "coreutils")
-                                         "/bin/mkdir "))
-                         (("([\\([:blank:]]+)true; " _ separator)
-                          (string-append separator
-                                         (assoc-ref inputs "coreutils")
-                                         "/bin/true; "))
-                         (("([\\([:blank:]]+)\\[ " _ separator)
-                          (string-append separator
-                                         (assoc-ref inputs "coreutils")
-                                         "/bin/[ "))))))))
-    (inputs (list arcan coreutils))
-    (home-page "https://durden.arcan-fe.com/")
-    (synopsis "Desktop Environment for Arcan")
-    (description
-     "Durden is a desktop environment for the Arcan Display Server.
-It serves both as a reference showcase on how to take advantage of some of the
-features in Arcan, and as an entry to the advanced-user side of the desktop
-environment spectrum.")
-    (license (list license:bsd-3 license:expat license:cc-by3.0
-                   license:cc-by4.0 license:asl2.0))))
-
-(define-public xarcan
-  (package
-    (name "xarcan")
-    (version "0.7.1")
-    (source
-     (origin
-       (method git-fetch)
-       (file-name (git-file-name name version))
-       (uri (git-reference
-             (url "https://codeberg.org/letoram/xarcan")
-             (commit version)))
-       (sha256
-        (base32 "1jpk272y58h94ss6j87i0cl1zlfp4g5803y0kpi09q8yy37icvcg"))))
+        (base32 "1g24mmwnc45ig0x8jk0v91488k8933w07vxi4305sla56q4n82p4"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -300,7 +302,6 @@ environment spectrum.")
           openssl
           pixman
           xcb-util
-           xcb-util-image
           xcb-util-wm
           xkbcomp
           xkeyboard-config
@@ -308,8 +309,11 @@ environment spectrum.")
           xtrans))
    (home-page "https://arcan-fe.com")
    (synopsis "Patched Xserver that bridges connections to Arcan")
-    (description
-     "Patched Xserver with a KDrive backend that uses the arcan-shmif
- to map Xlib/Xcb/X clients to a running arcan instance.  It allows
-running an X session as a window under Arcan.")
+    (description "Patched Xserver with a KDrive backend that uses the arcan-shmif
+ to map Xlib/Xcb/X clients to a running arcan instance.  It allows running an X session
+as a window under Arcan.")
    (license (list license:bsd-3 license:expat))))
+
+;; Package was merged into arcan in upstream.
+(define-deprecated-package arcan-wayland
+  arcan)
@@ -1,108 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages array-languages)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix build-system go)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages bash))
-
-;;;
-;;; Code:
-
-(define-public goal
-  (package
-    (name "goal")
-    (version "1.5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/anaseto/goal")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ckkjd2hf2v6f8x0ck9brp1ii4q8lcssvvwn7d6l1l5n9kcfjw7n"))))
-    (build-system go-build-system)
-    (inputs (list bash-minimal))
-    (outputs (list "out" "lib"))
-    (arguments
-     (list
-      #:unpack-path "codeberg.org/anaseto/goal"
-      #:import-path "codeberg.org/anaseto/goal/cmd/goal"
-      #:build-flags
-      #~(list "-tags" "full,nosse4") ;disable SSE4.2 optimizations
-      #:test-flags
-      #~(list "-skip" "TestSources/version.goal" ;git tests require a repo
-              "-tags" "full,nosse4")
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; Goal requires a shell interpreter.
-          (add-after 'unpack 'fix-sh-path
-            (lambda* (#:key unpack-path #:allow-other-keys)
-              (substitute* (string-append "src/" unpack-path "/os/os.go")
-                (("/bin/sh")
-                 #$(file-append bash-minimal "/bin/sh")))))
-          ;; Tests require the goal binary.
-          (add-before 'check 'add-goal-path
-            (lambda _
-              (setenv "PATH"
-                      (string-append (getenv "PATH") ":" #$output "/bin"))))
-          ;; Goal is embeddable, but end users typically don't need the source
-          ;; code.
-          (replace 'install
-            (lambda* (#:key unpack-path #:allow-other-keys #:rest arguments)
-              (apply (assoc-ref %standard-phases 'install)
-                     `(,@arguments #:import-path ,unpack-path))
-              (mkdir-p #$output:lib)
-              (rename-file (string-append #$output "/src")
-                           (string-append #$output:lib "/src"))))
-          (add-after 'install 'install-goal-libs-and-documentation
-            (lambda* (#:key unpack-path inputs #:allow-other-keys #:rest
-                      arguments)
-              (let ((outdir (string-append #$output "/share/goal/"
-                                           #$(version-major version) "/lib")))
-                (mkdir-p outdir)
-                (copy-recursively (string-append "src/" unpack-path "/lib")
-                                  outdir))
-              (install-file (string-append "src/" unpack-path "/docs/goal.1")
-                            (string-append #$output "/share/man/man1")))))))
-    (native-search-paths
-     (list (search-path-specification
-            (variable "GOALLIB")
-            (separator #f)
-            (files `(,(string-append "share/goal/"
-                                     (version-major version) "/lib"))))))
-    (home-page "https://anaseto.codeberg.page/goal-docs/")
-    (synopsis "Embeddable scripting array language")
-    (description
-     "Goal is an embeddable array programming language with a bytecode
-interpreter, written in Go.  The command line intepreter can execute scripts
-or run in interactive mode.  Goal shines the most in common scripting tasks,
-like handling columnar data or text processing.  It is also suitable for
-exploratory programming.")
-    (license license:isc)))
-
-;;;
-;;; Avoid adding new packages to the end of this file. To reduce the chances
-;;; of a merge conflict, place them above in alphabetic order.
-;;;
@@ -52,7 +52,7 @@
 (define-public aspell
  (package
    (name "aspell")
-    (version "0.60.8.1")
+    (version "0.60.8")
    (source
     (origin
      (method url-fetch)
@@ -60,8 +60,9 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "06yjhwlgpcvbrl5g83qjrpzjwjx7hka5lhsfc3x5gm229nri5nnn"))
-      (patches (search-patches "aspell-default-dict-dir.patch"))))
+        "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"))
+      (patches (search-patches "aspell-default-dict-dir.patch"
+                               "aspell-CVE-2019-25051.patch"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
@@ -77,7 +78,8 @@
               (substitute* "common/config.cpp"
                 (("\"filter-path(.*)DICT_DIR" _ middle)
                  (string-append "\"filter-path" middle
-                                 "\"" libdir "\"")))))))))
+                                 "\"" libdir "\"")))
+               #t))))))
    (native-inputs (list perl))

    (native-search-paths
@@ -749,7 +749,24 @@ files.")
     (list
      #:tests? #f ;; XXX: insists on using bundled googletest
      #:configure-flags
-      #~(list "-DBUILD_SHARED_LIBS=ON")))
+      #~(list "-DBUILD_SHARED_LIBS=ON"
+              #$@(let ((target (%current-target-system)))
+                   (if target
+                       (cond ((string-prefix? "arm" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=arm"))
+                             ((string-prefix? "aarch64" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=aarch64"))
+                             ((string-prefix? "i686" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=x86"))
+                             ((string-prefix? "x86_64" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=x86_64"))
+                             ;; 32-bit and 64-bit
+                             ((string-prefix? "powerpc" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=powerpc"))
+                             ((string-prefix? "riscv64" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=riscv64"))
+                             (else '()))
+                       '())))))
    (home-page "https://github.com/google/cpu_features")
    (synopsis "Cross platform C99 library to get cpu features at runtime")
    (description
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015-2026 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015-2025 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015, 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
@@ -59,9 +59,6 @@
 ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
 ;;; Copyright © 2025 Isidor Zeuner <guix@quidecco.pl>
 ;;; Copyright © 2025 Evgenii Klimov <eugene.dev@lipklim.org>
-;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
-;;; Copyright © 2026 Noé Lopez <noelopez@free.fr>
-;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -94,7 +91,6 @@
  #:use-module (gnu packages cmake)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages dbm)
  #:use-module (gnu packages documentation)
@@ -816,147 +812,6 @@ attacks, performing pitch detection, tapping the beat and producing MIDI
 streams from live audio.")
    (license license:gpl3+)))

-(define-public dexed
-  (package
-    (name "dexed")
-    (version "1.0.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/asb2m10/dexed")
-                     (commit (string-append "v" version))
-                     ;; This is a JUCE project and so it bundles a particular
-                     ;; version of the JUCE repository and the sources of
-                     ;; other libraries.
-                     (recursive? #true)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1n604cvkjs11wqnaxnqzx8fgjj1klz85fnka15nnmhz49lqdlipl"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:tests? #false ;there are none
-      #:modules '((guix build utils)
-                  (guix build cmake-build-system)
-                  (guix base32)
-                  (ice-9 string-fun)
-                  (ice-9 regex)
-                  (rnrs bytevectors))
-      #:imported-modules `((guix base32)
-                           (guix build cmake-build-system)
-                           ,@%default-gnu-imported-modules)
-      #:configure-flags
-      ;; We extract the build identifer from the output prefix.  This is more
-      ;; useful than setting it to a constant string.
-      #~(let ((build-id
-               (lambda (out)
-                 (let* ((nix-store (string-append
-                                    (or (getenv "NIX_STORE") "/gnu/store")
-                                    "/"))
-                        (filename
-                         (string-replace-substring out nix-store ""))
-                        (hash (match:substring (string-match "[0-9a-z]{32}"
-                                                             filename)))
-                        (bv (nix-base32-string->bytevector hash)))
-                   (format #f "0x~x"
-                           (bytevector-u32-ref bv 0 (endianness big)))))))
-          (list (string-append "-DBUILD_ID=" (build-id #$output))))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; HOME must be defined for .vst3
-          (add-after 'unpack 'set-home-directory
-            (lambda _ (setenv "HOME" "HOME")))
-          (add-after 'unpack 'patch-libraries
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "libs/JUCE/modules/juce_gui_basics/native/juce_XSymbols_linux.h"
-                (("libX11.so.6")
-                 (search-input-file inputs "/lib/libX11.so.6"))
-                (("libXext.so.6")
-                 (search-input-file inputs "/lib/libXext.so.6"))
-                (("libXcursor.so.1")
-                 (search-input-file inputs "/lib/libXcursor.so.1"))
-                (("libXinerama.so.1")
-                 (search-input-file inputs "/lib/libXinerama.so.1"))
-                (("libXrender.so.1")
-                 (search-input-file inputs "/lib/libXrender.so.1"))
-                (("libXrandr.so.2")
-                 (search-input-file inputs "/lib/libXrandr.so.2")))))
-          (add-after 'unpack 'enable-lv2-format
-            (lambda _
-              (substitute* "Source/CMakeLists.txt"
-                (("set\\(DEXED_JUCE_FORMATS Standalone\\).*" m)
-                 (string-append m "
-if(NOT DEXED_SKIP_LV2)
-  list(APPEND DEXED_JUCE_FORMATS LV2)
-endif()
-"))
-                (("PRODUCT_NAME \"Dexed\".*" m)
-                 (string-append m "
-LV2URI \"https://github.com/asb2m10/dexed\"
-")))))
-          (replace 'install
-            (lambda* (#:key build-type #:allow-other-keys)
-              (with-directory-excursion "Source/Dexed_artefacts"
-                (install-file (string-append build-type "/Standalone/Dexed")
-                              (string-append #$output "/bin"))
-                (mkdir-p (string-append #$output:clap "/lib"))
-                (copy-recursively (string-append build-type "/CLAP")
-                                  (string-append #$output:clap "/lib"))
-                (mkdir-p (string-append #$output:lv2 "/lib"))
-                (copy-recursively (string-append build-type "/LV2")
-                                  (string-append #$output:lv2 "/lib"))
-                (mkdir-p (string-append #$output:vst3 "/lib"))
-                (copy-recursively (string-append build-type "/VST3")
-                                  (string-append #$output:vst3 "/lib"))))))))
-    (inputs
-     (list alsa-lib
-           freetype
-           gtk+
-           jack-2
-           libx11
-           libxcursor
-           libxext
-           libxinerama
-           libxrandr
-           libxrender
-           lv2
-           mesa))
-    (native-inputs
-     (list pkg-config))
-    (outputs '("out" "lv2" "clap" "vst3"))
-    (home-page "https://asb2m10.github.io/dexed/")
-    (synopsis "Frequency modulation (FM) plugin synthesizer")
-    (description
-     "Dexed is a multi-platform, multi-format plugin synthesizer.  The sound
-engine is closely modeled on the original Yamaha DX7 characteristics.  Dexed
-is also a MIDI cartridge librarian/manager for the DX7.  Features include:
-
-@enumerate
-@item 144 DAW automatable DX7 parameters available from one single panel;
-@item It fully supports DX7 input and output Sysex messages; including
-  controller change. This means that you can use this with a native DX7/TX7 as
-  a patch editor and sysex manager.
-@item Every FM operator has a realtime VU meter to know which one is active.
-@item It can load/save any DX7/TX7 sysex programs.  It is also possible to
-  save a single program into a different sysex file.
-@end enumerate
-
-Dexed can be configured to use some of the original math limitation of a DX
-synthesizer. This does not only apply to the DAC, it also involves the bit
-resolution of the sine waves and the way that the amplitude is applied to each
-operator.  Dexed comes with three engine types:
-
-@enumerate
-@item Modern: this is the original 24-bit implementation.
-@item Mark I: Based on the OPL Series but at a higher resolution (LUT are
-  10-bits).  The target of this engine is to be closest to the real DX7.
-@item OPL Series: this is an experimental 8-bit implementation of the reversed
-  engineered OPL family chips.
-@end enumerate
-")
-    (license license:gpl3+)))
-
 (define-public dsp
  (package
    (name "dsp")
@@ -1209,7 +1064,7 @@ PulseAudio clients, featuring:
 (define-public ardour
  (package
    (name "ardour")
-    (version "9.1")
+    (version "8.12")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1226,7 +1081,7 @@ PulseAudio clients, featuring:
 namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
              (sha256
               (base32
-                "00bramm8dq0ihr376n7l9rg0mjzxmzw6lxvsbsdlrdsimfwsy16p"))
+                "1cbsgdzhvnjwqgxbjk7ydcqaq6m87qm463ccwlvz1h6wkm1h3270"))
              (file-name (git-file-name name version))))
    (build-system waf-build-system)
    (arguments
@@ -1234,6 +1089,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
      #:configure-flags
      '(list "--optimize"
             "--no-phone-home"          ;don't contact ardour.org
+             "--no-ytk"                 ;don't use bundled GTK2
             "--freedesktop"            ;build .desktop file
             "--test"                   ;build unit tests
             "--use-external-libs")     ;use system libraries
@@ -1827,7 +1683,7 @@ plugins are provided.")
                            (string-append #$output "/share/applications/")))))))
    (inputs
     (list python
-           python-dbus-1.2
+           python-dbus
           python-jack-client
           python-pyqt-6
           python-requests))
@@ -3286,7 +3142,7 @@ synchronous execution of all clients, and low latency operation.")
           expat
           libsamplerate
           opus
-           python-dbus-1.2
+           python-dbus
           readline))
    (native-inputs
     (list pkg-config))
@@ -3426,41 +3282,6 @@ from being able to mix multiple JACK audio streams.")
    (home-page "https://rdio.space/jackmixer/")
    (license license:gpl2+)))

-(define-public pipemixer
-  (package
-    (name "pipemixer")
-    (version "0.4.1")
-    (source
-     (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/heather7283/pipemixer")
-            (commit (string-append "v" version))))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32 "08ji4lg24flzi6g3yaavfq8hz3kr98q2ripk5m4qk9z172qxbbc9"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-pw-device
-            (lambda _
-              (substitute* "src/pw/device.c"
-                ;; TODO: Report upstream:
-                ;; ../source/src/pw/device.c:328:80: error: expected
-                ;; ‘;’ before ‘{’ token
-                (("iter\\) \\{") "iter); {")))))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list libinih ncurses pipewire-minimal-1.4))
-    (synopsis "TUI volume control app for pipewire.")
-    (description "This is a TUI volume control application for pipewire built with
-ncurses. Heavily inspired by pulsemixer and pwvucontrol.")
-    (home-page "https://github.com/heather7283/pipemixer")
-    (license license:gpl3)))
-
 (define-public jalv
  (package
    (name "jalv")
@@ -3553,7 +3374,7 @@ together.")
       (method url-fetch)
       ;; Since the official link is dead,
       ;; we download the tarball from Debian or Internet Archive.
-       (uri (list (string-append "http://deb.debian.org"
+       (uri (list (string-append "http://http.debian.net"
                                 "/debian/pool/main/l/ladspa-sdk/ladspa-sdk_"
                                 version ".orig.tar.gz")
                  (string-append "https://web.archive.org/web/20140717172251/"
@@ -4915,18 +4736,7 @@ general purpose DVD/HD-DVD/Blu-ray disc dumper.")
                                  version
                                  ".tar.gz"))
              (sha256 (base32
-                       "074zj8ydp05yy1hjcglfv3hkvj4cm50f9nralka1992pm6yf8yvy"))
-              (snippet
-               #~(begin
-                   (use-modules (ice-9 textual-ports))
-                   (let* ((sndlibextra.c "src/sndlibextra.c")
-                          (sndlibextra.c-original
-                           (call-with-input-file sndlibextra.c
-                             get-string-all)))
-                     (call-with-output-file sndlibextra.c
-                       (lambda (port)
-                         (display "#include <stdlib.h>\n" port)
-                         (display sndlibextra.c-original port))))))))
+                       "074zj8ydp05yy1hjcglfv3hkvj4cm50f9nralka1992pm6yf8yvy"))))
    (build-system gnu-build-system)
    (native-inputs
     (list autoconf automake pkg-config libtool))
@@ -6202,56 +6012,6 @@ Python projects to scan and/or tag audio files.")
    ;; 'setup.py' claims LGPL2+, 'LICENSE' is LGPLv2.1.
    (license license:lgpl2.1+)))

-(define-public rsgain
-  (package
-    (name "rsgain")
-    (version "3.6")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/complexlogic/rsgain.git")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1bnpmm3bxij0l54i39vr70q3l1gdaac3l4vdv76pcdk9nlydmavn"))
-              (modules '((guix build utils)))
-              (snippet
-               ;; Remove bundled dependencies.
-               #~(delete-file-recursively "src/external"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:tests? #f            ;no tests
-      #:configure-flags
-      #~(list "-DINSTALL_MANPAGE=ON")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'link-unbundled-libraries
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "CMakeLists.txt"
-                (("find_package(PkgConfig MODULE REQUIRED)" all)
-                 (string-append all "\nfind_package (CRCpp REQUIRED)")))
-              (substitute* "src/tag.cpp"
-                (("external/CRC.h")
-                 "CRC.h")))))))
-    (native-inputs (list pkg-config gzip))
-    (inputs
-     (list crcpp
-           ffmpeg
-           fmt
-           libebur128
-           libinih
-           taglib
-           zlib))
-    (home-page "https://github.com/complexlogic/rsgain")
-    (synopsis "ReplayGain 2.0 tagging utility")
-    (description "This package provides @acronym{rsgain, really simple gain}, a
-ReplayGain 2.0 command line utility.  rsgain applies loudness metadata tags to
-files, while leaving the audio stream untouched.  A ReplayGain-compatible player
-will dynamically adjust the volume of tagged files during playback.")
-    (license license:bsd-2)))
-
 (define-public filteraudio
  (let ((revision "1")
        (commit "2fc669581e2a0ff87fba8de85861b49133306094"))
@@ -6868,7 +6628,7 @@ bluetooth profile.")
 (define-public libopenshot-audio
  (package
    (name "libopenshot-audio")
-    (version "0.5.0")
+    (version "0.4.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -6877,7 +6637,7 @@ bluetooth profile.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "16nn5bnl27s4hr7vmhmjvh6i6abz6484hwypib49j4vadgdayyhn"))))
+                "0m6a0g6y464ypcza1wfaik77x26lfdmkb5k735f7v8463r7qhd0m"))))
    (build-system cmake-build-system)
    (inputs
     (list alsa-lib
@@ -7282,7 +7042,7 @@ default and preferred audio driver but also supports native drivers like ALSA.")
                     ;; yabridge-host-32.exe and yabridge-host-32.exe.so.  On
                     ;; 64bit system do not enable it since gcc does not
                     ;; support multilib.
-                     (if #$(target-32bit?) "-Dbitbridge=true" '()))
+                     (if (not #$(target-64bit?)) "-Dbitbridge=true" '()))
           #:phases
           #~(modify-phases %standard-phases
               (add-after 'unpack 'copy-vst3sdk
@@ -7662,20 +7422,6 @@ digital radio.")
    (home-page "https://www.rowetel.com/?page_id=452")
    (license license:lgpl2.1)))

-(define-public codec2-1
-  (package
-    (inherit codec2)
-    (version "1.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/drowe67/codec2")
-             (commit version)))
-       (file-name (git-file-name "codec2" version))
-       (sha256
-        (base32 "00rx0p8b01ycb6lgp859cp1x165zf65qpnm72ry5z0fcipi2klzb"))))))
-
 (define-public mbelib
  ;; No release since 2016, use commit directly.
  (let ((commit "9a04ed5c78176a9965f3d43f7aa1b1f5330e771f")
@@ -7687,8 +7433,8 @@ digital radio.")
       (origin
         (method git-fetch)
         (uri (git-reference
-                (url "https://github.com/szechyjs/mbelib")
-                (commit commit)))
+               (url "https://github.com/szechyjs/mbelib")
+               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
          (base32 "0a7xmf87xnjzm5b437j2vnwv39x0ascja1j04c5wj6xs1529gw8h"))))
@@ -8119,7 +7865,7 @@ and DSD streams.")
 (define-public qpwgraph
  (package
    (name "qpwgraph")
-    (version "0.9.9")
+    (version "0.9.8")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -8128,7 +7874,7 @@ and DSD streams.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "03001pvcbvr206k00751232gm50x1icf086z8c5hiakl2ym79gwl"))))
+                "1d45qzjiixjmzjpaa04qvnz69bpf6dhlcq56zrgps507rr413fbx"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f))                ; no tests
@@ -44,7 +44,7 @@
 (define-public libcotp
  (package
    (name "libcotp")
-    (version "4.0.0")
+    (version "3.1.0")
    (source
     (origin
       (method git-fetch)
@@ -53,7 +53,7 @@
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0p5z04klbb3p9ljkz6qmdb4fk9sx79yv7zcac005c0zk875pz1py"))))
+        (base32 "1lw15blzzds3qq4ydhi6fsk189p1rbvzy5fzz4r3fv6wlmcyyprs"))))
    (build-system cmake-build-system)
    (arguments `(#:tests? #f))
    ;; TODO: tests:
@@ -143,6 +143,7 @@ PSKC (RFC6030) to manage secret key data.")
    (build-system go-build-system)
    (arguments
     (list
+      #:go go-1.23
      #:install-source? #f
      #:import-path "github.com/google/oauth2l"
      #:test-flags
@@ -160,9 +161,7 @@ PSKC (RFC6030) to manage secret key data.")
                     "TestServiceAccountImpersonationFlow/fetch._sso.*"
                     "TestStsFlow/fetch._2lo._sts"
                     "TestStsFlow/fetch._sso._sts")
-               "|")
-              ;; go 1.24 runs -vet by default, but oauth2l isn't ready
-              "-vet=off")
+               "|"))
      #:phases
      #~(modify-phases %standard-phases
          (add-before 'check 'pre-check
@@ -38,29 +38,25 @@ Historically, this used to be the package name followed by \"-autoloads.el\".
 As of Emacs 29, the term \"loaddefs\" is preferred over \"autoloads\",
 but they function much in the same manner.")

+(defun guix-emacs-find-autoloads (directory)
+  "Return a list of files containing autoload definitions in DIRECTORY.
+The files in the list do not have extensions (.el, .elc)."
+  ;; `directory-files' doesn't honor group in regexp.
+  (delete-dups (mapcar #'file-name-sans-extension
+                       (directory-files directory 'full-name
+                                        guix-emacs-autoloads-regexp))))
+
 (defcustom guix-emacs-verbose nil
  "Set to true to provide verbose messages, such as when loading packages."
  :type 'boolean
  :group 'guix-emacs)

-(defun guix-emacs-find-autoloads (directory)
-  "Return a list of files containing autoload definitions in DIRECTORY.
-The files in the list do not have extensions (.el, .elc)."
-  ;; `directory-files' doesn't honor group in regexp.
-  (if (file-directory-p directory)
-      (delete-dups (mapcar #'file-name-sans-extension
-                           (directory-files directory 'full-name
-                                            guix-emacs-autoloads-regexp)))
-    (when guix-emacs-verbose
-      (message "Ignoring nonexistent load-path directory: %s" directory)
-      nil)))
-
 (defun guix-emacs--load-file-no-error (file)
-  "Load FILE, ignoring any errors."
+  "Load FILE, ignoring any errors"
  (load file 'noerror (not guix-emacs-verbose)))

-(defsubst guix-emacs--non-core-load-path ()
-  "Filter out core Elisp directories, which are already handled by Emacs."
+(defun guix-emacs--non-core-load-path ()
+  ;; Filter out core Elisp directories, which are already handled by Emacs.
  (seq-filter (lambda (dir)
                (string-match-p "/share/emacs/site-lisp" dir))
              load-path))
@@ -111,7 +107,7 @@ found in `load-path' to discover newly installed packages."
 ;; If emacs built with tree-sitter, read the value of the environment variable
 ;; to make tree-sitter grammars available in emacs out-of-the-box.
 (with-eval-after-load 'treesit
-  (when-let* ((grammar-path (getenv "TREE_SITTER_GRAMMAR_PATH")))
+  (when-let ((grammar-path (getenv "TREE_SITTER_GRAMMAR_PATH")))
    (mapcar (lambda (x) (add-to-list 'treesit-extra-load-path x))
            (split-string grammar-path ":"))))

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 6.18.0 Kernel Configuration
+# Linux/i386 6.17.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.3.0"
 CONFIG_CC_IS_GCC=y
@@ -17,7 +17,6 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_ASSUME=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
 CONFIG_PAHOLE_VERSION=129
@@ -354,6 +353,7 @@ CONFIG_XEN=y
 CONFIG_XEN_PVHVM=y
 CONFIG_XEN_PVHVM_SMP=y
 CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_XEN_PVH=y
 CONFIG_KVM_GUEST=y
@@ -416,6 +416,9 @@ CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=8
 CONFIG_NR_CPUS_DEFAULT=8
 CONFIG_NR_CPUS=8
+CONFIG_SCHED_CLUSTER=y
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
@@ -448,7 +451,6 @@ CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INITRD32=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
-# CONFIG_MICROCODE_DBG is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_HIGHMEM4G=y
@@ -755,7 +757,7 @@ CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=m
 CONFIG_HAVE_KVM_NO_POLL=y
-CONFIG_VIRT_XFER_TO_GUEST_WORK=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_HAVE_KVM_PM_NOTIFIER=y
 CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
 CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
@@ -795,6 +797,10 @@ CONFIG_X86_DISABLED_FEATURE_IBT=y
 CONFIG_X86_DISABLED_FEATURE_FRED=y
 CONFIG_X86_DISABLED_FEATURE_SEV_SNP=y
 CONFIG_X86_DISABLED_FEATURE_INVLPGB=y
+CONFIG_AS_AVX512=y
+CONFIG_AS_GFNI=y
+CONFIG_AS_VAES=y
+CONFIG_AS_VPCLMULQDQ=y
 CONFIG_AS_WRUSS=y
 CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
 CONFIG_ARCH_HAS_DMA_OPS=y
@@ -803,12 +809,6 @@ CONFIG_ARCH_HAS_DMA_OPS=y
 # General architecture-dependent options
 #
 CONFIG_HOTPLUG_SMT=y
-CONFIG_ARCH_SUPPORTS_SCHED_SMT=y
-CONFIG_ARCH_SUPPORTS_SCHED_CLUSTER=y
-CONFIG_ARCH_SUPPORTS_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_CLUSTER=y
-CONFIG_SCHED_MC=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 CONFIG_HOTPLUG_CORE_SYNC_FULL=y
@@ -936,7 +936,6 @@ CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
 CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
 CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
 CONFIG_ARCH_VMLINUX_NEEDS_RELOCS=y
-CONFIG_HAVE_GENERIC_TIF_BITS=y

 #
 # GCOV-based kernel profiling
@@ -1070,6 +1069,7 @@ CONFIG_COREDUMP=y
 #
 # Memory Management options
 #
+CONFIG_ZPOOL=y
 CONFIG_SWAP=y
 CONFIG_ZSWAP=y
 # CONFIG_ZSWAP_DEFAULT_ON is not set
@@ -1081,18 +1081,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc"
 CONFIG_ZSMALLOC=y
-
-#
-# Zsmalloc allocator options
-#
-
-#
-# Zsmalloc is a common backend allocator for zswap & zram
-#
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
-# end of Zsmalloc allocator options

 #
 # Slab allocator options
@@ -1137,7 +1130,6 @@ CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-# CONFIG_PERSISTENT_HUGE_ZERO_FOLIO is not set
 CONFIG_MM_ID=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
@@ -1180,7 +1172,6 @@ CONFIG_ANON_VMA_NAME=y
 CONFIG_USERFAULTFD=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_EXECMEM=y
-CONFIG_FIND_NORMAL_PAGE=y

 #
 # Data Access Monitoring
@@ -1192,6 +1183,7 @@ CONFIG_DAMON_SYSFS=y
 CONFIG_DAMON_RECLAIM=y
 CONFIG_DAMON_LRU_SORT=y
 # CONFIG_DAMON_STAT is not set
+# CONFIG_DAMON_STAT_ENABLED_DEFAULT is not set
 # end of Data Access Monitoring
 # end of Memory Management options

@@ -1210,7 +1202,6 @@ CONFIG_NET_CRC32C=y
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
-# CONFIG_INET_PSP is not set
 CONFIG_UNIX=y
 CONFIG_AF_UNIX_OOB=y
 CONFIG_UNIX_DIAG=m
@@ -1231,7 +1222,7 @@ CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 # CONFIG_XFRM_IPTFS is not set
-# CONFIG_DIBS is not set
+# CONFIG_SMC is not set
 CONFIG_XDP_SOCKETS=y
 CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_NET_HANDSHAKE=y
@@ -1695,8 +1686,11 @@ CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA256=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_INET_SCTP_DIAG=m
 CONFIG_RDS=m
 CONFIG_RDS_RDMA=m
@@ -1878,6 +1872,7 @@ CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_BATMAN_V is not set
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 # CONFIG_BATMAN_ADV_TRACING is not set
@@ -1891,6 +1886,7 @@ CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
@@ -2758,7 +2754,6 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
-CONFIG_EEPROM_M24LR=m
 # end of EEPROM support

 CONFIG_CB710_CORE=m
@@ -2786,6 +2781,8 @@ CONFIG_PVPANIC=y
 CONFIG_PVPANIC_MMIO=m
 CONFIG_PVPANIC_PCI=m
 CONFIG_GP_PCI1XXXX=m
+CONFIG_AMD_SBRMI_I2C=m
+CONFIG_AMD_SBRMI_HWMON=y
 # end of Misc devices

 #
@@ -2880,6 +2877,7 @@ CONFIG_SCSI_MYRB=m
 CONFIG_SCSI_MYRS=m
 CONFIG_VMWARE_PVSCSI=m
 CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
@@ -3068,8 +3066,6 @@ CONFIG_ATA_GENERIC=y
 CONFIG_PATA_LEGACY=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
-CONFIG_MD_BITMAP=y
-# CONFIG_MD_LLBITMAP is not set
 CONFIG_MD_AUTODETECT=y
 CONFIG_MD_BITMAP_FILE=y
 CONFIG_MD_LINEAR=m
@@ -3119,7 +3115,6 @@ CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_INTEGRITY=m
 CONFIG_DM_ZONED=m
 CONFIG_DM_AUDIT=y
-# CONFIG_DM_PCACHE is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -3278,7 +3273,6 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_REALTEK=m
-# CONFIG_NET_DSA_KS8995 is not set
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
 CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
@@ -3414,10 +3408,8 @@ CONFIG_HINIC=m
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_LIBETH=m
-CONFIG_LIBETH_XDP=m
 CONFIG_LIBIE=m
 CONFIG_LIBIE_ADMINQ=m
-CONFIG_LIBIE_FWLOG=m
 CONFIG_E100=m
 CONFIG_E1000=m
 CONFIG_E1000E=m
@@ -3650,7 +3642,6 @@ CONFIG_FDDI=y
 CONFIG_DEFXX=m
 CONFIG_SKFP=m
 # CONFIG_HIPPI is not set
-CONFIG_MDIO_BUS=y
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
@@ -3724,10 +3715,10 @@ CONFIG_DP83TD510_PHY=m
 CONFIG_DP83TG720_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
 CONFIG_PSE_CONTROLLER=y
 CONFIG_PSE_REGULATOR=m
 # CONFIG_PSE_PD692X0 is not set
-# CONFIG_PSE_SI3474 is not set
 # CONFIG_PSE_TPS23881 is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_VCAN=m
@@ -3788,7 +3779,6 @@ CONFIG_CAN_F81604=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
-# CONFIG_CAN_NCT6694 is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
 # end of CAN USB interfaces
@@ -3804,6 +3794,7 @@ CONFIG_MCTP_TRANSPORT_I3C=m
 CONFIG_MCTP_TRANSPORT_USB=m
 # end of MCTP Device Drivers

+CONFIG_MDIO_BUS=y
 CONFIG_FWNODE_MDIO=y
 CONFIG_ACPI_MDIO=y
 CONFIG_MDIO_BITBANG=m
@@ -4245,6 +4236,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=y
 CONFIG_NETDEV_LEGACY_INIT=y
@@ -4305,12 +4297,12 @@ CONFIG_KEYBOARD_DLINK_DIR685=m
 CONFIG_KEYBOARD_LKKBD=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
 CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
 CONFIG_KEYBOARD_LM8333=m
 CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MAX7360=m
 CONFIG_KEYBOARD_MPR121=m
 CONFIG_KEYBOARD_NEWTON=m
 CONFIG_KEYBOARD_OPENCORES=m
@@ -4434,10 +4426,8 @@ CONFIG_TOUCHSCREEN_GOODIX=m
 # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
 # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
 CONFIG_TOUCHSCREEN_HIDEEP=m
-# CONFIG_TOUCHSCREEN_HIMAX_HX852X is not set
 CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
 CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
-# CONFIG_TOUCHSCREEN_HYNITRON_CST816X is not set
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_ILITEK=m
 CONFIG_TOUCHSCREEN_S6SY761=m
@@ -4521,12 +4511,10 @@ CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_ARIZONA_HAPTICS=m
 CONFIG_INPUT_ATC260X_ONKEY=m
-# CONFIG_INPUT_AW86927 is not set
 CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_CS40L50_VIBRA=m
 CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_PCSPKR=m
-# CONFIG_INPUT_MAX7360_ROTARY is not set
 CONFIG_INPUT_MAX77693_HAPTIC=m
 CONFIG_INPUT_MAX8925_ONKEY=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
@@ -4546,7 +4534,6 @@ CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_REGULATOR_HAPTIC=m
 CONFIG_INPUT_RETU_PWRBUTTON=m
-# CONFIG_INPUT_TPS6594_PWRBUTTON is not set
 CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
@@ -4614,6 +4601,7 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
@@ -4882,8 +4870,6 @@ CONFIG_I2C_XILINX=m
 CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_DLN2=m
 CONFIG_I2C_LJCA=m
-# CONFIG_I2C_NCT6694 is not set
-# CONFIG_I2C_USBIO is not set
 CONFIG_I2C_CP2615=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PCI1XXXX=m
@@ -4911,7 +4897,6 @@ CONFIG_I2C_SLAVE_EEPROM=m
 # end of I2C support

 CONFIG_I3C=m
-# CONFIG_ADI_I3C_MASTER is not set
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
 CONFIG_SVC_I3C_MASTER=m
@@ -4954,7 +4939,6 @@ CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SIFIVE=m
 CONFIG_SPI_MXIC=m
 CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_VIRTIO=m
 CONFIG_SPI_XCOMM=m
 CONFIG_SPI_XILINX=m
 CONFIG_SPI_ZYNQMP_GQSPI=m
@@ -5023,7 +5007,6 @@ CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_VMW is not set
 CONFIG_PTP_1588_CLOCK_OCP=m
 CONFIG_PTP_DFL_TOD=m
-CONFIG_PTP_NETC_V4_TIMER=m
 # end of PTP clock support

 #
@@ -5036,9 +5019,7 @@ CONFIG_ZL3073X_SPI=m
 # end of DPLL device support

 CONFIG_PINCTRL=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
@@ -5046,12 +5027,10 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_AMDISP=m
 CONFIG_PINCTRL_CY8C95X0=m
 # CONFIG_PINCTRL_DA9062 is not set
-# CONFIG_PINCTRL_MAX7360 is not set
 CONFIG_PINCTRL_MCP23S08_I2C=m
 CONFIG_PINCTRL_MCP23S08_SPI=m
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SX150X=y
-CONFIG_PINCTRL_UPBOARD=m
 CONFIG_PINCTRL_MADERA=m

 #
@@ -5164,8 +5143,6 @@ CONFIG_GPIO_LJCA=m
 CONFIG_GPIO_LP3943=m
 CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_MADERA=m
-# CONFIG_GPIO_MAX7360 is not set
-# CONFIG_GPIO_NCT6694 is not set
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_TIMBERDALE=y
@@ -5210,7 +5187,6 @@ CONFIG_GPIO_XRA1403=m
 #
 CONFIG_GPIO_VIPERBOARD=m
 CONFIG_GPIO_MPSSE=m
-CONFIG_GPIO_USBIO=m
 # end of USB GPIO expanders

 #
@@ -5279,7 +5255,6 @@ CONFIG_POWER_SEQUENCING=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
-CONFIG_ADC_BATTERY_HELPER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_IP5XXX_POWER=m
 CONFIG_MAX8925_POWER=m
@@ -5296,7 +5271,6 @@ CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2781=m
 CONFIG_BATTERY_DS2782=m
 # CONFIG_BATTERY_SAMSUNG_SDI is not set
-CONFIG_BATTERY_INTEL_DC_TI=m
 CONFIG_BATTERY_SBS=m
 CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
@@ -5425,7 +5399,6 @@ CONFIG_SENSORS_FTSTEUTATES=m
 CONFIG_SENSORS_GIGABYTE_WATERFORCE=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
-# CONFIG_SENSORS_GPD is not set
 CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_HIH6130=m
@@ -5501,7 +5474,6 @@ CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT6683=m
-# CONFIG_SENSORS_NCT6694 is not set
 CONFIG_SENSORS_NCT6775_CORE=m
 CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT6775_I2C=m
@@ -5553,10 +5525,8 @@ CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MP2856=m
-CONFIG_SENSORS_MP2869=m
 CONFIG_SENSORS_MP2888=m
 CONFIG_SENSORS_MP2891=m
-CONFIG_SENSORS_MP29502=m
 CONFIG_SENSORS_MP2975=m
 CONFIG_SENSORS_MP2993=m
 # CONFIG_SENSORS_MP2975_REGULATOR is not set
@@ -5736,7 +5706,6 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_NCT6694_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
@@ -5901,7 +5870,6 @@ CONFIG_MFD_MT6360=m
 CONFIG_MFD_MT6370=m
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_MENF21BMC=m
-CONFIG_MFD_NCT6694=m
 CONFIG_MFD_OCELOT=m
 CONFIG_EZX_PCAP=y
 CONFIG_MFD_VIPERBOARD=m
@@ -5921,7 +5889,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_LP3943=m
 CONFIG_MFD_LP8788=y
 CONFIG_MFD_TI_LMU=m
-# CONFIG_MFD_BQ257XX is not set
 CONFIG_MFD_PALMAS=y
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
@@ -5968,7 +5935,6 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m
 CONFIG_MFD_INTEL_M10_BMC_PMCI=m
 CONFIG_MFD_QNAP_MCU=m
 CONFIG_MFD_UPBOARD_FPGA=m
-CONFIG_MFD_MAX7360=m
 # end of Multifunction device drivers

 CONFIG_REGULATOR=y
@@ -6027,7 +5993,6 @@ CONFIG_REGULATOR_MAX20086=m
 CONFIG_REGULATOR_MAX20411=m
 CONFIG_REGULATOR_MAX77693=m
 CONFIG_REGULATOR_MAX77826=m
-CONFIG_REGULATOR_MAX77838=m
 CONFIG_REGULATOR_MC13XXX_CORE=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
@@ -6047,7 +6012,6 @@ CONFIG_REGULATOR_PALMAS=m
 CONFIG_REGULATOR_PCA9450=m
 CONFIG_REGULATOR_PF9453=m
 CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_PF0900=m
 CONFIG_REGULATOR_PV88060=m
 CONFIG_REGULATOR_PV88080=m
 CONFIG_REGULATOR_PV88090=m
@@ -6454,6 +6418,7 @@ CONFIG_RADIO_TEA575X=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_TEF6862=m
 CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_KEENE=m
 CONFIG_USB_MA901=m
@@ -6652,7 +6617,6 @@ CONFIG_VIDEO_CCS_PLL=m
 CONFIG_VIDEO_ALVIUM_CSI2=m
 CONFIG_VIDEO_AR0521=m
 CONFIG_VIDEO_GC0308=m
-# CONFIG_VIDEO_GC0310 is not set
 CONFIG_VIDEO_GC05A2=m
 CONFIG_VIDEO_GC08A3=m
 CONFIG_VIDEO_GC2145=m
@@ -6676,9 +6640,9 @@ CONFIG_VIDEO_MT9M114=m
 CONFIG_VIDEO_MT9P031=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_OG01A1B=m
-CONFIG_VIDEO_OG0VE1B=m
 CONFIG_VIDEO_OV01A10=m
 CONFIG_VIDEO_OV02A10=m
 CONFIG_VIDEO_OV02E10=m
@@ -6691,7 +6655,6 @@ CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV2659=m
 CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV2685=m
-CONFIG_VIDEO_OV2735=m
 CONFIG_VIDEO_OV2740=m
 CONFIG_VIDEO_OV4689=m
 CONFIG_VIDEO_OV5647=m
@@ -6700,8 +6663,8 @@ CONFIG_VIDEO_OV5670=m
 CONFIG_VIDEO_OV5675=m
 CONFIG_VIDEO_OV5693=m
 CONFIG_VIDEO_OV5695=m
-CONFIG_VIDEO_OV6211=m
 CONFIG_VIDEO_OV64A40=m
+CONFIG_VIDEO_OV6650=m
 CONFIG_VIDEO_OV7251=m
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
@@ -7222,6 +7185,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 # CONFIG_NOUVEAU_DEBUG_PUSH is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set
 CONFIG_DRM_NOUVEAU_CH7006=m
 CONFIG_DRM_NOUVEAU_SIL164=m
 CONFIG_DRM_I915=m
@@ -7304,7 +7268,6 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_PANEL_MIPI_DBI=m
-CONFIG_DRM_PIXPAPER=m
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9163=m
 CONFIG_TINYDRM_ILI9225=m
@@ -7323,6 +7286,7 @@ CONFIG_DRM_ST7735R=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X_SPI=m
+CONFIG_DRM_HYPERV=m
 CONFIG_DRM_PANEL_BACKLIGHT_QUIRKS=m
 CONFIG_DRM_PRIVACY_SCREEN=y
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
@@ -7412,6 +7376,7 @@ CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_HYPERV=m
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=m
 CONFIG_FB_SM712=m
@@ -7422,7 +7387,6 @@ CONFIG_FB_DDC=m
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CFB_REV_PIXELS_IN_BYTE=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
@@ -7433,6 +7397,7 @@ CONFIG_FB_DMAMEM_HELPERS=y
 CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
 CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
+CONFIG_FB_IOMEM_HELPERS_DEFERRED=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 CONFIG_FB_BACKLIGHT=y
@@ -7784,7 +7749,6 @@ CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_US144MKII=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_BCD2000=m
@@ -8243,7 +8207,6 @@ CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_ES8375=m
 CONFIG_SND_SOC_ES8389=m
-# CONFIG_SND_SOC_FS210X is not set
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDA=m
@@ -8265,7 +8228,6 @@ CONFIG_SND_SOC_MAX9860=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_PCM1681=m
-# CONFIG_SND_SOC_PCM1754 is not set
 CONFIG_SND_SOC_PCM1789=m
 CONFIG_SND_SOC_PCM1789_I2C=m
 CONFIG_SND_SOC_PCM179X=m
@@ -8443,7 +8405,6 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=m
-CONFIG_HID_HAPTIC=y

 #
 # Special HID drivers
@@ -8563,6 +8524,7 @@ CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=m
@@ -8848,7 +8810,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_LJCA=m
-CONFIG_USB_USBIO=m
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
@@ -9302,7 +9263,6 @@ CONFIG_RTC_DRV_MAX8925=m
 CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX31335=m
-CONFIG_RTC_DRV_NCT6694=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
@@ -9397,13 +9357,13 @@ CONFIG_RTC_DRV_FTRTC010=m
 CONFIG_RTC_DRV_PCAP=m
 CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_RTC_DRV_MT6397=m
-CONFIG_RTC_DRV_GOLDFISH=m
-CONFIG_RTC_DRV_WILCO_EC=m

 #
 # HID Sensor RTC drivers
 #
 CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_GOLDFISH=m
+CONFIG_RTC_DRV_WILCO_EC=m
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set

@@ -9460,6 +9420,7 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
 CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
 CONFIG_UIO_DFL=m
 CONFIG_VFIO=m
 CONFIG_VFIO_GROUP=y
@@ -9533,7 +9494,10 @@ CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
 #
 # Microsoft Hyper-V guest support
 #
-# CONFIG_HYPERV is not set
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
 # end of Microsoft Hyper-V guest support

 #
@@ -9635,7 +9599,6 @@ CONFIG_COMEDI_ADDI_APCI_3120=m
 CONFIG_COMEDI_ADDI_APCI_3501=m
 CONFIG_COMEDI_ADDI_APCI_3XXX=m
 CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7250=m
 CONFIG_COMEDI_ADL_PCI7X3X=m
 CONFIG_COMEDI_ADL_PCI8164=m
 CONFIG_COMEDI_ADL_PCI9111=m
@@ -9850,7 +9813,6 @@ CONFIG_HUAWEI_WMI=m
 CONFIG_MXM_WMI=m
 CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
 CONFIG_XIAOMI_WMI=m
-CONFIG_REDMI_WMI=m
 CONFIG_GIGABYTE_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ACER_WIRELESS=m
@@ -10053,6 +10015,7 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
 # CONFIG_INTEL_IOMMU_PERF_EVENTS is not set
 # CONFIG_IOMMUFD is not set
+CONFIG_HYPERV_IOMMU=y
 CONFIG_VIRTIO_IOMMU=m

 #
@@ -10185,7 +10148,6 @@ CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_MAX77693=m
 CONFIG_EXTCON_MAX77843=m
 CONFIG_EXTCON_MAX8997=m
-CONFIG_EXTCON_MAX14526=m
 CONFIG_EXTCON_PALMAS=m
 CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_RT8973A=m
@@ -10283,7 +10245,6 @@ CONFIG_STK8BA50=m
 #
 # Analog to digital converters
 #
-CONFIG_IIO_ADC_HELPER=m
 CONFIG_AD_SIGMA_DELTA=m
 CONFIG_AD4000=m
 CONFIG_AD4030=m
@@ -10323,7 +10284,6 @@ CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
 # CONFIG_AD9467 is not set
-CONFIG_ADE9000=m
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
@@ -10334,7 +10294,6 @@ CONFIG_ENVELOPE_DETECTOR=m
 CONFIG_HI8435=m
 CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
-CONFIG_INTEL_DC_TI_ADC=m
 CONFIG_INTEL_MRFLD_ADC=m
 CONFIG_LP8788_ADC=m
 CONFIG_LTC2309=m
@@ -10370,7 +10329,6 @@ CONFIG_QCOM_VADC_COMMON=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_ROHM_BD79112=m
 # CONFIG_ROHM_BD79124 is not set
 CONFIG_RICHTEK_RTQ6056=m
 CONFIG_SD_ADC_MODULATOR=m
@@ -10746,7 +10704,6 @@ CONFIG_VCNL4035=m
 # CONFIG_VEML3235 is not set
 CONFIG_VEML6030=m
 CONFIG_VEML6040=m
-CONFIG_VEML6046X00=m
 CONFIG_VEML6070=m
 CONFIG_VEML6075=m
 CONFIG_VL6180=m
@@ -10769,7 +10726,6 @@ CONFIG_MMC35240=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_INFINEON_TLV493D=m
 CONFIG_SENSORS_HMC5843=m
 CONFIG_SENSORS_HMC5843_I2C=m
 CONFIG_SENSORS_HMC5843_SPI=m
@@ -10943,7 +10899,6 @@ CONFIG_NTB_MSI_TEST=m
 CONFIG_NTB_TRANSPORT=m
 CONFIG_PWM=y
 # CONFIG_PWM_DEBUG is not set
-# CONFIG_PWM_PROVIDE_GPIO is not set
 CONFIG_PWM_CLK=m
 CONFIG_PWM_CRC=y
 CONFIG_PWM_CROS_EC=m
@@ -10955,7 +10910,6 @@ CONFIG_PWM_LP3943=m
 CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
-# CONFIG_PWM_MAX7360 is not set
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
@@ -11123,6 +11077,7 @@ CONFIG_FS_STACK=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_LEGACY_DIRECT_IO=y
 # CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
@@ -11159,6 +11114,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_EXPERIMENTAL is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
 CONFIG_NILFS2_FS=m
 CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
@@ -11170,6 +11126,18 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_FS_COMPRESSION is not set
 # CONFIG_F2FS_IOSTAT is not set
 CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_BCACHEFS_FS=m
+# CONFIG_BCACHEFS_QUOTA is not set
+# CONFIG_BCACHEFS_ERASURE_CODING is not set
+# CONFIG_BCACHEFS_POSIX_ACL is not set
+# CONFIG_BCACHEFS_DEBUG is not set
+# CONFIG_BCACHEFS_TESTS is not set
+# CONFIG_BCACHEFS_LOCK_TIME_STATS is not set
+# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
+CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
+# CONFIG_BCACHEFS_PATH_TRACEPOINTS is not set
+# CONFIG_BCACHEFS_TRANS_KMALLOC_TRACE is not set
+# CONFIG_BCACHEFS_ASYNC_OBJECT_LISTS is not set
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
@@ -11408,7 +11376,6 @@ CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DEBUG_TRACE is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
@@ -11686,6 +11653,7 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography

 #
@@ -11911,14 +11879,16 @@ CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_GF128MUL=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
 CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519_INTERNAL=m
 CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
 CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_MD5=y
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
@@ -12017,7 +11987,10 @@ CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_32=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y
+CONFIG_GENERIC_VDSO_DATA_STORE=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -12050,6 +12023,7 @@ CONFIG_ASN1_ENCODER=y
 CONFIG_POLYNOMIAL=m
 CONFIG_FIRMWARE_TABLE=y
 CONFIG_UNION_FIND=y
+CONFIG_MIN_HEAP=y

 #
 # Kernel hacking
@@ -12182,6 +12156,7 @@ CONFIG_KFENCE_STRESS_TEST_FAULTS=0
 # Debug Oops, Lockups and Hangs
 #
 # CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
@@ -12428,6 +12403,7 @@ CONFIG_TEST_OBJAGG=m
 CONFIG_TEST_OBJPOOL=m
 CONFIG_ARCH_USE_MEMTEST=y
 CONFIG_MEMTEST=y
+# CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage

 #
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.18.0-rc6 Kernel Configuration
+# Linux/x86 6.17.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.3.0"
 CONFIG_CC_IS_GCC=y
@@ -18,7 +18,6 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_ASSUME=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
 CONFIG_PAHOLE_VERSION=129
@@ -314,7 +313,6 @@ CONFIG_KEXEC_FILE=y
 # CONFIG_KEXEC_SIG is not set
 CONFIG_KEXEC_JUMP=y
 CONFIG_KEXEC_HANDOVER=y
-# CONFIG_KEXEC_HANDOVER_DEBUG is not set
 CONFIG_CRASH_DUMP=y
 # CONFIG_CRASH_DM_CRYPT is not set
 CONFIG_CRASH_HOTPLUG=y
@@ -344,6 +342,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_DYNAMIC_PHYSICAL_MASK=y
@@ -357,7 +356,7 @@ CONFIG_X86_X2APIC=y
 # CONFIG_X86_POSTED_MSI is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_CPU_RESCTRL is not set
-CONFIG_X86_FRED=y
+# CONFIG_X86_FRED is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_NUMACHIP=y
 # CONFIG_X86_VSMP is not set
@@ -384,6 +383,7 @@ CONFIG_XEN_PV_DOM0=y
 CONFIG_XEN_PVHVM=y
 CONFIG_XEN_PVHVM_SMP=y
 CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_XEN_PVH=y
 CONFIG_XEN_DOM0=y
@@ -395,7 +395,6 @@ CONFIG_PVH=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_JAILHOUSE_GUEST=y
 # CONFIG_ACRN_GUEST is not set
-CONFIG_BHYVE_GUEST=y
 CONFIG_INTEL_TDX_GUEST=y
 CONFIG_CC_HAS_MARCH_NATIVE=y
 # CONFIG_X86_NATIVE_CPU is not set
@@ -426,6 +425,9 @@ CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
 CONFIG_NR_CPUS_DEFAULT=64
 CONFIG_NR_CPUS=256
+CONFIG_SCHED_CLUSTER=y
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_ACPI_MADT_WAKEUP=y
@@ -455,7 +457,6 @@ CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_MICROCODE=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
-# CONFIG_MICROCODE_DBG is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_X86_DIRECT_GBPAGES=y
@@ -491,7 +492,6 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
 CONFIG_X86_SGX=y
 # CONFIG_X86_USER_SHADOW_STACK is not set
-# CONFIG_INTEL_TDX_HOST is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_HANDOVER_PROTOCOL=y
@@ -780,17 +780,17 @@ CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y
 CONFIG_KVM_COMPAT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=m
 CONFIG_HAVE_KVM_NO_POLL=y
-CONFIG_VIRT_XFER_TO_GUEST_WORK=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_HAVE_KVM_PM_NOTIFIER=y
 CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
 CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_KVM_ELIDE_TLB_FLUSH_IF_YOUNG=y
 CONFIG_KVM_MMU_LOCKLESS_AGING=y
 CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES=y
-CONFIG_KVM_GUEST_MEMFD=y
+CONFIG_KVM_PRIVATE_MEM=y
+CONFIG_KVM_GENERIC_PRIVATE_MEM=y
 CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE=y
 CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE=y
-CONFIG_HAVE_KVM_ARCH_GMEM_POPULATE=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM_X86=m
 CONFIG_KVM=m
@@ -826,6 +826,11 @@ CONFIG_X86_DISABLED_FEATURE_CYRIX_ARR=y
 CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y
 CONFIG_X86_DISABLED_FEATURE_LAM=y
 CONFIG_X86_DISABLED_FEATURE_USER_SHSTK=y
+CONFIG_X86_DISABLED_FEATURE_FRED=y
+CONFIG_AS_AVX512=y
+CONFIG_AS_GFNI=y
+CONFIG_AS_VAES=y
+CONFIG_AS_VPCLMULQDQ=y
 CONFIG_AS_WRUSS=y
 CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
 CONFIG_ARCH_HAS_DMA_OPS=y
@@ -834,12 +839,6 @@ CONFIG_ARCH_HAS_DMA_OPS=y
 # General architecture-dependent options
 #
 CONFIG_HOTPLUG_SMT=y
-CONFIG_ARCH_SUPPORTS_SCHED_SMT=y
-CONFIG_ARCH_SUPPORTS_SCHED_CLUSTER=y
-CONFIG_ARCH_SUPPORTS_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_CLUSTER=y
-CONFIG_SCHED_MC=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 CONFIG_HOTPLUG_CORE_SYNC_FULL=y
@@ -922,7 +921,7 @@ CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
 CONFIG_ARCH_SUPPORTS_AUTOFDO_CLANG=y
 CONFIG_ARCH_SUPPORTS_PROPELLER_CLANG=y
-CONFIG_ARCH_SUPPORTS_CFI=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK=y
@@ -996,7 +995,6 @@ CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
 CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
 CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
 CONFIG_ARCH_VMLINUX_NEEDS_RELOCS=y
-CONFIG_HAVE_GENERIC_TIF_BITS=y

 #
 # GCOV-based kernel profiling
@@ -1132,6 +1130,7 @@ CONFIG_COREDUMP=y
 #
 # Memory Management options
 #
+CONFIG_ZPOOL=y
 CONFIG_SWAP=y
 CONFIG_ZSWAP=y
 # CONFIG_ZSWAP_DEFAULT_ON is not set
@@ -1143,18 +1142,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc"
 CONFIG_ZSMALLOC=y
-
-#
-# Zsmalloc allocator options
-#
-
-#
-# Zsmalloc is a common backend allocator for zswap & zram
-#
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
-# end of Zsmalloc allocator options

 #
 # Slab allocator options
@@ -1220,7 +1212,6 @@ CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANTS_THP_SWAP=y
-# CONFIG_PERSISTENT_HUGE_ZERO_FOLIO is not set
 CONFIG_MM_ID=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
@@ -1231,7 +1222,6 @@ CONFIG_THP_SWAP=y
 # CONFIG_NO_PAGE_MAPCOUNT is not set
 CONFIG_PAGE_MAPCOUNT=y
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
-CONFIG_HAVE_GIGANTIC_FOLIOS=y
 CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
 CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
 CONFIG_ARCH_SUPPORTS_PUD_PFNMAP=y
@@ -1288,7 +1278,6 @@ CONFIG_NUMA_MEMBLKS=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_ARCH_SUPPORTS_PT_RECLAIM=y
 CONFIG_PT_RECLAIM=y
-CONFIG_FIND_NORMAL_PAGE=y

 #
 # Data Access Monitoring
@@ -1321,7 +1310,6 @@ CONFIG_NET_CRC32C=y
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
-# CONFIG_INET_PSP is not set
 CONFIG_UNIX=y
 CONFIG_AF_UNIX_OOB=y
 CONFIG_UNIX_DIAG=m
@@ -1343,7 +1331,7 @@ CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 # CONFIG_XFRM_IPTFS is not set
-# CONFIG_DIBS is not set
+# CONFIG_SMC is not set
 CONFIG_XDP_SOCKETS=y
 CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_NET_HANDSHAKE=y
@@ -1809,8 +1797,11 @@ CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA256=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_INET_SCTP_DIAG=m
 CONFIG_RDS=m
 CONFIG_RDS_RDMA=m
@@ -1992,6 +1983,7 @@ CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_BATMAN_V is not set
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 # CONFIG_BATMAN_ADV_TRACING is not set
@@ -2861,7 +2853,6 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
-CONFIG_EEPROM_M24LR=m
 # end of EEPROM support

 CONFIG_CB710_CORE=m
@@ -2875,7 +2866,6 @@ CONFIG_INTEL_MEI_ME=m
 CONFIG_INTEL_MEI_GSC=m
 CONFIG_INTEL_MEI_VSC_HW=m
 CONFIG_INTEL_MEI_VSC=m
-CONFIG_INTEL_MEI_LB=m
 # CONFIG_INTEL_MEI_HDCP is not set
 # CONFIG_INTEL_MEI_PXP is not set
 CONFIG_INTEL_MEI_GSC_PROXY=m
@@ -2894,6 +2884,8 @@ CONFIG_PVPANIC_PCI=m
 CONFIG_GP_PCI1XXXX=m
 CONFIG_KEBA_CP500=m
 CONFIG_KEBA_LAN9252=m
+CONFIG_AMD_SBRMI_I2C=m
+CONFIG_AMD_SBRMI_HWMON=y
 # end of Misc devices

 #
@@ -3166,8 +3158,6 @@ CONFIG_ATA_GENERIC=y
 CONFIG_PATA_LEGACY=m
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
-CONFIG_MD_BITMAP=y
-# CONFIG_MD_LLBITMAP is not set
 CONFIG_MD_AUTODETECT=y
 CONFIG_MD_BITMAP_FILE=y
 CONFIG_MD_LINEAR=m
@@ -3219,7 +3209,6 @@ CONFIG_DM_INTEGRITY=m
 CONFIG_DM_ZONED=m
 CONFIG_DM_AUDIT=y
 # CONFIG_DM_VDO is not set
-# CONFIG_DM_PCACHE is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -3377,7 +3366,6 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_REALTEK=m
-# CONFIG_NET_DSA_KS8995 is not set
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
 CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
@@ -3516,10 +3504,8 @@ CONFIG_HINIC3=m
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_LIBETH=m
-CONFIG_LIBETH_XDP=m
 CONFIG_LIBIE=m
 CONFIG_LIBIE_ADMINQ=m
-CONFIG_LIBIE_FWLOG=m
 CONFIG_E100=m
 CONFIG_E1000=m
 CONFIG_E1000E=m
@@ -3757,7 +3743,6 @@ CONFIG_FDDI=y
 CONFIG_DEFXX=m
 CONFIG_SKFP=m
 # CONFIG_HIPPI is not set
-CONFIG_MDIO_BUS=y
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
@@ -3831,10 +3816,10 @@ CONFIG_DP83TD510_PHY=m
 CONFIG_DP83TG720_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
 CONFIG_PSE_CONTROLLER=y
 CONFIG_PSE_REGULATOR=m
 CONFIG_PSE_PD692X0=m
-CONFIG_PSE_SI3474=m
 CONFIG_PSE_TPS23881=m
 CONFIG_CAN_DEV=m
 CONFIG_CAN_VCAN=m
@@ -3895,7 +3880,6 @@ CONFIG_CAN_F81604=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
-CONFIG_CAN_NCT6694=m
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
 # end of CAN USB interfaces
@@ -3911,6 +3895,7 @@ CONFIG_MCTP_TRANSPORT_I2C=m
 CONFIG_MCTP_TRANSPORT_USB=m
 # end of MCTP Device Drivers

+CONFIG_MDIO_BUS=y
 CONFIG_FWNODE_MDIO=y
 CONFIG_ACPI_MDIO=y
 CONFIG_MDIO_BITBANG=m
@@ -4447,12 +4432,12 @@ CONFIG_KEYBOARD_DLINK_DIR685=m
 CONFIG_KEYBOARD_LKKBD=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
 CONFIG_KEYBOARD_TCA8418=m
 CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
 CONFIG_KEYBOARD_LM8333=m
 CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MAX7360=m
 CONFIG_KEYBOARD_MPR121=m
 CONFIG_KEYBOARD_NEWTON=m
 CONFIG_KEYBOARD_OPENCORES=m
@@ -4573,10 +4558,8 @@ CONFIG_TOUCHSCREEN_GOODIX=m
 # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
 # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
 CONFIG_TOUCHSCREEN_HIDEEP=m
-CONFIG_TOUCHSCREEN_HIMAX_HX852X=m
 CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
 CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
-CONFIG_TOUCHSCREEN_HYNITRON_CST816X=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_ILITEK=m
 CONFIG_TOUCHSCREEN_S6SY761=m
@@ -4658,12 +4641,10 @@ CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_ARIZONA_HAPTICS=m
 CONFIG_INPUT_ATC260X_ONKEY=m
-# CONFIG_INPUT_AW86927 is not set
 CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_CS40L50_VIBRA=m
 CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MAX7360_ROTARY=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 CONFIG_INPUT_MAX8925_ONKEY=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
@@ -4682,7 +4663,6 @@ CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_REGULATOR_HAPTIC=m
 CONFIG_INPUT_RETU_PWRBUTTON=m
-# CONFIG_INPUT_TPS6594_PWRBUTTON is not set
 CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
@@ -5005,8 +4985,6 @@ CONFIG_I2C_XILINX=m
 CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_DLN2=m
 CONFIG_I2C_LJCA=m
-CONFIG_I2C_NCT6694=m
-CONFIG_I2C_USBIO=y
 CONFIG_I2C_CP2615=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PCI1XXXX=m
@@ -5033,7 +5011,6 @@ CONFIG_I2C_SLAVE_EEPROM=m
 # end of I2C support

 CONFIG_I3C=m
-CONFIG_ADI_I3C_MASTER=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
 CONFIG_SVC_I3C_MASTER=m
@@ -5077,7 +5054,6 @@ CONFIG_SPI_PXA2XX_PCI=m
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SIFIVE=m
 CONFIG_SPI_MXIC=m
-CONFIG_SPI_VIRTIO=m
 CONFIG_SPI_XCOMM=m
 CONFIG_SPI_XILINX=m
 CONFIG_SPI_ZYNQMP_GQSPI=m
@@ -5146,7 +5122,6 @@ CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_VMW is not set
 CONFIG_PTP_1588_CLOCK_OCP=m
 CONFIG_PTP_DFL_TOD=m
-CONFIG_PTP_NETC_V4_TIMER=m
 # end of PTP clock support

 #
@@ -5159,9 +5134,7 @@ CONFIG_ZL3073X_SPI=m
 # end of DPLL device support

 CONFIG_PINCTRL=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
@@ -5169,12 +5142,10 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_AMDISP=m
 CONFIG_PINCTRL_CY8C95X0=m
 # CONFIG_PINCTRL_DA9062 is not set
-CONFIG_PINCTRL_MAX7360=m
 CONFIG_PINCTRL_MCP23S08_I2C=m
 CONFIG_PINCTRL_MCP23S08_SPI=m
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SX150X=y
-CONFIG_PINCTRL_UPBOARD=m
 CONFIG_PINCTRL_CS42L43=m
 CONFIG_PINCTRL_MADERA=m

@@ -5288,8 +5259,6 @@ CONFIG_GPIO_LJCA=m
 CONFIG_GPIO_LP3943=m
 CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_MADERA=m
-CONFIG_GPIO_MAX7360=m
-CONFIG_GPIO_NCT6694=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_TPS65086=m
@@ -5332,7 +5301,6 @@ CONFIG_GPIO_XRA1403=m
 #
 CONFIG_GPIO_VIPERBOARD=m
 CONFIG_GPIO_MPSSE=m
-CONFIG_GPIO_USBIO=y
 # end of USB GPIO expanders

 #
@@ -5401,7 +5369,6 @@ CONFIG_POWER_SEQUENCING=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
-CONFIG_ADC_BATTERY_HELPER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_IP5XXX_POWER=m
 CONFIG_MAX8925_POWER=m
@@ -5418,7 +5385,6 @@ CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2781=m
 CONFIG_BATTERY_DS2782=m
 # CONFIG_BATTERY_SAMSUNG_SDI is not set
-CONFIG_BATTERY_INTEL_DC_TI=m
 CONFIG_BATTERY_SBS=m
 CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
@@ -5467,7 +5433,6 @@ CONFIG_CHARGER_BQ24190=m
 CONFIG_CHARGER_BQ24257=m
 CONFIG_CHARGER_BQ24735=m
 CONFIG_CHARGER_BQ2515X=m
-CONFIG_CHARGER_BQ257XX=m
 CONFIG_CHARGER_BQ25890=m
 CONFIG_CHARGER_BQ25980=m
 CONFIG_CHARGER_BQ256XX=m
@@ -5552,7 +5517,6 @@ CONFIG_SENSORS_FTSTEUTATES=m
 CONFIG_SENSORS_GIGABYTE_WATERFORCE=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_GPD=m
 CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_HIH6130=m
@@ -5628,7 +5592,6 @@ CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6694=m
 CONFIG_SENSORS_NCT6775_CORE=m
 CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT6775_I2C=m
@@ -5682,10 +5645,8 @@ CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MP2856=m
-CONFIG_SENSORS_MP2869=m
 CONFIG_SENSORS_MP2888=m
 CONFIG_SENSORS_MP2891=m
-CONFIG_SENSORS_MP29502=m
 CONFIG_SENSORS_MP2975=m
 CONFIG_SENSORS_MP2993=m
 CONFIG_SENSORS_MP2975_REGULATOR=y
@@ -5870,7 +5831,6 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_NCT6694_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
@@ -6025,7 +5985,6 @@ CONFIG_MFD_MT6360=m
 CONFIG_MFD_MT6370=m
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_MENF21BMC=m
-CONFIG_MFD_NCT6694=m
 CONFIG_MFD_OCELOT=m
 CONFIG_EZX_PCAP=y
 CONFIG_MFD_VIPERBOARD=m
@@ -6045,7 +6004,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_LP3943=m
 CONFIG_MFD_LP8788=y
 CONFIG_MFD_TI_LMU=m
-CONFIG_MFD_BQ257XX=m
 CONFIG_MFD_PALMAS=y
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
@@ -6091,7 +6049,6 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m
 CONFIG_MFD_INTEL_M10_BMC_PMCI=m
 CONFIG_MFD_QNAP_MCU=m
 CONFIG_MFD_UPBOARD_FPGA=m
-CONFIG_MFD_MAX7360=m
 # end of Multifunction device drivers

 CONFIG_REGULATOR=y
@@ -6115,7 +6072,6 @@ CONFIG_REGULATOR_AW37503=m
 CONFIG_REGULATOR_AXP20X=m
 CONFIG_REGULATOR_BCM590XX=m
 CONFIG_REGULATOR_BD9571MWV=m
-CONFIG_REGULATOR_BQ257XX=m
 CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
@@ -6151,7 +6107,6 @@ CONFIG_REGULATOR_MAX20086=m
 CONFIG_REGULATOR_MAX20411=m
 CONFIG_REGULATOR_MAX77693=m
 CONFIG_REGULATOR_MAX77826=m
-CONFIG_REGULATOR_MAX77838=m
 CONFIG_REGULATOR_MC13XXX_CORE=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
@@ -6171,7 +6126,6 @@ CONFIG_REGULATOR_PALMAS=m
 CONFIG_REGULATOR_PCA9450=m
 CONFIG_REGULATOR_PF9453=m
 CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_PF0900=m
 CONFIG_REGULATOR_PV88060=m
 CONFIG_REGULATOR_PV88080=m
 CONFIG_REGULATOR_PV88090=m
@@ -6577,6 +6531,7 @@ CONFIG_RADIO_SI476X=m
 CONFIG_RADIO_TEA575X=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_KEENE=m
 CONFIG_USB_MA901=m
@@ -6761,7 +6716,6 @@ CONFIG_VIDEO_CCS_PLL=m
 CONFIG_VIDEO_ALVIUM_CSI2=m
 CONFIG_VIDEO_AR0521=m
 CONFIG_VIDEO_GC0308=m
-CONFIG_VIDEO_GC0310=m
 CONFIG_VIDEO_GC05A2=m
 CONFIG_VIDEO_GC08A3=m
 CONFIG_VIDEO_GC2145=m
@@ -6785,9 +6739,9 @@ CONFIG_VIDEO_MT9M114=m
 CONFIG_VIDEO_MT9P031=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_OG01A1B=m
-CONFIG_VIDEO_OG0VE1B=m
 CONFIG_VIDEO_OV01A10=m
 CONFIG_VIDEO_OV02A10=m
 CONFIG_VIDEO_OV02E10=m
@@ -6800,7 +6754,6 @@ CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV2659=m
 CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV2685=m
-CONFIG_VIDEO_OV2735=m
 CONFIG_VIDEO_OV2740=m
 CONFIG_VIDEO_OV4689=m
 CONFIG_VIDEO_OV5647=m
@@ -6809,8 +6762,8 @@ CONFIG_VIDEO_OV5670=m
 CONFIG_VIDEO_OV5675=m
 CONFIG_VIDEO_OV5693=m
 CONFIG_VIDEO_OV5695=m
-CONFIG_VIDEO_OV6211=m
 CONFIG_VIDEO_OV64A40=m
+CONFIG_VIDEO_OV6650=m
 CONFIG_VIDEO_OV7251=m
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
@@ -7329,6 +7282,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 # CONFIG_NOUVEAU_DEBUG_PUSH is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set
 CONFIG_DRM_NOUVEAU_CH7006=m
 CONFIG_DRM_NOUVEAU_SIL164=m
 CONFIG_DRM_I915=m
@@ -7385,6 +7339,7 @@ CONFIG_DRM_XE_FORCE_PROBE=""
 # CONFIG_DRM_XE_DEBUG_MEMIRQ is not set
 # CONFIG_DRM_XE_DEBUG_SRIOV is not set
 # CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
 # end of drm/Xe Debugging

 #
@@ -7441,7 +7396,6 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_PANEL_MIPI_DBI=m
-CONFIG_DRM_PIXPAPER=m
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9163=m
 CONFIG_TINYDRM_ILI9225=m
@@ -7555,7 +7509,6 @@ CONFIG_FB_DDC=m
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CFB_REV_PIXELS_IN_BYTE=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
@@ -7881,7 +7834,6 @@ CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
-# CONFIG_SND_USB_US144MKII is not set
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_BCD2000=m
@@ -8351,8 +8303,6 @@ CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_ES8375=m
 CONFIG_SND_SOC_ES8389=m
-CONFIG_SND_SOC_FS_AMP_LIB=m
-CONFIG_SND_SOC_FS210X=m
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDA=m
@@ -8376,7 +8326,6 @@ CONFIG_SND_SOC_MAX9860=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_PCM1681=m
-CONFIG_SND_SOC_PCM1754=m
 CONFIG_SND_SOC_PCM1789=m
 CONFIG_SND_SOC_PCM1789_I2C=m
 CONFIG_SND_SOC_PCM179X=m
@@ -8397,8 +8346,6 @@ CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_PCM512x_SPI=m
 CONFIG_SND_SOC_PCM6240=m
 CONFIG_SND_SOC_PEB2466=m
-CONFIG_SND_SOC_PM4125=m
-CONFIG_SND_SOC_PM4125_SDW=m
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RT_SDW_COMMON=m
 CONFIG_SND_SOC_RL6347A=m
@@ -8479,7 +8426,6 @@ CONFIG_SND_SOC_TAS2781_COMLIB=m
 CONFIG_SND_SOC_TAS2781_COMLIB_I2C=m
 CONFIG_SND_SOC_TAS2781_FMWLIB=m
 CONFIG_SND_SOC_TAS2781_I2C=m
-CONFIG_SND_SOC_TAS2783_SDW=m
 CONFIG_SND_SOC_TAS5086=m
 CONFIG_SND_SOC_TAS571X=m
 CONFIG_SND_SOC_TAS5720=m
@@ -8506,7 +8452,6 @@ CONFIG_SND_SOC_TSCS454=m
 CONFIG_SND_SOC_UDA1334=m
 CONFIG_SND_SOC_UDA1342=m
 CONFIG_SND_SOC_WCD_CLASSH=m
-CONFIG_SND_SOC_WCD_COMMON=m
 CONFIG_SND_SOC_WCD_MBHC=m
 CONFIG_SND_SOC_WCD937X=m
 CONFIG_SND_SOC_WCD937X_SDW=m
@@ -8591,7 +8536,6 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=m
-CONFIG_HID_HAPTIC=y

 #
 # Special HID drivers
@@ -9027,7 +8971,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_LJCA=m
-CONFIG_USB_USBIO=y
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
@@ -9403,7 +9346,6 @@ CONFIG_INFINIBAND_ERDMA=m
 CONFIG_INFINIBAND_HFI1=m
 # CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
 # CONFIG_SDMA_VERBOSITY is not set
-CONFIG_INFINIBAND_IONIC=m
 CONFIG_INFINIBAND_IRDMA=m
 CONFIG_MANA_INFINIBAND=m
 CONFIG_MLX4_INFINIBAND=m
@@ -9493,7 +9435,6 @@ CONFIG_RTC_DRV_MAX8925=m
 CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX31335=m
-CONFIG_RTC_DRV_NCT6694=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
@@ -9588,13 +9529,13 @@ CONFIG_RTC_DRV_FTRTC010=m
 CONFIG_RTC_DRV_PCAP=m
 CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_RTC_DRV_MT6397=m
-CONFIG_RTC_DRV_GOLDFISH=m
-CONFIG_RTC_DRV_WILCO_EC=m

 #
 # HID Sensor RTC drivers
 #
 CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_GOLDFISH=m
+CONFIG_RTC_DRV_WILCO_EC=m
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set

@@ -9742,12 +9683,11 @@ CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
 #
 # Microsoft Hyper-V guest support
 #
-CONFIG_HYPERV=y
+CONFIG_HYPERV=m
 # CONFIG_HYPERV_VTL_MODE is not set
 CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_VMBUS=m
 CONFIG_MSHV_ROOT=m
 # end of Microsoft Hyper-V guest support

@@ -9813,7 +9753,6 @@ CONFIG_COMEDI_ADDI_APCI_3120=m
 CONFIG_COMEDI_ADDI_APCI_3501=m
 CONFIG_COMEDI_ADDI_APCI_3XXX=m
 CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7250=m
 CONFIG_COMEDI_ADL_PCI7X3X=m
 CONFIG_COMEDI_ADL_PCI8164=m
 CONFIG_COMEDI_ADL_PCI9111=m
@@ -10054,7 +9993,6 @@ CONFIG_HUAWEI_WMI=m
 CONFIG_MXM_WMI=m
 CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
 CONFIG_XIAOMI_WMI=m
-CONFIG_REDMI_WMI=m
 CONFIG_GIGABYTE_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ACER_WIRELESS=m
@@ -10433,7 +10371,6 @@ CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_MAX77693=m
 CONFIG_EXTCON_MAX77843=m
 CONFIG_EXTCON_MAX8997=m
-CONFIG_EXTCON_MAX14526=m
 CONFIG_EXTCON_PALMAS=m
 CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_RT8973A=m
@@ -10571,7 +10508,6 @@ CONFIG_AD7944=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
 # CONFIG_AD9467 is not set
-CONFIG_ADE9000=m
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
@@ -10582,7 +10518,6 @@ CONFIG_GEHC_PMC_ADC=m
 CONFIG_HI8435=m
 CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
-CONFIG_INTEL_DC_TI_ADC=m
 CONFIG_INTEL_MRFLD_ADC=m
 CONFIG_LP8788_ADC=m
 CONFIG_LTC2309=m
@@ -10618,7 +10553,6 @@ CONFIG_QCOM_VADC_COMMON=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_ROHM_BD79112=m
 CONFIG_ROHM_BD79124=m
 CONFIG_RICHTEK_RTQ6056=m
 CONFIG_SD_ADC_MODULATOR=m
@@ -10997,7 +10931,6 @@ CONFIG_VCNL4035=m
 CONFIG_VEML3235=m
 CONFIG_VEML6030=m
 CONFIG_VEML6040=m
-CONFIG_VEML6046X00=m
 CONFIG_VEML6070=m
 CONFIG_VEML6075=m
 CONFIG_VL6180=m
@@ -11020,7 +10953,6 @@ CONFIG_MMC35240=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_INFINEON_TLV493D=m
 CONFIG_SENSORS_HMC5843=m
 CONFIG_SENSORS_HMC5843_I2C=m
 CONFIG_SENSORS_HMC5843_SPI=m
@@ -11196,7 +11128,6 @@ CONFIG_NTB_MSI_TEST=m
 CONFIG_NTB_TRANSPORT=m
 CONFIG_PWM=y
 # CONFIG_PWM_DEBUG is not set
-# CONFIG_PWM_PROVIDE_GPIO is not set
 CONFIG_PWM_CLK=m
 CONFIG_PWM_CRC=y
 CONFIG_PWM_CROS_EC=m
@@ -11208,7 +11139,6 @@ CONFIG_PWM_LP3943=m
 CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
-CONFIG_PWM_MAX7360=m
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
@@ -11391,6 +11321,7 @@ CONFIG_FS_STACK=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_LEGACY_DIRECT_IO=y
 # CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
@@ -11427,6 +11358,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_EXPERIMENTAL is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
 CONFIG_NILFS2_FS=m
 CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
@@ -11443,6 +11375,18 @@ CONFIG_F2FS_FS_LZ4HC=y
 CONFIG_F2FS_FS_ZSTD=y
 # CONFIG_F2FS_IOSTAT is not set
 CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_BCACHEFS_FS=m
+CONFIG_BCACHEFS_QUOTA=y
+# CONFIG_BCACHEFS_ERASURE_CODING is not set
+CONFIG_BCACHEFS_POSIX_ACL=y
+# CONFIG_BCACHEFS_DEBUG is not set
+# CONFIG_BCACHEFS_TESTS is not set
+CONFIG_BCACHEFS_LOCK_TIME_STATS=y
+# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
+CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
+# CONFIG_BCACHEFS_PATH_TRACEPOINTS is not set
+# CONFIG_BCACHEFS_TRANS_KMALLOC_TRACE is not set
+# CONFIG_BCACHEFS_ASYNC_OBJECT_LISTS is not set
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_DAX=y
 CONFIG_FS_DAX_PMD=y
@@ -11691,7 +11635,6 @@ CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DEBUG_TRACE is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
@@ -11972,6 +11915,7 @@ CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=y
 CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography

 #
@@ -12102,6 +12046,7 @@ CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 #
 # Accelerated Cryptographic Algorithms for CPU (x86)
 #
+CONFIG_CRYPTO_CURVE25519_X86=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_BLOWFISH_X86_64=m
 CONFIG_CRYPTO_CAMELLIA_X86_64=m
@@ -12225,18 +12170,20 @@ CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_AESCFB=y
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_GF128MUL=y
-CONFIG_CRYPTO_LIB_BLAKE2S_ARCH=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
 CONFIG_CRYPTO_LIB_CHACHA=y
-CONFIG_CRYPTO_LIB_CHACHA_ARCH=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=y
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519_INTERNAL=m
 CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_ARCH=y
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
 CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_MD5=y
-CONFIG_CRYPTO_LIB_POLY1305=y
-CONFIG_CRYPTO_LIB_POLY1305_ARCH=y
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=y
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA1_ARCH=y
@@ -12245,6 +12192,9 @@ CONFIG_CRYPTO_LIB_SHA256_ARCH=y
 CONFIG_CRYPTO_LIB_SHA512=y
 CONFIG_CRYPTO_LIB_SHA512_ARCH=y
 CONFIG_CRYPTO_LIB_SM3=m
+CONFIG_CRYPTO_BLAKE2S_X86=y
+CONFIG_CRYPTO_CHACHA20_X86_64=y
+CONFIG_CRYPTO_POLY1305_X86_64=y
 # end of Crypto library routines

 CONFIG_XXHASH=y
@@ -12341,8 +12291,10 @@ CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y
 CONFIG_VDSO_GETRANDOM=y
+CONFIG_GENERIC_VDSO_DATA_STORE=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -12378,6 +12330,7 @@ CONFIG_ASN1_ENCODER=y
 CONFIG_POLYNOMIAL=m
 CONFIG_FIRMWARE_TABLE=y
 CONFIG_UNION_FIND=y
+CONFIG_MIN_HEAP=y

 #
 # Kernel hacking
@@ -12524,6 +12477,7 @@ CONFIG_HAVE_ARCH_KMSAN=y
 # Debug Oops, Lockups and Hangs
 #
 # CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
@@ -26,7 +26,6 @@
  #:use-module (guix packages)
  #:use-module (guix gexp)
  #:use-module (guix download)
-  #:use-module (guix utils)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages)
  #:use-module (gnu packages bash)
@@ -81,9 +80,6 @@
                                                  (package-supported-systems
                                                   libcap))))
                                 '("--disable-autoipd")
-                                 '())
-                           ,@(if (target-hurd?)
-                                 '("CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types")
                                 '()))
       #:modules ((srfi srfi-26)
                  (guix build utils)
@@ -103,7 +103,7 @@
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages qt)
  #:use-module (gnu packages rsync)
-  #:use-module (gnu packages ruby-xyz)
+  #:use-module (gnu packages ruby-check)
  #:use-module (gnu packages serialization)
  #:use-module (gnu packages ssh)
  #:use-module (gnu packages time)
@@ -1190,7 +1190,7 @@ additional snapshots).")
 (define-public burp
  (package
    (name "burp")
-    (version "3.2.0")
+    (version "2.3.38")
    (source
     (origin
       (method git-fetch)
@@ -1198,23 +1198,21 @@ additional snapshots).")
             (url "https://github.com/grke/burp")
             (commit version)))
       (sha256
-        (base32 "0wxn59h6685swmr410l08k8baxsc0f2r6djixxddcbyxmlgap54d"))
+        (base32 "0m0s6rrgxn3l6bad45vyhks6iz6bwvd0f3rzdsc7l28gar79wsj6"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'extend-test-time-outs
-            ;; The defaults are far too low for busy boxes & spinning storage.
-            (lambda _
-              (substitute* (find-files "utest" "\\.c$")
-                (("(tcase_set_timeout\\(tc_core,)[ 0-9]*(\\);.*)$" _ prefix suffix)
-                 (string-append prefix " 3600" suffix "\n"))))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'extend-test-time-outs
+           ;; The defaults are far too low for busy boxes & spinning storage.
+           (lambda _
+             (substitute* (find-files "utest" "\\.c$")
+               (("(tcase_set_timeout\\(tc_core,)[ 0-9]*(\\);.*)$" _ prefix suffix)
+                (string-append prefix " 3600" suffix "\n")))
+             #t)))))
    (inputs
     (list acl
-           libxcrypt ; it is needed to pass utest/server/test_auth.c:53 and
-                     ; utest/builders/build_asfd_mock.c:54
           librsync
           ncurses ; for the live status monitor
           openssl
@@ -1267,7 +1265,7 @@ compression parameters used by Gzip.")
 (define-public borgmatic
  (package
    (name "borgmatic")
-    (version "2.1.2")
+    (version "2.0.13")
    (source
     (origin
       ;; PyPI archive does not contain NEWS file needed for one test.
@@ -1278,7 +1276,7 @@ compression parameters used by Gzip.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0vrpl21n6hf3pj0di4n7s36jq64sx24c93j48cmbdgczs8jiwi36"))))
+         "05w3j4knhsg4w0a0yrz8c7lvz3vp3nf95ddmql9i8mqknjqddm1v"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1327,7 +1325,7 @@ borgmatic is powered by borg.")
 (define-public vorta
  (package
    (name "vorta")
-    (version "0.11.3")
+    (version "0.11.1")
    ;; The test folder is not included in the PyPI archive.
    (source (origin
              (method git-fetch)
@@ -1337,7 +1335,7 @@ borgmatic is powered by borg.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0505id65lbbqj42lp4cvbw1q6v9qjhsnldr72ssv1kyir672j2pr"))))
+                "16r9ch80i6nfngah634id16fqnmn62ayh60j62zxn5cfivcn3wsq"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1362,7 +1360,7 @@ borgmatic is powered by borg.")
                 (string-append "which('" #$(this-package-input "borg")
                                "/bin/borg')")))))
          ;; XXX The test suite tries to write to $HOME.
-          (add-before 'sanity-check 'set-HOME
+          (add-before 'check 'set-HOME
            (lambda _
              (setenv "HOME" "/tmp")))
          ;; Otherwise, the user interface's icons will be missing.
@@ -1374,7 +1372,8 @@ borgmatic is powered by borg.")
           python-pytest-qt
           python-pytest-runner
           python-setuptools
-           python-setuptools-git))
+           python-setuptools-git
+           python-wheel))
    (inputs
     (list borg
           python-appdirs
@@ -21,7 +21,7 @@
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
-;;; Copyright © 2022, 2026 John Kehayias <john@guixotic.coop>
+;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
 ;;; Copyright © 2024, 2025 Zheng Junjie <z572@z572.online>
 ;;;
@@ -273,7 +273,7 @@ implementation offers several extensions over the standard utility.")
          ;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
          ;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
          ;; skipping the test for this release on 32-bit systems.
-          ((target-32bit?)
+          ((not (target-64bit?))
           '(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
          (else '()))
      ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
@@ -398,7 +398,15 @@ differences.")
                        (lambda _
                          (substitute* "tests/large-subopt"
                            (("^#!.*" all)
-                             (string-append all "exit 77;\n"))))))
+                             (string-append all "exit 77;\n")))
+                          #$@(if (system-hurd64?)
+                                 #~((substitute*
+                                        ;; These tests hang.
+                                        '("gnulib-tests/test-c-stack.sh"
+                                          "gnulib-tests/test-c-stack2.sh")
+                                      (("^#!.*" all)
+                                       (string-append all "exit 77;\n"))))
+                                 #~()))))
                  #~%standard-phases)))
   (native-inputs (list perl))
   (synopsis "Comparing and merging files")
@@ -557,9 +565,18 @@ used to apply commands with arbitrarily long arguments.")
                     ,@(if (system-hurd64?)
                           '((substitute*
                                 ;; These tests fail
-                                 '("tests/misc/sort-NaN-infloop.sh")
+                                 '("tests/misc/sort-NaN-infloop.sh"
+                                   "tests/misc/wc-parallel.sh")
                               (("^#!.*" all)
-                                (string-append all "exit 77;\n"))))
+                                (string-append all "exit 77;\n")))
+                             (substitute* '("gnulib-tests/test-fdutimensat.c"
+                                            "gnulib-tests/test-futimens.c"
+                                            "gnulib-tests/test-linkat.c"
+                                            "gnulib-tests/test-renameat.c"
+                                            "gnulib-tests/test-renameatu.c"
+                                            "gnulib-tests/test-utimensat.c")
+                               (("(^| )main *\\(.*" all)
+                                (string-append all "{\n  exit (77);//"))))
                           '())
                     ;; These tests can fail on btrfs.
                     (substitute* "tests/cp/reflink-auto.sh"
@@ -940,7 +957,6 @@ the store.")
   (properties `((lint-hidden-cve . ("CVE-2024-2961"
                                     "CVE-2024-33601" "CVE-2024-33602"
                                     "CVE-2024-33600" "CVE-2024-33599"))))
-   (replacement glibc/fixed)
   (build-system gnu-build-system)

   ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
@@ -1218,17 +1234,6 @@ with the Linux kernel.")
   (license lgpl2.0+)
   (home-page "https://www.gnu.org/software/libc/")))

-(define glibc/fixed
-  (package
-    (inherit glibc)
-    (name "glibc")
-    (source (origin
-              (inherit (package-source glibc))
-              ;; XXX: When ungrafting, add the included patch to
-              ;; %glibc-patches.
-              (patches (cons (search-patch "glibc-guix-locpath.patch")
-                             (origin-patches (package-source glibc))))))))
-
 ;; Define a variation of glibc which uses the default /etc/ld.so.cache, useful
 ;; in FHS containers.
 (define-public glibc-for-fhs
@@ -1428,10 +1433,6 @@ to the @code{share/locale} sub-directory of this package.")
                                                            "/" name "."
                                                            normalized)))))
                              locales))))
-              #$@(if (target-hurd?)
-                     #~((delete 'augment-libc.so)
-                        (delete 'create-machine-symlink))
-                     #~())
              (delete 'install)
              (delete 'install-utf8-c-locale)
              (delete 'move-static-libs)))
@@ -48,7 +48,6 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages c)
-  #:use-module (gnu packages cmake)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages nss)
  #:use-module (gnu packages check)
@@ -77,7 +76,6 @@
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages qt)
  #:use-module (gnu packages vulkan)
-  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xorg)
  #:use-module (gnu packages xml)
  #:use-module (ice-9 match))
@@ -864,47 +862,47 @@ user-provided Lua scripts.
    (license license:gpl2+)))

 (define-public vkmark
-  (package
-    (name "vkmark")
-    (version "2025.01")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/vkmark/vkmark")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0mpxyfwln1627zzi11fb6lgv7x1jz1p2w16w1mhhkdz1xsln6fj6"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'unbundle-vulkan-headers
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "src/meson.build"
-                (("vulkan_dep.get_pkgconfig_variable\\('prefix'\\)")
-                 (string-append "'" #$(this-package-input "vulkan-headers") "'"))))))))
-    (native-inputs (list pkg-config))
-    (inputs (list vulkan-loader
-                  vulkan-headers
-                  cmake
-                  glm
-                  assimp
-                  libxcb
-                  libdrm
-                  mesa
-                  xcb-util-wm
-                  wayland-protocols
-                  wayland))
-    (home-page "https://github.com/vkmark/vkmark")
-    (synopsis "Extensible benchmarking suite for Vulkan")
-    (description
-     "vkmark offers a suite of scenes that can be used to measure various
+  ;; The only ever release is tagged "2017.08" and as its name suggests
+  ;; it was back in the august of 2017. That version no longer compiles
+  ;; due to changes in APIs of its libraries.
+  ;; Latest commit on the other hand seems to be fully working on xcb
+  ;; and wayland backends.
+  (let ((commit "30d2cd37f0566589d90914501fc7c51a4e51f559")
+        (revision "0"))
+    (package
+      (name "vkmark")
+      (version (git-version "2017.08" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/vkmark/vkmark")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0w0n080sb67s7dbxqi71h0vhm6dccs78rqjnxx9x524jp4jh9b7x"))))
+      (build-system meson-build-system)
+      (native-inputs (list pkg-config))
+      ;; The kms backend currently will not compile because of upstream issues.
+      ;; So I omitted this backend's dependiencies. A fix has been proposed
+      ;; on another branch, but it has not been merged yet.
+      ;; See https://github.com/vkmark/vkmark/issues/33
+      (inputs
+       (list vulkan-loader
+             vulkan-headers
+             glm
+             assimp
+             libxcb
+             xcb-util-wm
+             wayland-protocols
+             wayland))
+      (home-page "https://github.com/vkmark/vkmark")
+      (synopsis "Extensible benchmarking suite for Vulkan")
+      (description
+       "vkmark offers a suite of scenes that can be used to measure various
 aspects of Vulkan performance.  The way in which each scene is rendered is
 configurable through a set of options.")
-    (license license:lgpl2.1+)))
+      (license license:lgpl2.1+))))

 (define-public osu-micro-benchmarks
  (package
@@ -63,7 +63,6 @@
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages netpbm)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-science)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages protobuf)
@@ -1301,7 +1300,7 @@ data.")
 (define-public r-illuminahumanmethylationepicv2anno-20a1-hg38
  (package
    (name "r-illuminahumanmethylationepicv2anno-20a1-hg38")
-    (version "1.0.1")
+    (version "1.0.0")
    (source
     (origin
       (method url-fetch)
@@ -1309,7 +1308,7 @@ data.")
                              version
                              'annotation))
       (sha256
-        (base32 "18y92h02dh3pcc27dn1m9jr4m6srwv7w25a4wg3c6jlrggnm5210"))))
+        (base32 "0vp4m3a7qal4d8qc9xaj7z3x484i33ix4c67qlbw0kskdir7rq5a"))))
    (properties `((upstream-name . "IlluminaHumanMethylationEPICv2anno.20a1.hg38")))
    (build-system r-build-system)
    (propagated-inputs (list r-minfi))
@@ -1852,14 +1851,14 @@ annotations.")
 (define-public r-illuminahumanmethylationepicv2manifest
  (package
    (name "r-illuminahumanmethylationepicv2manifest")
-    (version "1.0.1")
+    (version "1.0.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "IlluminaHumanMethylationEPICv2manifest"
                              version 'annotation))
       (sha256
-        (base32 "0dwynwhjf3dnbw6975fxvncrqk5si22vrcyf6wivvgak1zim9bjl"))))
+        (base32 "1z4b15x8cai27cqhl2lhl02nx0lv8q5c1774vdvvdajx2hivn77l"))))
    (properties `((upstream-name . "IlluminaHumanMethylationEPICv2manifest")))
    (build-system r-build-system)
    (propagated-inputs (list r-minfi))
@@ -3365,35 +3364,6 @@ is Illumina hiseq Level 3 RSEM normalized expression data from 2015-11-01
 snapshot.")
    (license license:gpl2)))

-(define-public r-scpdata
-  (package
-    (name "r-scpdata")
-    (version "1.18.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (bioconductor-uri "scpdata" version
-                              'experiment))
-       (sha256
-        (base32 "049qrzjj26s41q0nl3q85bz91lwpd5j3i1c4gxwbavm0izhhk3ym"))))
-    (properties `((upstream-name . "scpdata")))
-    (build-system r-build-system)
-    (arguments
-     ;; Tests require internet access via r-experimenthub
-     (list #:tests? #f))
-    (propagated-inputs (list r-annotationhub r-experimenthub r-qfeatures
-                             r-s4vectors r-singlecellexperiment))
-    (native-inputs (list r-knitr r-testthat))
-    (home-page "https://bioconductor.org/packages/scpdata")
-    (synopsis "Single-cell proteomics data package")
-    (description
-     "The package disseminates mass spectrometry (MS)-based single-cell proteomics
-(SCP) datasets.  The data were collected from published work and formatted
-using the `scp` data structure.  The data sets contain quantitative
-information at spectrum, peptide and/or protein level for single cells or
-minute sample amounts.")
-    (license license:gpl2)))
-
 (define-public r-sesamedata
  (package
    (name "r-sesamedata")
@@ -3436,14 +3406,14 @@ the @code{HorvathMethylChip40} (Mammal40) array.")
 (define-public r-systempiperdata
  (package
    (name "r-systempiperdata")
-    (version "2.14.5")
+    (version "2.14.2")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "systemPipeRdata" version
                              'experiment))
       (sha256
-        (base32 "1yrq1vyc0pmp3iv621cvdsavlarcca3z4bbxfzbg0ny3fyqp67pb"))))
+        (base32 "0qqkdrqvr0wic1hwrmhd6024w83gs66pdp0mc876qc68mv26nzwb"))))
    (properties `((upstream-name . "systemPipeRdata")))
    (build-system r-build-system)
    (propagated-inputs (list r-biocgenerics r-biostrings r-jsonlite r-remotes))
@@ -4539,13 +4509,13 @@ these biases and construct statistically consistent estimators.")
 (define-public r-animalcules
  (package
    (name "r-animalcules")
-    (version "1.26.1")
+    (version "1.26.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "animalcules" version))
              (sha256
               (base32
-                "15hy5b74bsyp8w7cpdfj2qi2syjlkbwm47nbxnm19g28cwqj0w3j"))))
+                "1a614al4vh6fzmzw8v8r1hn0fpmazrqfzspvmwg8injg36ab1i9x"))))
    (properties
     '((upstream-name . "animalcules")
       (updater-extra-native-inputs . ("r-glmnet"))))
@@ -4608,54 +4578,6 @@ Powerful interactive and dynamic figures generated by animalcules enable users
 to understand their data better and discover new insights.")
    (license license:artistic2.0)))

-(define-public r-anndatar
-  (package
-    (name "r-anndatar")
-    (version "1.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (bioconductor-uri "anndataR" version))
-       (sha256
-        (base32 "1vi9aqgdjy0nlbsk7628sz12jsxd9bfb79yxhh0ngijpxj9sxd4p"))))
-    (properties `((upstream-name . "anndataR")))
-    (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'find-python
-           (lambda _
-             (setenv "RETICULATE_PYTHON" (which "python3")))))))
-    (propagated-inputs (list r-cli
-                             r-lifecycle
-                             r-matrix
-                             r-purrr
-                             r-r6
-                             r-reticulate
-                             r-rlang))
-    (inputs (list python-wrapper
-                  python-anndata))
-    (native-inputs (list r-knitr
-                         r-processx
-                         r-rhdf5
-                         r-s4vectors
-                         r-seurat
-                         r-seuratobject
-                         r-singlecellexperiment
-                         r-spelling
-                         r-testthat
-                         r-withr))
-    (home-page "https://anndatar.data-intuitive.com")
-    (synopsis "AnnData interoperability in R")
-    (description
-     "This package aims to bring the power and flexibility of @code{AnnData}
-to the R ecosystem, allowing you to effortlessly manipulate and analyze your
-single-cell data.  This package lets you work with backed h5ad and zarr files,
-directly access various slots (e.g. X, obs, var), or convert the data into
-@code{SingleCellExperiment} and Seurat objects.")
-    (license license:expat)))
-
 (define-public r-annotationhubdata
  (package
    (name "r-annotationhubdata")
@@ -4717,13 +4639,13 @@ for use in Bioconductor’s AnnotationHub.")
 (define-public r-anvil
  (package
    (name "r-anvil")
-    (version "1.22.5")
+    (version "1.22.3")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "AnVIL" version))
              (sha256
               (base32
-                "07fsyifchcwic2vax6bgz401is7c24y88pjambs5k9r4rfy0snh6"))))
+                "0na8m3d2svrcblz8xzwb560sar39anx1bp0i787rw9sk23f2kwrc"))))
    (properties `((upstream-name . "AnVIL")))
    (build-system r-build-system)
    ;; Tests require Internet access.
@@ -5903,13 +5825,13 @@ Various visual and textual types of output are available.")
 (define-public r-bambu
  (package
    (name "r-bambu")
-    (version "3.12.1")
+    (version "3.12.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "bambu" version))
              (sha256
               (base32
-                "0wwsak3f5mz80arphw8n50f3523rf0nx8ih6brg8balhsxqfjhvh"))))
+                "0bdwild1lxnizkwlcscl9vjnhqiri79p8vwkgw5a2lxkfj1gz1p8"))))
    (properties `((upstream-name . "bambu")))
    (build-system r-build-system)
    ;; Tests require Internet access.
@@ -8058,13 +7980,13 @@ mapping.")
 (define-public r-nebulosa
  (package
    (name "r-nebulosa")
-    (version "1.20.1")
+    (version "1.20.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "Nebulosa" version))
              (sha256
               (base32
-                "0f4pmz583w0nywnnlnqs0jdvmz84876jcy1dcjar0d0x6w2x1ara"))))
+                "0xb2xj3rj2hqaz1hhsijk83n3qvwp646gj3nx6y8s6k6kda3mwvr"))))
    (properties
     '((upstream-name . "Nebulosa")
       (updater-extra-native-inputs . ("r-seurat"))))
@@ -8673,13 +8595,13 @@ on Bioconductor or which replace R functions.")
 (define-public r-biomart
  (package
    (name "r-biomart")
-    (version "2.66.1")
+    (version "2.66.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "biomaRt" version))
              (sha256
               (base32
-                "1cmzay4z9s183dc001rxfa81ql67la9y8m0p0wsn2iwzxzx94n8g"))))
+                "0xvwn4s7lxd2g98x6bng4w2vvxp26s57wzq2pij4f117xscad42f"))))
    (properties
     `((upstream-name . "biomaRt")))
    (build-system r-build-system)
@@ -9134,14 +9056,14 @@ experiments.")
 (define-public r-complexheatmap
  (package
    (name "r-complexheatmap")
-    (version "2.26.1")
+    (version "2.26.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "ComplexHeatmap" version))
       (sha256
        (base32
-         "1nhpifm5jq0ibh6s5vvjrym42rfk7cfjrnaks8xdrg5vr635xrww"))))
+         "1ibphh0x0drr0hm0pk96hs8mgxp5fy6ixs8ak4imyawqdjha3s68"))))
    (properties
     `((upstream-name . "ComplexHeatmap")))
    (build-system r-build-system)
@@ -9616,13 +9538,13 @@ parameter configurations.")
 (define-public r-enmix
  (package
    (name "r-enmix")
-    (version "1.46.1")
+    (version "1.46.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "ENmix" version))
              (sha256
               (base32
-                "1kkf387na8ldm7vqvv49cvz57yh4yi88mxcn3606xmdqxq69i78k"))))
+                "1zv7b8yfzn3mazfg2hyc20xpi8ayd0xwxz5wnd4ywjmnfagwqjwb"))))
    (properties
     '((upstream-name . "ENmix")
       (updater-extra-native-inputs . ("r-minfidata"))))
@@ -10337,13 +10259,13 @@ Enrichment Analysis} (GSEA).")
 (define-public r-gsva
  (package
    (name "r-gsva")
-    (version "2.4.6")
+    (version "2.4.4")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "GSVA" version))
              (sha256
               (base32
-                "08i2s5zlm75mr7zl357cic2zxcy7aqqfv67xb0w67n48cw016ri6"))))
+                "1rvzy8rx3pxy4slmmbrzydgwv3w6pjfvgz8xnwkm7zl18ik1y3h6"))))
    (properties `((upstream-name . "GSVA")))
    (build-system r-build-system)
    (propagated-inputs (list r-biobase
@@ -11765,14 +11687,14 @@ platform that mimics both single and multi-sample scRNA-seq data.")
 (define-public r-mutationalpatterns
  (package
    (name "r-mutationalpatterns")
-    (version "3.20.1")
+    (version "3.19.1")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "MutationalPatterns" version))
       (sha256
        (base32
-         "0g6r9lvbfr3q913hjs6kympzj8bg6sanqzl42qh0q0xipyvx8m31"))))
+         "1y7yxricvivg3ds3jacwf5qb366xvzw8sff9wddigz8p5kyzs7f6"))))
    (properties
     '((updater-extra-native-inputs . ("r-ccfindr"))))
    (build-system r-build-system)
@@ -11897,35 +11819,6 @@ package thus provides an alternative MS data representation for very large or
 remote MS data sets.")
    (license license:artistic2.0)))

-(define-public r-msdatahub
-  (package
-    (name "r-msdatahub")
-    (version "1.10.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (bioconductor-uri "MsDataHub" version))
-       (sha256
-        (base32 "09rfj583b1vz3p328pnlrzj7mxg6804ia1q84p9y5pvzcb0z17fv"))))
-    (properties `((upstream-name . "MsDataHub")))
-    (build-system r-build-system)
-    (arguments
-     (list
-      #:phases '(modify-phases %standard-phases
-                  (add-after 'unpack 'set-HOME
-                    (lambda _
-                      (setenv "HOME" "/tmp"))))))
-    (propagated-inputs (list r-experimenthub))
-    (native-inputs (list r-knitr r-testthat))
-    (home-page "https://rformassspectrometry.github.io/MsDataHub")
-    (synopsis "Mass spectrometry data on ExperimentHub")
-    (description
-     "The @code{MsDataHub} package uses the @code{ExperimentHub}
-infrastructure to distribute raw mass spectrometry data files, peptide
-spectrum matches or quantitative data from proteomics and metabolomics
-experiments.")
-    (license license:artistic2.0)))
-
 (define-public r-msexperiment
  (package
    (name "r-msexperiment")
@@ -12068,14 +11961,14 @@ of mass spectrometry based proteomics data.")
 (define-public r-msnid
  (package
    (name "r-msnid")
-    (version "1.44.2")
+    (version "1.44.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "MSnID" version))
       (sha256
        (base32
-         "1f7l11sgfrpcwzzlxa4g4vl34z5fmjx3lpwnaawi5nddc1li2ads"))))
+         "1spb72pc7idn597sb8qywynf6sg306p8vbdbd0gcib1q1vinzqy0"))))
    (properties `((upstream-name . "MSnID")))
    (build-system r-build-system)
    (arguments
@@ -12227,13 +12120,13 @@ previously been used in XCMS.")
 (define-public r-numbat
  (package
    (name "r-numbat")
-    (version "1.5.2")
+    (version "1.5.1")
    (source (origin
              (method url-fetch)
              (uri (cran-uri "numbat" version))
              (sha256
               (base32
-                "0j6p15n0zmm4d8ml4j6ydcd8x3b8gba53hpxjm1qv05blr29b65y"))))
+                "1p93jd009y0pymh08s8903pldh7c142icz7jvjbmmn5ayg9ayz39"))))
    (properties `((upstream-name . "numbat")))
    (build-system r-build-system)
    (propagated-inputs (list r-ape
@@ -12255,6 +12148,7 @@ previously been used in XCMS.")
                             r-optparse
                             r-paralleldist
                             r-patchwork
+                             r-pryr
                             r-purrr
                             r-r-utils
                             r-rcpp
@@ -13495,13 +13389,13 @@ transcripts in groups of interest.")
 (define-public r-scannotatr
  (package
    (name "r-scannotatr")
-    (version "1.16.1")
+    (version "1.16.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "scAnnotatR" version))
       (sha256
-        (base32 "08bpyzi43qbkmgqxp1aqi4fv7859gqpgj0bg39ycf5zlp7gpkjh5"))))
+        (base32 "1r9c033066rdrcnh0d540ln8axsmzpqjb35gxasmrfbd5zgl2m6h"))))
    (properties `((upstream-name . "scAnnotatR")))
    (build-system r-build-system)
    ;; 6 tests require connecting to a database over the Internet.
@@ -13534,13 +13428,13 @@ cell types based on specific research needs.")
 (define-public r-scdblfinder
  (package
    (name "r-scdblfinder")
-    (version "1.24.10")
+    (version "1.24.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "scDblFinder" version))
       (sha256
-        (base32 "0ngjgpjl2kky4j9ic4h6s4daaswhy59hq64d7s7yrws6m80k667j"))))
+        (base32 "0l9zhcx4a3wdzldlsg4blq3jh259pwd0h9qbhwwcz94jlp9v9wjq"))))
    (properties `((upstream-name . "scDblFinder")))
    (build-system r-build-system)
    (propagated-inputs
@@ -13624,13 +13518,13 @@ with respect to the cell population of interest.")
 (define-public r-scistreer
  (package
    (name "r-scistreer")
-    (version "1.2.1")
+    (version "1.2.0")
    (source (origin
              (method url-fetch)
              (uri (cran-uri "scistreer" version))
              (sha256
               (base32
-                "0v8pwz0skkan9gbpr9jffkkz0y22gm063mcw516c43xy3bgrxmgk"))))
+                "03nd4p7ik66v09yv18c0z1bvdnkr5m0axk78yapd2ri80ihmyi3c"))))
    (properties `((upstream-name . "scistreer")))
    (build-system r-build-system)
    (propagated-inputs (list r-ape
@@ -13700,54 +13594,6 @@ a scRNA-seq experiment onto the cell-types or individual cells identified in a
 different experiment.")
    (license license:gpl3)))

-(define-public r-scp
-  (package
-    (name "r-scp")
-    (version "1.20.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (bioconductor-uri "scp" version))
-       (sha256
-        (base32 "0ah2zy4mi5h1ihrv02s6z5q814rbyx37zcgj11iy5ss5j9zqhli4"))))
-    (properties
-     '((upstream-name . "scp")
-       (updater-extra-native-inputs . ("r-preprocesscore" "r-vsn"))))
-    (build-system r-build-system)
-    (arguments
-     (list
-      #:skipped-tests
-      ;; These tests require Internet access via r-experimenthub
-      '(("test-readSCP.R"
-         "readSCPfromDIANN"
-         "readSCPfromDIANN with sce"))))
-    (propagated-inputs (list r-ggplot2
-                             r-ggrepel
-                             r-ihw
-                             r-matrixstats
-                             r-metapod
-                             r-mscoreutils
-                             r-multiassayexperiment
-                             r-nipals
-                             r-qfeatures
-                             r-rcolorbrewer
-                             r-s4vectors
-                             r-singlecellexperiment
-                             r-summarizedexperiment))
-    (native-inputs (list r-biocgenerics r-knitr r-msdatahub r-preprocesscore
-                         r-testthat r-vdiffr r-vsn))
-    (home-page "https://UCLouvain-CBIO.github.io/scp")
-    (synopsis "Mass Spectrometry-based Single-Cell Proteomics data analysis")
-    (description
-     "This package provides utility functions for manipulating, processing,
-and analyzing mass spectrometry-based single-cell proteomics data.  The
-package is an extension to the @code{QFeatures} package and relies on
-@code{SingleCellExpirement} to enable single-cell proteomics analyses.  The
-package offers the user the functionality to process quantitative table (as
-generated by MaxQuant, Proteome Discoverer, and more) into data tables ready
-for downstream analysis and data visualization.")
-    (license license:artistic2.0)))
-
 (define-public r-screpertoire
  (package
    (name "r-screpertoire")
@@ -13902,13 +13748,13 @@ single-cell RNA-seq.")
 (define-public r-seqarray
  (package
    (name "r-seqarray")
-    (version "1.50.1")
+    (version "1.50.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "SeqArray" version))
              (sha256
               (base32
-                "1bswiypvzpp5l45ljycvh4ww0ig9kv18i3xvw8wr6v2sm8rc9ris"))))
+                "0p749sf2smc8j59qs5k3vkxlf5h2zws8q40vrnhv1svl1j1gc17d"))))
    (properties
     '((upstream-name . "SeqArray")
       (updater-extra-native-inputs . ("r-digest"))))
@@ -14183,13 +14029,13 @@ less than 2bp on both sides of indel region.")
 (define-public r-simona
  (package
    (name "r-simona")
-    (version "1.8.1")
+    (version "1.8.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "simona" version))
       (sha256
-        (base32 "17lrkd9v4j3w30ra8fxv9p0wkmlmyb31mh7gp1wr0z2cbrfd3wjl"))))
+        (base32 "0fv5qqlchbij486w2j7r2yndj2c497f4id0skq3r8pp735lgc84j"))))
    (properties
     `((upstream-name . "simona")
       (updater-extra-native-inputs
@@ -14221,14 +14067,14 @@ methods for semantic similarity analysis.")
 (define-public r-simplifyenrichment
  (package
    (name "r-simplifyenrichment")
-    (version "2.4.1")
+    (version "2.4.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "simplifyEnrichment" version))
       (sha256
        (base32
-         "0303y172gzq3xvqm6g74ppsd6bk3h735wcvlpm7xx4pqbkrmlix2"))))
+         "1vz0pjn8j3ia6gcwdlr1c8cxvdbhf6rscag1r7h43gj3fxmsi9m0"))))
    (properties
     `((upstream-name . "simplifyEnrichment")))
    (build-system r-build-system)
@@ -14636,13 +14482,13 @@ additional column data sets.")
 (define-public r-scds
  (package
    (name "r-scds")
-    (version "1.26.1")
+    (version "1.26.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "scds" version))
              (sha256
               (base32
-                "1adfq2nlvh0p6as5kkxsk9z561x1zcl4i75zlkh3isfv2q0rf92f"))))
+                "1j0z0w8cw80mr9nll9lj6x8573cyi1hk0wlz5f1bm66c2pf4q547"))))
    (properties `((upstream-name . "scds")))
    (build-system r-build-system)
    (propagated-inputs (list r-dplyr
@@ -14961,13 +14807,13 @@ samples.")
 (define-public r-survcomp
  (package
    (name "r-survcomp")
-    (version "1.60.1")
+    (version "1.60.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "survcomp" version))
              (sha256
               (base32
-                "0in0wlhjkqfc18rp6r73q4672ks7xzdjmkc6fcjl998rcn4n70dz"))))
+                "0fhi7kjcd26shx0qh1j8akcbiwyaxb5b7jzk1hyzmdqf4ffs98kw"))))
    (properties `((upstream-name . "survcomp")))
    (build-system r-build-system)
    (propagated-inputs (list r-bootstrap
@@ -14978,7 +14824,6 @@ samples.")
                             r-suppdists
                             r-survival
                             r-survivalroc))
-    (native-inputs (list r-biobase r-biocmanager r-xtable))
    (home-page "https://www.pmgenomics.ca/bhklab/")
    (synopsis "Performance assessment and comparison for survival analysis")
    (description
@@ -15289,14 +15134,14 @@ coding changes and predict coding outcomes.")
 (define-public r-vsn
  (package
    (name "r-vsn")
-    (version "3.78.1")
+    (version "3.78.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "vsn" version))
       (sha256
        (base32
-         "1dv7h6i1jfa046r8cipa761r2gxyrah90hsv0lp6y03m4v0hdl7h"))))
+         "07skbp8pq3anmlsmw0zqc2lhsis6wg9a6vid2535iy5hpj3d0yv0"))))
    (properties
     ;; This is needed for vignettes.
     '((updater-extra-native-inputs . ("r-biocstyle"))))
@@ -16175,13 +16020,13 @@ fitting of some classes of graphical Markov models.")
 (define-public r-ggtreeextra
  (package
    (name "r-ggtreeextra")
-    (version "1.20.1")
+    (version "1.20.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "ggtreeExtra" version))
              (sha256
               (base32
-                "03qdh2q6bd0452ygk3la825ixw54vm997r21s38qivxraam5cjd7"))))
+                "086j86xxf8xn4kqkgs6b3r2zyrngi2inhhabj47c5mcyxy7cbddz"))))
    (properties `((upstream-name . "ggtreeExtra")))
    (build-system r-build-system)
    (propagated-inputs (list r-cli
@@ -16190,8 +16035,7 @@ fitting of some classes of graphical Markov models.")
                             r-ggtree
                             r-magrittr
                             r-rlang
-                             r-tidytree
-                             r-yulab-utils))
+                             r-tidytree))
    (native-inputs (list r-knitr r-testthat))
    (home-page "https://github.com/YuLab-SMU/ggtreeExtra/")
    (synopsis
@@ -16207,17 +16051,14 @@ rectangular layout tree built by ggtree with the grammar of ggplot2.")
 (define-public r-ggpicrust2
  (package
    (name "r-ggpicrust2")
-    (version "2.5.10")
+    (version "2.5.2")
    (source (origin
              (method url-fetch)
              (uri (cran-uri "ggpicrust2" version))
              (sha256
               (base32
-                "19s72cfim793xx7d77ni2cb51qnsjabxq056zmdbladhkw9ipcck"))))
-    (properties
-     '((upstream-name . "ggpicrust2")
-       (updater-extra-native-inputs
-        . ("r-aldex2" "r-fgsea" "r-ggally" "r-limma"))))
+                "09cvv2ipxycq983rh9p2gdbahbgxknd7hxcxb6psvqcfx0paj0jg"))))
+    (properties `((upstream-name . "ggpicrust2")))
    (build-system r-build-system)
    (propagated-inputs (list r-aplot
                             r-dplyr
@@ -16233,8 +16074,12 @@ rectangular layout tree built by ggtree with the grammar of ggplot2.")
                             r-tibble
                             r-tidygraph
                             r-tidyr))
-    (native-inputs
-     (list r-aldex2 r-fgsea r-ggally r-knitr r-limma r-testthat))
+    (native-inputs (list r-devtools
+                         r-fgsea
+                         r-ggvenndiagram
+                         r-mockery
+                         r-testthat
+                         r-upsetr))
    (home-page "https://github.com/cafferychen777/ggpicrust2")
    (synopsis "Make PICRUSt2 output analysis and visualization easier")
    (description
@@ -19605,13 +19450,13 @@ data.")
 (define-public r-enrichedheatmap
  (package
    (name "r-enrichedheatmap")
-    (version "1.40.1")
+    (version "1.40.0")
    (source (origin
              (method url-fetch)
              (uri (bioconductor-uri "EnrichedHeatmap" version))
              (sha256
               (base32
-                "0qzfd7q270z80jvw1c7nvxks4md3pvhscj3zmga3jklmkx3qz5pn"))))
+                "1pz5czpy4dhjxaamz7n7zvxz3s48jyk3rhy90pqil41i8zlql4hr"))))
    (properties `((upstream-name . "EnrichedHeatmap")))
    (build-system r-build-system)
    (propagated-inputs (list r-circlize
@@ -20715,14 +20560,14 @@ analysis.")
 (define-public r-gtrellis
  (package
    (name "r-gtrellis")
-    (version "1.42.1")
+    (version "1.42.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "gtrellis" version))
       (sha256
        (base32
-         "00ckhkf15x4wgd8wvcl2kg2n98xxsbyb4njjxg9fzshvd7ikx0g4"))))
+         "0lbqzdfz7ylw066ng01vvm5azvnjfxhhbfcjk6y0l5xbs2c5ckac"))))
    (build-system r-build-system)
    (propagated-inputs
     (list r-circlize r-genomicranges r-getoptlong r-iranges))
@@ -22620,7 +22465,7 @@ sequential way to mimic the manual gating strategy.")
    (properties
     `((upstream-name . "CytoML")
       (updater-extra-native-inputs . ("r-flowworkspacedata"))
-       (updater-ignored-native-inputs . ("r-cytoml-old"))))
+       (updater-ignored-native-inputs . ("r-old" "r-table"))))
    (build-system r-build-system)
    (inputs
     (list libxml2 zlib))
@@ -24482,16 +24327,8 @@ available bioactivity data.")
         "0d4c9qqwd5zm5y9xcskfjashqkdiy0ri3gsj1kmfb5zmv8i8666s"))))
    (properties `((upstream-name . "biobroom")))
    (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'dplyr-compatibility
-           (lambda _
-             (substitute* "R/utilities.R"
-               (("dplyr::tbl_df") "tibble::as_tibble")))))))
    (propagated-inputs
-     (list r-biobase r-broom r-dplyr r-tibble r-tidyr))
+     (list r-biobase r-broom r-dplyr r-tidyr))
    (native-inputs
     (list r-deseq2 r-edger r-knitr r-magrittr r-testthat))
    (home-page "https://github.com/StoreyLab/biobroom")
@@ -24952,14 +24789,14 @@ gene selection, testing relationships, and so on.")
 (define-public r-biocpkgtools
  (package
    (name "r-biocpkgtools")
-    (version "1.28.3")
+    (version "1.27.12")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "BiocPkgTools" version))
       (sha256
        (base32
-         "0mxhsj3ah6qfq3lr3jz9bfjgfdzl9763aa3j5n3a0im36rz68960"))
+         "03z6b711071k15j8vlm4zgb36vli3y3zh1lnglz1xyimmvhvn9cp"))
       (snippet
        '(for-each delete-file
                   '("inst/htmlwidgets/lib/bioc_explore/bootstrap.min.js"
@@ -25178,19 +25015,18 @@ distance measures.")
 (define-public r-pcatools
  (package
    (name "r-pcatools")
-    (version "2.22.4")
+    (version "2.22.1")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "PCAtools" version))
       (sha256
        (base32
-         "1ljsllssc2japlmjhnazsfbm7py0xdyzac7jfcfvcxh9z7q3njy1"))))
+         "1ngm3227viafcjmq5c25ihj3lrrs98c1rs5zx2ims6xzv68dbzwz"))))
    (properties `((upstream-name . "PCAtools")))
    (build-system r-build-system)
    (propagated-inputs
-     (list r-assorthead
-           r-beachmat
+     (list r-beachmat
           r-bh
           r-biocparallel
           r-biocsingular
@@ -25225,14 +25061,14 @@ dimensional mass cytometry data.")
 (define-public r-rgreat
  (package
    (name "r-rgreat")
-    (version "2.12.2")
+    (version "2.12.1")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "rGREAT" version))
       (sha256
        (base32
-         "1c4pslr4b30j63yd3n5qnqk9s4k37iarpdfl0mxfxzkiwrgxc41b"))))
+         "1p9d9lzp5sgawn4058ghw7rq3n2n7ljb4f6a1586lpdf22pm0qhs"))))
    (properties `((upstream-name . "rGREAT")))
    (build-system r-build-system)
    (propagated-inputs
@@ -25533,21 +25369,23 @@ S4Vectors package itself.")
 (define-public r-wgcna
  (package
    (name "r-wgcna")
-    (version "1.74")
+    (version "1.73")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "WGCNA" version))
       (sha256
        (base32
-         "1mjmz7qpgnkd07ar02qd9ff4r0d3brf6v4xzc4dz11r2p0by2qag"))))
+         "1kk3a2ll83zdwisjfvg4km5h0vl564nshy45ffgxv41im5ks7878"))))
    (properties `((upstream-name . "WGCNA")))
    (build-system r-build-system)
    (propagated-inputs
-     (list r-doparallel
+     (list r-annotationdbi
+           r-doparallel
           r-dynamictreecut
           r-fastcluster
           r-foreach
+           r-go-db
           r-hmisc
           r-impute
           r-matrixstats
@@ -26446,14 +26284,14 @@ quality control.")
 (define-public r-scran
  (package
    (name "r-scran")
-    (version "1.38.1")
+    (version "1.38.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "scran" version))
       (sha256
        (base32
-         "1p2lkhvfpg0v320l6mavdfv70dzkiw0pc6im1qd8a52wycy21i88"))))
+         "1ac4fxj5adqrsgpcpqhk9sxlagaaq2w577xq751kqvxs54hj63n4"))))
    (properties
     '((updater-extra-native-inputs
        . ("r-dynamictreecut"
@@ -29144,14 +28982,14 @@ embeddings and functions to build new reference.")
 (define-public r-tximeta
  (package
    (name "r-tximeta")
-    (version "1.28.3")
+    (version "1.28.1")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "tximeta" version))
       (sha256
        (base32
-         "15lm6h271kkz265mab55fncngnqx56200l0m7qw7bdyq58fnlp4a"))))
+         "1152llv077q19zyyzzba0ggy03vlvgqrirrkssa8nk0pi93nh1zv"))))
    (properties `((upstream-name . "tximeta")))
    (build-system r-build-system)
    ;; Two tests fail because data files are not included.
@@ -29188,13 +29026,13 @@ reproducibility.")
 (define-public r-phyloseq
  (package
    (name "r-phyloseq")
-    (version "1.54.1")
+    (version "1.54.0")
    (source
     (origin
       (method url-fetch)
       (uri (bioconductor-uri "phyloseq" version))
       (sha256
-        (base32 "1zivxag6b2bjh32k1mpn7hlvalap97rp90x3cbfynqrk6933f4bq"))))
+        (base32 "000a4ksians9qxjfcr89qd1h6pr127h2mfjz607sl1h0kml1hiiv"))))
    (properties `((upstream-name . "phyloseq")))
    (build-system r-build-system)
    (arguments
@@ -11,7 +11,7 @@
 ;;; Copyright © 2018, 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2021, 2026 Justin Veilleux <terramorpha@cock.li>
+;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
 ;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2021 Josselin Poiret <josselin.poiret@protonmail.ch>
 ;;; Copyright © 2022 Brice Waegeneire <brice@waegenei.re>
@@ -99,19 +99,16 @@
 (define-public transmission
  (package
    (name "transmission")
-    (version "4.1.1")
+    (version "4.0.6")
    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/transmission/transmission")
-                    (commit version)
-                    ;; TODO: Unbundle more available inputs, see:
-                    ;; <https://codeberg.org/guix/guix/pulls/6542#issuecomment-10935599>.
-                    (recursive? #t)))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append "https://github.com/transmission/transmission"
+                                  "/releases/download/" version "/transmission-"
+                                  version ".tar.xz"))
+              (patches (search-patches "transmission-4.0.6-fix-build.patch"))
              (sha256
               (base32
-                "1v5qjarqvd26v757mj56yyw75mn3ydvhxl5hdkw8hn3idr1lww3k"))))
+                "0py4n33wk2srdfrcd5rbrbg5p1zq6nipghlins01d693i9nzwf1a"))))
    (build-system cmake-build-system)
    (outputs '("out"                      ; library and command-line interface
               "gui"))                    ; graphical user interface
@@ -199,7 +196,7 @@ DHT, µTP, PEX and Magnet Links.")
 (define-public transmission-remote-gtk
  (package
    (name "transmission-remote-gtk")
-    (version "1.7.0")
+    (version "1.6.0")
    (source
     (origin
       (method git-fetch)
@@ -210,7 +207,7 @@ DHT, µTP, PEX and Magnet Links.")
         (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "19m0jksx4klf5h9b7ici2dsdkbsrj24nj4y2iysrl5zc3sh3kii3"))))
+        (base32 "17b4as8k84b6gfr7g27r9hgw8qbcx5wr5kbspl5yd1jbzqirkk7y"))))
    (build-system meson-build-system)
    (native-inputs (list `(,glib "bin") ;glib-compile-resources
                         gettext-minimal
@@ -546,7 +543,7 @@ desktops.")
 (define-public qbittorrent
  (package
    (name "qbittorrent")
-    (version "5.1.4")
+    (version "5.1.2")
    (source
     (origin
       (method git-fetch)
@@ -555,7 +552,7 @@ desktops.")
             (commit (string-append "release-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1zja55b97cnij3vffmfa5p65dasybbm1gd3xjspw5yyypy5cl5zm"))))
+        (base32 "087l8fnr83bvvinsp1m27rsskc9wx9si3hh8alqrr8rhngd0c5ys"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -655,23 +652,24 @@ the following features:
        (base32
         "1kbac1qjbddcib0bldqaf0dcq5mqi9i2jv2fd4fayam4bcmjgfmr"))))
    (build-system pyproject-build-system)
-    (inputs (list bash-minimal
-                  gtk+
-                  libtorrent-rasterbar
-                  nss-certs
-                  python-pycairo
-                  python-chardet
-                  python-dbus-1.2
-                  python-mako
-                  python-pygobject-3.50
-                  python-pillow
-                  python-pyopenssl
-                  python-pyxdg
-                  python-rencode
-                  python-service-identity
-                  python-setproctitle
-                  python-twisted
-                  python-zope-interface))
+    (inputs (list bash-minimal))
+    (propagated-inputs
+     (list gtk+
+           libtorrent-rasterbar
+           nss-certs
+           python-pycairo
+           python-chardet
+           python-dbus
+           python-mako
+           python-pygobject
+           python-pillow
+           python-pyopenssl
+           python-pyxdg
+           python-rencode
+           python-service-identity
+           python-setproctitle
+           python-twisted
+           python-zope-interface))
    (native-inputs
     (list intltool
           python-pytest
@@ -61,7 +61,7 @@
  #: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 tex)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages version-control)
@@ -19,7 +19,6 @@
 ;;; Copyright © 2021 Franck Pérignon <franck.perignon@univ-grenoble-alpes.fr>
 ;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2025 David Elsing <david.elsing@posteo.net>
-;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -44,7 +43,6 @@
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system trivial)
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
@@ -81,10 +79,19 @@
               (base32
                "0yhcb8dn7g5k9dfr54j99wpd4qwk59g1lpp8z0ag7d114si3z8w5"))))
    (build-system gnu-build-system)
+    (inputs
+     (append
+      (list icu4c zlib)
+      (if (%current-target-system)
+          '()
+          (list python-minimal-wrapper))))
+    (native-inputs
+     (list perl tcsh))
    (arguments
     (list
-      #:imported-modules %pyproject-build-system-modules
-      #:modules `(((guix build pyproject-build-system) #:select (python-version))
+      #:imported-modules `((guix build python-build-system)
+                           ,@%default-gnu-imported-modules)
+      #:modules `(((guix build python-build-system) #:select (python-version))
                  ,@%default-gnu-modules)
      #:tests? #f
      #:configure-flags
@@ -223,14 +230,7 @@
                                     (string-append "libboost_python"
                                                    (string-take python-version 1)
                                                    libext)))))))))))
-    (inputs
-     (append
-      (list icu4c zlib)
-      (if (%current-target-system)
-          '()
-          (list python-minimal-wrapper))))
-    (native-inputs
-     (list perl tcsh))
+
    (home-page "https://www.boost.org")
    (synopsis "Peer-reviewed portable C++ source libraries")
    (description
@@ -370,15 +370,6 @@ across a broad spectrum of applications.")
     (modify-inputs (package-native-inputs boost)
       (append python-numpy-1)))))

-(define-public boost-with-numpy
-  (package
-    (inherit boost)
-    (name "boost-with-numpy")
-    (native-inputs
-     (modify-inputs (package-native-inputs boost)
-       (append python-numpy)))
-    (synopsis "Boost C++ libraries with inclusion of Boost.NumPy")))
-
 (define-public boost-sync
  (let ((commit "e690de2d30e2f1649ff500c9a6f3539814994b1c")
        (version "1.55")
@@ -462,16 +453,7 @@ signals and slots system.")
                  (newline output-port)
                  (close output-port))))))))
    (home-page "https://www.boost.org")
-    (synopsis "Boost C++ libraries with inclusion of Boost.MPI")))
-
-(define-public boost-mpi-numpy
-  (package
-    (inherit boost-mpi)
-    (name "boost-mpi-numpy")
-    (inputs
-     (modify-inputs (package-inputs boost-mpi)
-       (append python-numpy)))
-    (synopsis "Boost C++ libraries with inclusion of Boost.MPI and Boost.NumPy")))
+    (synopsis "Message Passing Interface (MPI) library for C++")))

 (define-public mdds
  (package
@@ -44,7 +44,6 @@
 (define-module (gnu packages bootloaders)
  #:use-module (gnu packages)
  #:use-module (gnu packages assembly)
-  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
  #:use-module (gnu packages disk)
  #:use-module (gnu packages bison)
@@ -115,13 +114,13 @@
 (define*-public (make-grub platform)
  (package
    (name (string-append "grub-" platform))
-    (version "2.14")
+    (version "2.12")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz"))
              (sha256
               (base32
-                "0hvd8i3ib6nwymfmvd6dia6axrn4xmrlsrg2r3c3i22vadrkr3dw"))
+                "1ahgzvvvwdxx7rl08pv5dyqlgp76jxz0q2cflxvsdsn4yy8p7jgk"))
              (patches (search-patches
                        "grub-efi-fat-serial-number.patch"
                        "grub-setup-root.patch"))
@@ -149,21 +148,13 @@
                    ;; This needs to be compiled with clang for powerpc64le.
                    (if #$(and=> (%current-target-system)
                                 target-ppc64le?)
-                        (list "TARGET_CC=powerpc64le-linux-gnu-clang"
-                              "CFLAGS=-Wno-error")
+                        (list "TARGET_CC=powerpc64le-linux-gnu-clang")
                        '())
                    (if #$(and (target-ppc64le? (%current-system))
                               (not (%current-target-system)))
-                        (list "CC=clang" "CFLAGS=-Wno-error")
+                        (list "CC=clang")
                        '()))

-           ;; The 'configure' script detects --image-base support and uses it,
-           ;; but that shifts the i386-pc kernel.img start address from 0x9000
-           ;; to 0x9074, breaking grub-install.  Override with -Ttext.
-           ;; See <https://lists.gnu.org/archive/html/grub-devel/2026-01/msg00041.html>.
-           #:make-flags
-           #~(list "TARGET_IMG_BASE_LDOPT=-Wl,-Ttext")
-
           ;; GRUB fails to load modules stripped with --strip-unneeded.
           #:strip-flags
           #~(list "--strip-debug" "--enable-deterministic-archives")
@@ -208,6 +199,14 @@
                       (setenv "BUILD_FREETYPE_CFLAGS"
                               (string-append "-I" freetype
                                              "/include/freetype2"))))))
+               #$@(if (target-hurd64?)
+                      #~((add-after 'unpack 'apply-hurd64-patch
+                           (lambda _
+                             (let ((patch
+                                    #$(local-file
+                                       (search-patch "grub-hurd64.patch"))))
+                               (invoke "patch" "--force" "-p1" "-i" patch)))))
+                      #~())
               (add-before 'check 'disable-flaky-test
                 (lambda _
                   ;; This test is unreliable. For more information, see:
@@ -230,7 +229,7 @@
                     (("test_unset grub_func_test")
                      "test_unset")))))))
    (inputs
-     (append (list gettext-minimal freetype ncurses libtasn1
+     (append (list gettext-minimal freetype ncurses

                   ;; Console-setup's ckbcomp is invoked by grub-kbdcomp.  It
                   ;; is required for generating alternative keyboard layouts.
@@ -286,6 +285,22 @@
             ;; targets are used.
             (if (member (%current-system) (package-supported-systems qemu-minimal))
                 (list qemu-minimal)
+                 '())
+
+             ;; XXX: When building GRUB 2.02 on 32-bit x86, we need a binutils
+             ;; capable of assembling 64-bit instructions.  However, our default
+             ;; binutils on 32-bit x86 is not 64-bit capable.
+             (if (string-match "^i[3456]86-" (%current-system))
+                 (let ((binutils (package/inherit
+                                     binutils
+                                   (name "binutils-i386")
+                                   (arguments
+                                    (substitute-keyword-arguments (package-arguments binutils)
+                                      ((#:configure-flags flags ''())
+                                       #~(cons* "--enable-64-bit-bfd" #$flags)))))))
+                   (list (make-ld-wrapper "ld-wrapper-i386"
+                                          #:binutils binutils)
+                         binutils))
                 '())))
    (home-page "https://www.gnu.org/software/grub/")
    (synopsis "GRand Unified Boot loader")
@@ -390,8 +405,7 @@ menu to select one of the installed operating systems.")
                               "test_sha512sum"
                               "grub_cmd_tr"
                               "test_unset"
-                               "file_filter_test"
-                               "asn1_test")
+                               "file_filter_test")
                         " "))))))))
    (supported-systems '("i686-linux" "x86_64-linux")))))

@@ -443,27 +457,22 @@ menu to select one of the installed operating systems.")
                                              ((target-arm32?) "arm")
                                              (else ""))))
                            (substitute* "tests/util/grub-shell.in"
-                              (("\\$\\{srcdir\\}/OVMF(32)?\\.fd")
+                              (("OVMF-ia32\\.fd")
                               (search-input-file
                                 (or native-inputs inputs)
                                 (string-append
                                   "/share/firmware/ovmf_" arch ".bin")))
-                              (("/usr/share/qemu/OVMF(32)?\\.fd")
+                              (("OVMF\\.fd")
                               (search-input-file
                                 (or native-inputs inputs)
                                 (string-append
                                   "/share/firmware/ovmf_" arch ".bin")))
-                              (("\\$\\{srcdir\\}/AAVMF(32)?\\.fd")
+                              (("/usr/share/qemu-efi/QEMU_EFI\\.fd")
                               (search-input-file
                                 (or native-inputs inputs)
                                 (string-append
                                   "/share/firmware/ovmf_" arch ".bin")))
-                              (("/usr/share/qemu-efi-aarch64/QEMU_EFI\\.fd")
-                               (search-input-file
-                                 (or native-inputs inputs)
-                                 (string-append
-                                   "/share/firmware/ovmf_" arch ".bin")))
-                              (("/usr/share/AAVMF/AAVMF(32)?\\.fd")
+                              (("/usr/share/ovmf-arm/QEMU_EFI\\.fd")
                               (search-input-file
                                 (or native-inputs inputs)
                                 (string-append
@@ -515,41 +524,19 @@ menu to select one of the installed operating systems.")
            #$@(if (or (target-x86?)
                       (target-arm?))
                   #~((replace 'patch-ovmf-path
-                        (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                        (lambda* (#:key inputs #:allow-other-keys)
                          (let ((arch #$(cond ((target-x86?) "ia32")
                                              ((target-arm?) "arm")
                                              (else ""))))
                            (substitute* "tests/util/grub-shell.in"
-                              (("\\$\\{srcdir\\}/OVMF(32)?\\.fd")
+                              (("OVMF-ia32\\.fd")
                               (search-input-file
-                                 (or native-inputs inputs)
-                                 (string-append
-                                   "/share/firmware/ovmf_" arch ".bin")))
-                              (("/usr/share/qemu/OVMF(32)?\\.fd")
-                               (search-input-file
-                                 (or native-inputs inputs)
-                                 (string-append
-                                   "/share/firmware/ovmf_" arch ".bin")))
-                              (("\\$\\{srcdir\\}/AAVMF(32)?\\.fd")
-                               (search-input-file
-                                 (or native-inputs inputs)
-                                 (string-append
-                                   "/share/firmware/ovmf_" arch ".bin")))
-                              (("/usr/share/qemu-efi-aarch64/QEMU_EFI\\.fd")
-                               (search-input-file
-                                 (or native-inputs inputs)
-                                 (string-append
-                                   "/share/firmware/ovmf_" arch ".bin")))
-                              (("/usr/share/AAVMF/AAVMF(32)?\\.fd")
-                               (search-input-file
-                                 (or native-inputs inputs)
-                                 (string-append
-                                   "/share/firmware/ovmf_" arch ".bin")))
+                                 inputs (string-append
+                                          "/share/firmware/ovmf_" arch ".bin")))
                              (("/usr/share/ovmf-arm/QEMU_EFI\\.fd")
                               (search-input-file
-                                 (or native-inputs inputs)
-                                 (string-append
-                                   "/share/firmware/ovmf_" arch ".bin"))))))))
+                                 inputs (string-append
+                                          "/share/firmware/ovmf_" arch ".bin"))))))))
                   #~())))))
    (native-inputs
     (cond
@@ -573,7 +560,9 @@ menu to select one of the installed operating systems.")
  (package
    (inherit (make-grub "ieee1275"))
    (synopsis "GRand Unified Boot loader (ieee1275 version)")
-    (supported-systems '("powerpc-linux" "powerpc64le-linux"))))
+    (supported-systems '("i686-linux" "x86_64-linux"
+                         "i586-gnu" "x86_64-gnu"
+                         "powerpc-linux" "powerpc64le-linux"))))

 (define-public grub-qemu
  (package
@@ -812,6 +801,10 @@ The SUBDIR argument defaults to \"efi/Guix\", as it is also the case for
      #~(modify-phases %standard-phases
          (add-after 'unpack 'preparations
            (lambda _
+              ;; The version string is usually derived via setuptools-scm, but
+              ;; without the git metadata available this fails.
+              (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)
+
              ;; Needed by setup.py.
              (setenv "DESTDIR" "/")

@@ -843,7 +836,7 @@ The SUBDIR argument defaults to \"efi/Guix\", as it is also the case for
            pkg-config
            python
            python-setuptools-scm
-            swig-4.0
+            swig
            which)
      (if (member (%current-system) (package-supported-systems valgrind/pinned))
          (list valgrind/pinned)
@@ -860,7 +853,7 @@ tree binary files.  These are board description files used by Linux and BSD.")
 (define u-boot
  (package
    (name "u-boot")
-    (version "2026.01")
+    (version "2025.01")
    (source
     (origin
       (method git-fetch)
@@ -869,8 +862,9 @@ tree binary files.  These are board description files used by Linux and BSD.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1ics2b560gjqh7f1b194axy5rdplrgxhpifay61zpa6p5gl4fxsz"))
-       (patches (search-patches "u-boot-allow-disabling-openssl.patch"))
+        (base32 "1i1v86bnixh8hyqbwwr5iwdnnadmg2fqxw9g526fvclsbvl8lz0v"))
+       (patches (search-patches "u-boot-allow-disabling-openssl.patch"
+                                "u-boot-rockchip-inno-usb.patch"))
       (snippet
        ;; Remove non-free binary licenses, blobs and microcode.
        #~(begin
@@ -895,7 +889,7 @@ tree binary files.  These are board description files used by Linux and BSD.")
           python-pyelftools
           python-setuptools
           python-wheel
-           swig-4.0
+           swig
           (list util-linux "lib")))
    (home-page "https://www.denx.de/wiki/U-Boot/")
    (synopsis "ARM bootloader")
@@ -934,8 +928,6 @@ also initializes the boards (RAM etc).")
       (append fontconfig
               python-sphinx
               python-sphinx-prompt
-               ; python-sphinx-rtd-theme ; optional
-               python-sphinx-reredirects
               texinfo
               which)))
    (synopsis "U-Boot documentation")
@@ -951,6 +943,7 @@ Info manual.")))
         (modify-inputs (package-native-inputs u-boot)
                          (prepend python-filelock
                                   python-pycryptodomex
+                                   python-coverage
                                   python-pytest
                                   python-pytest-xdist))
           (modify-inputs (package-native-inputs u-boot)
@@ -976,6 +969,14 @@ Info manual.")))
               (("/bin/false") (which "false")))
             (substitute* "tools/dtoc/fdt_util.py"
               (("'cc'") "'gcc'"))
+             (substitute* "tools/u_boot_pylib/test_util.py"
+               ;; python3-coverage is simply called coverage in guix.
+               (("python3-coverage") "coverage")
+
+               ;; Don't require 100% coverage since it's brittle and can
+               ;; fail with newer versions of coverage or dependencies.
+               (("raise ValueError\\('Test coverage failure'\\)")
+                "print('Continuing anyway since Guix does not care :O')"))
             (substitute* "test/run"
               ;; Make it easier to find test failures.
               (("#!/bin/bash") "#!/bin/bash -x")
@@ -988,9 +989,9 @@ Info manual.")))
                "# run_test \"sandbox_noinst\"")
               (("run_test \"sandbox_vpl\"")
                "# run_test \"sandbox_vpl\"")
-               ;; Disable code coverage tests.
-               (("run_test \"(\\w+) code coverage\"" all)
-                (string-append "# " all))
+               ;; FIXME: code coverage not working
+               (("run_test \"binman code coverage\"")
+                "# run_test \"binman code coverage\"")
               ;; This test would require internet access.
               (("\\./tools/buildman/buildman") (which "true")))
             (substitute* "test/py/tests/test_sandbox_exit.py"
@@ -1007,9 +1008,8 @@ def test_ctrl_c"))
                           ;; to GPL/Openssl license incompatibilities.
                           ;; See https://bugs.gnu.org/34717 for
                           ;; details.
-                           (("CONFIG_FIT=y")
-                            "CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=n
+                           (("CONFIG_FIT_SIGNATURE=y")
+                            "CONFIG_FIT_SIGNATURE=n
 CONFIG_UT_LIB_ASN1=n
 CONFIG_TOOLS_LIBCRYPTO=n
 CONFIG_TOOLS_KWBIMAGE=n")
@@ -1377,6 +1377,34 @@ removed so that it fits within common partitioning schemes.")))
 (define-public u-boot-a20-olinuxino-micro
  (make-u-boot-package "A20-OLinuXino_MICRO" "arm-linux-gnueabihf"))

+(define-public u-boot-nintendo-nes-classic-edition
+  (let ((base (make-u-boot-package "Nintendo_NES_Classic_Edition"
+                                   "arm-linux-gnueabihf"
+                                   #:append-description "This version is for
+the Nintendo NES Classic Edition.  It is assumed that you have added a serial
+port to pins PB0 and PB1 as described on
+@url{https://linux-sunxi.org/Nintendo_NES_Classic_Edition}.
+
+In order to use FEL mode on the device, hold the Reset button on the
+device while it's being turned on (and a while longer).")))
+    (package
+      (inherit base)
+      ;; Starting with 2019.01, FEL doesn't work anymore on A33.
+      (version "2018.11")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append
+                      "https://ftp.denx.de/pub/u-boot/"
+                      "u-boot-" version ".tar.bz2"))
+                (sha256
+                 (base32
+                  "0znkwljfwwn4y7j20pzz4ilqw8znphrfxns0x1lwdzh3xbr96z3k"))
+                (patches (search-patches
+                          "u-boot-nintendo-nes-serial.patch"))))
+      (native-inputs
+       `(("python" ,python-2)
+         ,@(package-native-inputs base))))))
+
 (define-public u-boot-wandboard
  (make-u-boot-package "wandboard" "arm-linux-gnueabihf"))

@@ -1434,7 +1462,7 @@ partition."))
      ;; These disabled features require OpenSSL, which is
      ;; incompatible with the GPLv2-only parts of U-boot.
      #:configs (map (cut string-append "# CONFIG_" <> " is not set")
-                     '("FIT_CIPHER" "MBEDTLS_LIB" "HKDF_MBEDTLS"))
+                     '("FIT_CIPHER" "MBEDTLS_LIB"))
      #:append-description
      "The sandbox configuration of U-Boot provides a @command{u-boot}
 command that runs as a normal user space application.  It can be used to
@@ -1812,6 +1840,95 @@ For more information, refer to
                    (("DEFAULT_FDT_FILE")
                     "imx6q-ts7970.dtb")))))))))))

+(define-public vboot-utils
+  (package
+    (name "vboot-utils")
+    (version "R63-10032.B")
+    (source (origin
+              ;; XXX: Snapshots are available but changes timestamps every download.
+              (method git-fetch)
+              (uri (git-reference
+                    (url (string-append "https://chromium.googlesource.com"
+                                        "/chromiumos/platform/vboot_reference"))
+                    (commit (string-append "release-" version))))
+              (file-name (string-append name "-" version "-checkout"))
+              (sha256
+               (base32
+                "0h0m3l69vp9dr6xrs1p6y7ilkq3jq8jraw2z20kqfv7lvc9l1lxj"))
+              (patches
+               (search-patches "vboot-utils-skip-test-workbuf.patch"
+                               "vboot-utils-fix-tests-show-contents.patch"
+                               "vboot-utils-fix-format-load-address.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags (list "CC=gcc"
+                          ;; On ARM, we must pass "HOST_ARCH=arm" so that the
+                          ;; ${HOST_ARCH} and ${ARCH} variables in the makefile
+                          ;; match.  Otherwise, ${HOST_ARCH} will be assigned
+                          ;; "armv7l", the value of `uname -m`, and will not
+                          ;; match ${ARCH}, which will make the tests require
+                          ;; QEMU for testing.
+                          ,@(if (string-prefix? "arm"
+                                                (or (%current-target-system)
+                                                    (%current-system)))
+                                '("HOST_ARCH=arm")
+                                '())
+                          (string-append "DESTDIR=" (assoc-ref %outputs "out")))
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'patch-hard-coded-paths
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let ((coreutils (assoc-ref inputs "coreutils"))
+                            (diffutils (assoc-ref inputs "diffutils")))
+                        (substitute* "futility/misc.c"
+                          (("/bin/cp") (string-append coreutils "/bin/cp")))
+                        (substitute* "tests/bitmaps/TestBmpBlock.py"
+                          (("/usr/bin/cmp") (string-append diffutils "/bin/cmp")))
+                        (substitute* "vboot_host.pc.in"
+                          (("prefix=/usr")
+                           (string-append "prefix=" (assoc-ref outputs "out"))))
+                        #t)))
+                  (delete 'configure)
+                  (add-before 'check 'patch-tests
+                    (lambda _
+                      ;; These tests compare diffs against known-good values.
+                      ;; Patch the paths to match those in the build container.
+                      (substitute* (find-files "tests/futility/expect_output")
+                        (("/mnt/host/source/src/platform/vboot_reference")
+                         (string-append "/tmp/guix-build-" ,name "-" ,version
+                                        ".drv-0/source")))
+                      ;; Tests require write permissions to many of these files.
+                      (for-each make-file-writable (find-files "tests/futility"))
+                      #t))
+                  (add-after 'install 'install-devkeys
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (share (string-append out "/share/vboot-utils")))
+                        (copy-recursively "tests/devkeys"
+                                          (string-append share "/devkeys"))
+                        #t))))
+       #:test-target "runtests"))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+
+       ;; For tests.
+       ("diffutils" ,diffutils)
+       ("python@2" ,python-2)))
+    (inputs
+     `(("coreutils" ,coreutils)
+       ("libyaml" ,libyaml)
+       ("openssl" ,openssl)
+       ("openssl:static" ,openssl "static")
+       ("util-linux" ,util-linux "lib")))
+    (home-page
+     "https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot")
+    (synopsis "ChromiumOS verified boot utilities")
+    (description
+     "vboot-utils is a collection of tools to facilitate booting of
+Chrome-branded devices.  This includes the @command{cgpt} partitioning
+program, the @command{futility} and @command{crossystem} firmware management
+tools, and more.")
+    (license license:bsd-3)))
+
 (define-public os-prober
  (package
    (name "os-prober")
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012-2020, 2024 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2017, 2020, 2024 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018, 2020, 2022, 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018, 2020, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2019 Carl Dong <contact@carldong.me>
 ;;; Copyright © 2019 Léo Le Bouter <lle-bout@zaclys.net>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -46,8 +46,7 @@
  #:use-module (srfi srfi-34)
  #:use-module (srfi srfi-35)
  #:use-module (ice-9 match)
-  #:export (bootstrap-guile-url-path
-            bootstrap-origin
+  #:export (bootstrap-origin
            package-with-bootstrap-guile
            glibc-dynamic-linker

@@ -128,13 +127,13 @@
      ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5")))
    ("x86_64-gnu"
     ("bash"
-      ,(base32 "1gr7hxpk55iahz5gc30iprssnkg0b8ylf7fh130dgiz8202z0c65"))
+      ,(base32 "1xvhwyvamlcva01zv6pz7br7d2lgq5qd14misi8wffxc78c4lndk"))
     ("mkdir"
-      ,(base32 "1wv4hsxg3d995bb5wfrvi8rhqrvn18qb2y889x89c8mhf9jl9xcp"))
+      ,(base32 "1c5irkgxaxpwlxzf68xg47j7m6ibd9xqvxznlml42nhfnrka447s"))
     ("tar"
-      ,(base32 "00s7f78yhd8s865fy8gizpzdx5dn294nxvy10bpga6dfj8q2990r"))
+      ,(base32 "0ak7sri6294y1g3ia1yrf7facxc7dij02mlxi4xg6k5yszv1jd3w"))
     ("xz"
-      ,(base32 "1193r88af30z124nc10a6aryvlk8pn320v6260kb56a6ax5dgqf9")))
+      ,(base32 "0zz9pgw0pyadqsq9nvvpiryk1gpmm89754m6xlqh4ssbbvzpk3y6")))
    ("mips64el-linux"
     ("bash"
      ,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6"))
@@ -176,14 +175,14 @@
  (match system
    ("powerpc64le-linux" (string-append system "/20210106/" program))
    ("i586-gnu" (string-append system "/20200326/" program))
-    ("x86_64-gnu" (string-append system "/20260302/" program))
+    ("x86_64-gnu" (string-append system "/20241122/" program))
    ("powerpc-linux" (string-append system "/20200923/bin/" program))
    ("riscv64-linux" (string-append system "/20210725/bin/" program))
    (_ (string-append system "/" program
                      "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e"))))

-(define bootstrap-executable*
-  (mlambda (program system file-name)
+(define bootstrap-executable
+  (mlambda (program system)
    "Return an origin for PROGRAM, a statically-linked bootstrap executable
 built for SYSTEM."
    (let ((system (if (string=? system "x86_64-linux")
@@ -204,15 +203,9 @@ for system '~a'")
           (uri (map (cute string-append <>
                           (bootstrap-executable-file-name system program))
                     %bootstrap-executable-base-urls))
-           ;; XXX: In the long term, migrate all boostrap executables to
-           ;; (string-append "bootstrap-" program), and drop the additional
-           ;; file-name argument.
-           (file-name file-name)
+           (file-name program)
           (hash (content-hash bv sha256))))))))

-(define* (bootstrap-executable program system #:optional file-name)
-  (bootstrap-executable* program system (or file-name program)))
-

 ;;;
 ;;; Helper procedures.
@@ -352,7 +345,6 @@ or false to signal an error."
     ;; here just so we can keep going.
     ((string=? system "arm-eabi") "no-ld.so")
     ((string=? system "avr") "no-ld.so")
-     ((string=? system "bpf-none") "no-ld.so")
     ((string=? system "or1k-elf") "no-ld.so")
     ((string-suffix? "-elf" system) "no-ld.so")
     ((string-suffix? "-mingw" system) "no-ld.so")
@@ -390,7 +382,7 @@ or false to signal an error."
                   ("i586-gnu"
                    "/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz")
                   ("x86_64-gnu"
-                    "/20260302/guile-static-stripped-3.0.9-x86_64-pc-gnu.tar.xz")
+                    "/20241122/guile-static-stripped-3.0.9-x86_64-pc-gnu.tar.xz")
                   ("powerpc64le-linux"
                    "/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz")
                   ("riscv64-linux"
@@ -416,7 +408,7 @@ or false to signal an error."
    ("i586-gnu"
     (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac"))
    ("x86_64-gnu"
-     (base32 "049c6dxc5lgaa9kbp81gn9gj32bc7xqnly4ivwajzsh4lknrhq6n"))
+     (base32 "109p34v8fgxznxdyb90y74qj6ppwgb5qj0c2pa3gxba7x1r0p4k1"))
    ("powerpc-linux"
     (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4"))
    ("riscv64-linux"
@@ -627,7 +619,7 @@ $out/bin/guile --version~%"
                                            ("i586-gnu"
                                             "/20200326/static-binaries-0-i586-pc-gnu.tar.xz")
                                            ("x86_64-gnu"
-                                             "/20260302/static-binaries-0-x86_64-pc-gnu.tar.xz")
+                                             "/20241122/static-binaries-0-x86_64-pc-gnu.tar.xz")
                                            ("powerpc-linux"
                                             "/20200923/static-binaries.tar.xz")
                                            ("riscv64-linux"
@@ -657,7 +649,7 @@ $out/bin/guile --version~%"
                                "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn"))
                              ("x86_64-gnu"
                               (base32
-                                "0xnw5p6279m8xazbhal5ld5qxsya0249z2l6jcc7w9ndh2gnx07v"))
+                                "04zksa2457h1vcl5ry2hyzhhsg8fckvfdgadp0viba3anwms2463"))
                              ("powerpc-linux"
                               (base32
                                "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m"))
@@ -715,7 +707,7 @@ $out/bin/guile --version~%"
                                            ("i586-gnu"
                                             "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
                                            ("x86_64-gnu"
-                                             "/20260302/binutils-static-stripped-2.44-x86_64-pc-gnu.tar.xz")
+                                             "/20241122/binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz")
                                            ("powerpc-linux"
                                             "/20200923/binutils-2.35.1.tar.xz")
                                            ("riscv64-linux"
@@ -748,7 +740,7 @@ $out/bin/guile --version~%"
                                "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs"))
                              ("x86_64-gnu"
                               (base32
-                                "033bgmaa012b2lw8g76b02mjgzdnzv2yd3jvaqbhqrr5q9r3xn04"))
+                                "1fasv76rppnqlshjqc7dbzngic9cqswi5ydzg6w9rc075daqk8kb"))
                              ("powerpc-linux"
                               (base32
                                "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8"))
@@ -819,7 +811,7 @@ $out/bin/guile --version~%"
                                      ("i586-gnu"
                                       "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz")
                                      ("x86_64-gnu"
-                                       "/20260302/glibc-stripped-2.41-x86_64-pc-gnu.tar.xz")
+                                       "/20241122/glibc-stripped-2.39-x86_64-pc-gnu.tar.xz")
                                      ("powerpc-linux"
                                       "/20200923/glibc-2.32.tar.xz")
                                      ("riscv64-linux"
@@ -852,7 +844,7 @@ $out/bin/guile --version~%"
                          "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2"))
                        ("x86_64-gnu"
                         (base32
-                          "1lpvk0l7qqvz46cnxm64a1a40zg0gj90j3glyk67i1sh5r4znlmy"))
+                          "1w4h91kxl64a62l646966i73zp2cj6w4dmyc64fh0c1hhdykxass"))
                        ("powerpc-linux"
                         (base32
                          "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb"))
@@ -937,7 +929,7 @@ exec ~a/bin/~a -B~a/lib \
                                       ("i586-gnu"
                                        "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
                                       ("x86_64-gnu"
-                                        "/20260302/gcc-stripped-14.3.0-x86_64-pc-gnu.tar.xz")
+                                        "/20241122/gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz")
                                       ("powerpc-linux"
                                        "/20200923/gcc-5.5.0.tar.xz")
                                       ("riscv64-linux"
@@ -970,7 +962,7 @@ exec ~a/bin/~a -B~a/lib \
                           "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5"))
                         ("x86_64-gnu"
                          (base32
-                           "1fhi7f5zld08b6qsyv1d48ha7z0vr8pxr4kf8x7aq1a3kbcv5rkz"))
+                           "1cgbhc76hlccx6v2z7kk7z173lryyq3la5mmbwivl6hbl1zcqg3m"))
                         ("powerpc-linux"
                          (base32
                           "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w"))
@@ -21,11 +21,10 @@
 ;;; Copyright © 2022, 2023 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2024 Evgeny Pisemsky <mail@pisemsky.site>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2025,2026 Anderson Torres <anderson.torres.8519@gmail.com>
+;;; Copyright © 2025 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;; Copyright © 2025 Aiden Isik <aidenisik+git@member.fsf.org>
 ;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
-;;; Copyright © 2026 Nemin <bergengocia@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,12 +44,10 @@
 (define-module (gnu packages build-tools)
  #:use-module (ice-9 optargs)
  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages c)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system guile)
-  #:use-module (guix build-system hare)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
@@ -82,7 +79,6 @@
  #:use-module (gnu packages lisp)
  #: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)
@@ -382,37 +378,24 @@ files and generates build instructions for the Ninja build system.")
              (sha256
               (base32
                "13a9pj7d2mxgv5gbd78di4pb4w722vjis0vmk38m1vdm95v2f9yd"))))
-    (build-system gnu-build-system)
+    (build-system pyproject-build-system)
    (arguments
-     (list
-      #:tests? #f                       ;disabled to avoid extra dependencies
-      ;; 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)
-          (delete 'configure)
-          (replace 'build
-            (lambda _
-              (invoke "python" "./setup.py" "build")))
-          (replace 'install
-            (lambda _
-              (invoke "python" "./setup.py" "install"
-                      (string-append "--prefix=" #$output) "--no-compile")
-              (invoke "python" "-m" "compileall"
-                      "--invalidation-mode=unchecked-hash" #$output)))
-          ;; Meson calls the various executables in out/bin through the
-          ;; Python interpreter, so we cannot use the shell wrapper.
-          (add-after 'install 'wrap
-            (lambda _
-              (let* ((mdist (car (find-files #$output "^mdist\\.py$")))
-                     (site (dirname (dirname mdist))))
-                (substitute* (string-append #$output "/bin/meson")
-                  (("import sys" all)
-                   (format #f "~a~%sys.path.insert(0, ~s)" all site)))))))))
-    (native-inputs (list python-setuptools-bootstrap))
-    (inputs (list python-wrapper ninja))
+     (list #:tests? #f                  ;disabled to avoid extra dependencies
+           #:phases
+           #~(modify-phases %standard-phases
+               ;; Meson calls the various executables in out/bin through the
+               ;; Python interpreter, so we cannot use the shell wrapper.
+               (replace 'wrap
+                 (lambda* (#:key inputs outputs #:allow-other-keys)
+                   (substitute* (search-input-file outputs "bin/meson")
+                     (("import sys" all)
+                      (string-append
+                       all "\n"
+                       "sys.path.insert(0, '"
+                       (site-packages inputs outputs)
+                       "')"))))))))
+    (native-inputs (list python-setuptools))
+    (inputs (list python ninja))
    (home-page "https://mesonbuild.com/")
    (synopsis "Build system designed to be fast and user-friendly")
    (description
@@ -424,6 +407,45 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that
 resembles Python.")
    (license license:asl2.0)))

+(define-public meson-python
+  (package
+    (name "meson-python")
+    (version "0.17.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "meson_python" version))
+              (sha256
+               (base32
+                "10szxcqgki4zwkrwmsirdg68h03k9qmfswd4r5xyz7p1y9lizfgg"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:test-flags #~(list "tests"
+                                ;; The test_pep518 tries to install
+                                ;; dependencies from the network using pip.
+                                "-k" "not test_pep518")))
+    (propagated-inputs
+     (list meson
+           ninja/pinned
+           python-colorama
+           python-cython
+           python-pyproject-metadata
+           python-tomli
+           python-typing-extensions
+           python-wheel))
+    (native-inputs
+     (list ;; For tests.
+           git-minimal/pinned
+           patchelf
+           pkg-config
+           python-cython
+           python-gitpython
+           python-pytest
+           python-pytest-mock))
+    (home-page "https://github.com/mesonbuild/meson-python")
+    (synopsis "Meson-based build backend for Python")
+    (description "Meson-python is a PEP 517 build backend for Meson projects.")
+    (license license:expat)))
+
 (define-public muon
  (package
    (name "muon")
@@ -651,6 +673,12 @@ software.")
              (chdir "build/scons"))))))
    (native-inputs (list python-setuptools python-wheel))))

+;; TODO Remove on the next python-team iteration.
+(define-deprecated/public scons-python2 scons
+  (package
+    (inherit (package-with-python2 scons-3))
+    (name "scons-python2")))
+
 (define-public tup
  (package
    (name "tup")
@@ -1182,57 +1210,41 @@ your existing scripts and tools.  It is inspired by the GNU Make utility
 but it does away with a lot of the complexity that comes with its history.")
    (license license:gpl3+)))

+
 (define-public pdpmake
  (package
    (name "pdpmake")
-    (version "2.0.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "git://git.frippery.org/pdpmake")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "13qfvn0kw1fkpmjdpk0cscmvj5iycdq68kqfiml1slf1936pllb9"))))
+    (version "1.4.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/rmyorston/pdpmake")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0fjx5imd7s0h0yy8h2qc4vkdq7kxqcljnrw6h8n88720xha5z3cb"))))
    (build-system gnu-build-system)
    (arguments
     (list
+      #:test-target "test"
+      #:parallel-tests? #f
+      #:make-flags
+      #~(list "DESTDIR=\"\""
+              (string-append "CC=" #$(cc-for-target))
+              (string-append "PREFIX=" #$output))
      #:phases
      #~(modify-phases %standard-phases
-          (delete 'configure)
-          ;; pdpmake can be built easily without relying on a previous Make
-          ;; implementation; let's do this for the sake of bootstrappability.
-          (replace 'build
-            (lambda _
-              (let ((args (append (find-files "." "\\.c$")
-                                  (list "-o" "make"))))
-                (apply invoke #$(cc-for-target) args))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (with-directory-excursion "testsuite"
-                  (invoke "./runtest" "-v")))))
-          (replace 'install
-            (lambda _
-              (let ((bindir (string-append #$output "/bin"))
-                    (mandir (string-append #$output "/share/man/man1")))
-                (mkdir-p bindir)
-                (mkdir-p mandir)
-                (install-file "make" bindir)
-                (install-file "pdpmake.1" mandir)))))))
+          (delete 'configure))))
    (home-page "https://frippery.org/make/")
-    (synopsis "Public domain POSIX make")
+    (synopsis "POSIX make")
    (description
     "This package contains an implementation of POSIX make.  The default
 configuration enables extensions.  Generally these extensions are compatible
 with GNU make.")
    ;; pdpmake is distributed under the public domain, but the sources include
    ;; tests under the GPL license version 2.
-    (license
-     (list license:gpl2
-           license:public-domain))))
+    (license (list license:gpl2 license:public-domain))))

 (define-public potato-make
  ;; No releases.
@@ -1339,70 +1351,3 @@ The Waf Book and in the API docs
 ;; as meson or ninja which are written in Python as well.
 (define-deprecated-package python-waf
  waf)
-
-(define-public haredo
-  (package
-    (name "haredo")
-    (version "1.0.6")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~autumnull/haredo/")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256 (base32 "1ysm8rgxi0i4zb1q6xj3pf5bwxssjlcc4x158pyd78l8ahz30fn2"))))
-    (build-system hare-build-system)
-    (native-inputs
-     ;; XXX: `harec` and `qbe` are pulled in because Haredo assumes these
-     ;; programs are present and allows build scripts to rely on them freely.
-     ;;
-     ;; See: https://git.sr.ht/~autumnull/haredo/tree/1.0.6/item/doc/haredo.1.scd
-     ;;
-     ;; Importing `harec` the usual way results in a circular dependency for
-     ;; packages that rely on `hare-build-system`.  To avoid that, we import
-     ;; it using delayed evaluation.
-     (list scdoc
-           (module-ref (resolve-interface '(gnu packages hare)) 'harec)
-           qbe))
-    (supported-systems %hare-supported-systems)
-    (arguments
-     (list
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-prefix
-            (lambda _ (setenv "PREFIX" #$output)))
-          (add-before 'build 'override-defaults
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; XXX: To prevent future packagers from needing to do delayed
-              ;; input evaluation in all subsequent packages that rely on
-              ;; `haredo` and `hare-build-system`, this package provides the
-              ;; Guix-packaged `harec` and `qbe` as defaults (which can be
-              ;; overridden if needed by setting the appropriate environment
-              ;; variable).
-              (let ((harec-binary (search-input-file inputs "/bin/harec"))
-                    (qbe-binary (search-input-file inputs "/bin/qbe")))
-                (substitute* "./src/haredo.ha"
-                  (("(\"HAREC\", \"harec\")")
-                   (format #f "(\"HAREC\", \"~a\")" harec-binary))
-                  (("(\"QBE\", \"qbe\")")
-                   (format #f "(\"QBE\", \"~a\")" qbe-binary))))))
-          (replace 'build
-            (lambda _ (invoke "./bootstrap.sh")))
-          (replace 'install
-            (lambda _ (invoke "./bootstrap.sh" "install"))))))
-    (home-page "https://sr.ht/~autumnull/haredo/")
-    (synopsis "Build automator, alternative to @command{make} and @command{redo}")
-    (description "@command{haredo} is a build automator.
-It is an alternative to e.g. @command{make(1)} and @command{redo(1)}.  Features:
-
-@itemize
-@item Script syntax is plain shell script,
-@item Only one command with few extraneous rules,
-@item .do files are short and modular like in redo,
-@item Builds its dependency tree on the fly, uses no database,
-@item Doesn't break the build state when interrupted.
-@end itemize
-")
-    (license license:wtfpl2)))
@@ -194,28 +194,6 @@ algorithms library for calendar dates and durations.  It also provides the
    (home-page "https://howardhinnant.github.io/date/date.html")
    (license license:expat)))

-(define-public ddate
-  (package
-    (name "ddate")
-    (version "0.2.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/bo0ts/ddate")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"))))
-    (build-system cmake-build-system)
-    (arguments '(#:tests? #f)) ; no tests
-    (home-page "https://github.com/bo0ts/ddate")
-    (synopsis "Convert Gregorian dates to Discordian dates")
-    (description
-     "ddate displays the Discordian date and holidays of a given date.
-The Discordian calendar was made popular by the \"Illuminatus!\" trilogy
-by Robert Shea and Robert Anton Wilson.")
-    (license license:public-domain)))
-
 (define-public libical
  (package
    (name "libical")
@@ -297,6 +275,7 @@ data units.")
                            (string-append #$output "/share/man/man1")))))))
    (native-inputs
     (list python-freezegun
+           python-importlib-metadata
           python-packaging
           python-pytest
           python-setuptools
@@ -330,7 +309,7 @@ command-line interface} and a @acronym{TUI, textual user interface} named
 (define-public remind
  (package
    (name "remind")
-    (version "6.02.01")
+    (version "6.0.1")
    (source
     (origin
       (method url-fetch)
@@ -341,8 +320,7 @@ command-line interface} and a @acronym{TUI, textual user interface} named
                                        ".")
                           ".tar.gz"))
       (sha256
-        (base32 "1hp24d48nhlv6f7p6sj4qnqc9pyfgyhjah8w9426bzkqkqb31j9c"))
-       (patches (search-patches "tkremind-fix-fontchooser.patch"))))
+        (base32 "01zhs8lgncpm1229s7b49fhnwwnxyyan845gb47ppkfn03vvc187"))))
    (properties
     `((output-synopsis "tcl" "graphical front-end to Remind calendar program")))
    (build-system gnu-build-system)
@@ -30,7 +30,7 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages perl)
-  #:use-module (gnu packages ruby-xyz))
+  #:use-module (gnu packages ruby-check))

 (define-public ccache
  (package
@@ -36,7 +36,7 @@
 ;;; Copyright © 2020 Josh Marshall <joshua.r.marshall.1991@gmail.com>
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
-;;; Copyright © 2020-2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
 ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022, 2023 David Elsing <david.elsing@posteo.net>
@@ -133,54 +133,47 @@
  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system trivial)
+  #:use-module (guix deprecation)
  #:use-module (ice-9 match)
  #:use-module (srfi srfi-1))

 (define-public atf
  (package
    (name "atf")
-    (version "0.23")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/freebsd/atf")
-              (commit (string-append name "-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "12hcvclzphgkhmp226abhn9nl2j5vcm7nfnqbs8232ws41x1gmw3"))))
+    (version "0.21")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/freebsd/atf")
+                    (commit (string-append name "-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0jwzz6g9jdi5f8v10y0wf3hq73vxyv5qqhkh832ddsj36gn8rlcz"))
+              (patches (search-patches "atf-execute-with-shell.patch"))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      #:configure-flags
-      #~(list (string-append "ATF_SHELL="
-                             #$(this-package-input "bash-minimal")
-                             "/bin/sh"))))
-    (native-inputs
-     (list autoconf
-           automake
-           libtool))
-    (inputs
-     (list bash-minimal))
+     (list #:configure-flags
+           #~(list (string-append "ATF_SHELL="
+                                  #$(this-package-input "bash-minimal")
+                                  "/bin/sh"))))
+    (native-inputs (list autoconf automake libtool))
+    (inputs (list bash-minimal))
    (home-page "https://github.com/freebsd/atf")
    (synopsis "C/C++ Automated Testing Framework libraries")
-    (description
-     "@acronym{ATF, Automated Testing Framework}, is a collection of libraries
-to write test programs in C, C++ and POSIX shell.
+    (description "ATF, or Automated Testing Framework, is a collection of
+libraries to write test programs in C, C++ and POSIX shell.

-The ATF libraries offer a simple API orthogonal through the various bindings,
-allowing developers to quickly learn how to write test programs in different
-languages.
+The ATF libraries offer a simple API.  The API is orthogonal through the
+various bindings, allowing developers to quickly learn how to write test
+programs in different languages.

-ATF-based test programs offer a consistent end-user command-line interface,
-allowing execution to both humans and automation.
+ATF-based test programs offer a consistent end-user command-line interface to
+allow both humans and automation to run the tests.

-ATF-based test programs rely on a third-party execution engine to be run,
-shipped separatedly.  @command{Kyua} is the engine of choice.")
-    (license
-     (list license:bsd-2
-           license:bsd-3))))
+ATF-based test programs rely on an execution engine to be run and this
+execution engine is not shipped with ATF.  Kyua is the engine of choice.")
+    (license (list license:bsd-2 license:bsd-3))))

 (define-public pict
  (package
@@ -322,10 +315,6 @@ like Jasmine or Mocha.")
          (sha256
           (base32
            "04qg1p9afdd6453k18qskazrvscysdcjz9j6w4i6p5x4xyma19v6")))))))
-    (arguments
-     ;; FIXME: The tests hang on the 64bit Hurd.
-     (list #:tests? (and (not (%current-target-system))
-                         (not (system-hurd64?)))))
    (build-system gnu-build-system)
    (home-page "https://libcheck.github.io/check/")
    (synopsis "Unit test framework for C")
@@ -533,25 +522,6 @@ unit testing.  Test output is in XML for automatic testing and GUI based for
 supervised tests.")
    (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball

-(define-public python-pytest-pretty
-  (package
-    (name "python-pytest-pretty")
-    (version "1.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytest_pretty" version))
-       (sha256
-        (base32 "1wrvqhn0r5vpa1xhj61lywms87hc9a6hgnvqmr03w00gwhdr5scp"))))
-    (build-system pyproject-build-system)
-    (propagated-inputs (list python-pytest python-rich))
-    (native-inputs (list python-hatchling))
-    (home-page "https://github.com/samuelcolvin/pytest-pretty")
-    (synopsis "Pytest plugin to customize summary output")
-    (description "@code{pytest-pretty} is a Pytest plugin for customizing the
-appearance of the printed summary data.")
-    (license license:expat)))
-
 (define-public shunit2
  (package
    (name "shunit2")
@@ -1000,19 +970,6 @@ supports a very flexible form of test discovery.")
 has been designed to be fast, light and unintrusive.")
    (license license:expat)))

-(define-public doctest-next
-  (package
-    (inherit doctest)
-    (version "2.4.12")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference (url (package-home-page doctest))
-                                  (commit (string-append "v" version))))
-              (file-name (git-file-name (package-name doctest) version))
-              (sha256
-               (base32
-                "1bwywljm4lzgwl5mig0h4621z7lx3xz0lzhwq9ys71lxdh8ka6qp"))))))
-
 (define-public ftest
  ;; There aren't any releases and it looks more like a small side project.
  ;; It is included for completeness to run tests for package utfcpp.
@@ -1054,16 +1011,15 @@ has been designed to be fast, light and unintrusive.")
  (package
    (name "kyua")
    (version "0.14.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/freebsd/kyua")
-              (commit (string-append name "-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0w238ynhnjz7p2v8fbgxv35kl1x7a4vs86227qhb4gxncr75nsbl"))))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/freebsd/kyua")
+                    (commit (string-append name "-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0w238ynhnjz7p2v8fbgxv35kl1x7a4vs86227qhb4gxncr75nsbl"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1097,30 +1053,15 @@ has been designed to be fast, light and unintrusive.")
              (substitute* "utils/Kyuafile"
                ((".*atf_test_program.*stacktrace_test.*")
                 "")))))))
-    (native-inputs
-     (list autoconf
-           automake
-           gdb-minimal
-           libtool
-           pkg-config))
-    (inputs
-     (list atf
-           lutok
-           sqlite))
+    (native-inputs (list autoconf automake gdb-minimal libtool pkg-config))
+    (inputs (list atf lutok sqlite))
    (home-page "https://github.com/freebsd/kyua")
    (synopsis "Testing framework for infrastructure software")
-    (description
-     "Kyua is a lightweight and simple testing framework for infrastructure
-software., integrating well with various build systems and continuous
-integration frameworks.
-
-Kyua features an expressive test suite definition language, a safe runtime
-engine for test suites and a powerful report generation engine.
-
-Kyua is able to execute test programs written with a plethora of testing
-libraries and languages.  The library of choice is @code{atf}, for which Kyua
-was originally designed, but simple, framework-less and @acronym{TAP, Test
-Anything Protocol} compliant programs can also be executed through Kyua.")
+    (description "Kyua is a testing framework for infrastructure software.
+Kyua is lightweight and simple, and integrates well with various build systems
+and continuous integration frameworks.  Kyua features an expressive test suite
+definition language, a safe runtime engine for test suites and a powerful
+report generation engine.")
    (license license:bsd-3)))

 (define-public googletest
@@ -1355,7 +1296,7 @@ with the @code{klee} package.")
 (define-public klee
  (package
   (name "klee")
-   (version "3.2")
+   (version "3.1")
   (source
    (origin
     (method git-fetch)
@@ -1364,7 +1305,7 @@ with the @code{klee} package.")
           (commit (string-append "v" version))))
     (file-name (git-file-name name version))
     (sha256
-      (base32 "0rvvdbv0c6b2jhsdxhzcbm0smzndd4ibsg1bxwjw0mwkpk21yfph"))))
+      (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6"))))
   (arguments
    (list
     #:strip-directories #~(list "bin") ;don't strip LLVM bitcode in /lib
@@ -1415,7 +1356,7 @@ with the @code{klee} package.")
             (string-append "-DKLEE_UCLIBC_PATH="
                            (search-input-file %build-inputs "/lib/klee/libc.a"))
             "-DENABLE_POSIX_RUNTIME=ON")))
-   (native-inputs (list clang-16 llvm-16 python-lit))
+   (native-inputs (list clang-13 llvm-13 python-lit))
   (inputs (list bash-minimal klee-uclibc gperftools sqlite z3 python python-tabulate))
   (build-system cmake-build-system)
   (supported-systems '("x86_64-linux"))
@@ -1582,6 +1523,31 @@ have been used.  This library is now part of Python (since Python 3.3),
 available via the @code{unittest.mock} module.")
    (license license:expat)))

+;;; This package is unmaintained (see the note at the top of doc/index.rst).
+(define-public python-nose
+  (package
+    (name "python-nose")
+    (version "1.3.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "nose" version))
+        (sha256
+          (base32
+            "164a43k7k2wsqqk1s6vavcdamvss4mz0vd6pwzv2h9n8rgwzxgzi"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'invoke-2to3
+                    (lambda _
+                      (invoke "2to3" "-w" "."))))))
+    (home-page "https://readthedocs.org/docs/nose/")
+    (synopsis "Python testing library")
+    (description
+     "Nose extends the unittest library to make testing easier.")
+    (license license:lgpl2.0+)))
+
 (define-public python-nose2
  (package
    (name "python-nose2")
@@ -1617,30 +1583,23 @@ interfaces and processes.")
 (define-public python-pytest
  (package
    (name "python-pytest")
-    ;; Keep in sync with python-pytest-bootstrap in (gnu packages python-build)
-    (version "9.0.2")
+    (version "8.4.1")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "pytest" version))
       (sha256
-        (base32 "04fz1vbhb2l6k8lmrk8wqhkxhprlnkq21z6rs48rdn1bm58nc63m"))))
+        (base32 "0g593wjl45yck5g1xi8q31s08arxiapw67ipv6g3axs82xlzsrvw"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 3933 passed, 115 skipped, 2 deselected, 11 xfailed, 1 xpassed
      #:test-flags
      ;; Just 2 tests fail:
      ;;   1. access to "/usr/" is required.
      ;;   2. assertion fails to compare length of the list.
-      #~(map (lambda (ls)
-               (string-append "--deselect=" (string-join ls "::")))
-             '(("testing/test_argcomplete.py"
-                "TestArgComplete"
-                "test_remove_dir_prefix")
-               ("testing/test_assertrewrite.py"
-                "TestAssertionRewrite"
-                "test_len")))))
+      ;;
+      ;; 3780 passed, 119 skipped, 3 deselected, 11 xfailed, 1 xpassed
+      #~(list "-k" "not test_remove_dir_prefix and not test_len")))
    (native-inputs
     ;; Tests need the "regular" bash since 'bash-final' lacks `compgen`.
     (list bash
@@ -1648,12 +1607,13 @@ interfaces and processes.")
           python-hypothesis
           python-setuptools
           python-setuptools-scm
-           python-xmlschema))
+           python-xmlschema
+           python-wheel))
    (propagated-inputs
     (list python-iniconfig
           python-packaging-bootstrap
           python-pluggy
-           python-pygments-bootstrap))    ;it is in installation dependencies
+           python-pygments-bootstrap))  ;it is in installation dependencies
    (home-page "https://docs.pytest.org/en/latest/")
    (synopsis "Python testing library")
    (description
@@ -1662,17 +1622,19 @@ and functions, detailed info on failing assert statements, modular fixtures,
 and many external plugins.")
    (license license:expat)))

-;; It's the last 8.X.X version, released on 2025-09-04.
-(define-public python-pytest-8
-  (package
-    (inherit python-pytest)
-    (version "8.4.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytest" version))
-       (sha256
-        (base32 "008fqfrxvg8s6pgnkffl2day4zzjg54dp932ipan3f866fwx1h46"))))))
+(define-deprecated python-pytest-6 python-pytest)
+(export python-pytest-6)
+
+(define-deprecated python-pytest-7 python-pytest)
+(export python-pytest-7)
+
+(define-public python-pytest-bootstrap
+  (package/inherit python-pytest
+    (name "python-pytest-bootstrap")
+    (arguments (list #:tests? #f))
+    (native-inputs
+     (list python-setuptools
+           python-setuptools-scm))))

 (define-public python-pytest-cov
  (package
@@ -2010,24 +1972,24 @@ pytest-lazy-fixture}.")
 (define-public python-pytest-mock
  (package
    (name "python-pytest-mock")
-    (version "3.15.1")
+    (version "3.14.0")
    (source
     (origin
       (method url-fetch)
-       (uri (pypi-uri "pytest_mock" version))
+       (uri (pypi-uri "pytest-mock" version))
       (sha256
-        (base32 "03vsv2q11b6yhs33m9vg852an50qrdrdws92fqcxm5pkyqwa4j8q"))))
+        (base32 "1l0b864arbzrq13z635l1x9ial0w7pgz6svd0nyavkpy3rd2a697"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 85 passed, 5 skipped, 3 warnings
      ;; Skip the assertion rewriting tests, which don't work in the presence
      ;; of read-only Python modules (a limitation of Pytest).
      #:test-flags #~(list "--assert=plain")))
    (native-inputs
     (list python-pytest-asyncio
           python-setuptools
-           python-setuptools-scm))
+           python-setuptools-scm
+           python-wheel))
    (propagated-inputs
     (list python-pytest))
    (home-page "https://github.com/pytest-dev/pytest-mock/")
@@ -2054,35 +2016,22 @@ same arguments.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 193 passed, 6 skipped, 3 deselected, 10 xfailed
      #:test-flags
-      ;; See: <https://github.com/pytest-dev/pytest-xdist/issues/1295>.
-      #~(list #$@(map (lambda (ls)
-                        (string-append "--deselect=testing/"
-                                       (string-join ls "::")))
-                      ;; execnet.gateway_base.RemoteError: Traceback (most
-                      ;; recent call last):
-                      '(("test_looponfail.py"
-                         "TestRemoteControl"
-                         "test_ignore_sys_path_hook_entry")
-                        ;; Failed: matched:  '*HOOK: pytest_handlecrashitem'
-                        ("test_newhooks.py"
-                         "TestCrashItem"
-                         "test_handlecrashitem_one")
-                        ;; Failed: nomatch: '*usage: *
-                        ("test_remote.py"
-                         "test_remote_usage_prog"))))))
+      ;; Failes with execnet.gateway_base.RemoteError: Traceback (most recent
+      ;; call last).
+      #~(list "-k" "not test_ignore_sys_path_hook_entry")))
    (native-inputs
     (list python-filelock
           python-pytest
           python-setuptools
-           python-setuptools-scm))
+           python-setuptools-scm
+           python-wheel))
    (propagated-inputs
     (list python-execnet))
    (home-page "https://github.com/pytest-dev/pytest-xdist")
-    (synopsis "Pytest plugin for distributed testing and loop-on-failures testing modes")
+    (synopsis "Plugin for py.test with distributed testing and loop-on-failing modes")
    (description
-     "The pytest-xdist plugin extends pytest with some unique test execution
+     "The pytest-xdist plugin extends py.test with some unique test execution
 modes: parallelization, running tests in boxed subprocesses, the ability to
 run tests repeatedly when failed, and the ability to run tests on multiple
 Python interpreters or platforms.  It uses rsync to copy the existing program
@@ -2092,19 +2041,19 @@ code to a remote location, executes there, and then syncs the result back.")
 (define-public python-pytest-timeout
  (package
    (name "python-pytest-timeout")
-    (version "2.4.0")
+    (version "2.3.1")
    (source
     (origin
       (method url-fetch)
-       (uri (pypi-uri "pytest_timeout" version))
+       (uri (pypi-uri "pytest-timeout" version))
       (sha256
        (base32
-         "02jls37lng0qfqc70dm8wg25yjbmbkw02l5j689zgvzr045yjs3y"))))
+         "1nb5a6xf2p9zbcasy8136nbxpm1raag5n0q1rbdcnvjw28lpff8j"))))
    (build-system pyproject-build-system)
-    ;; tests: 41 passed, 2 skipped, 4 xfailed
    (native-inputs
     (list python-pexpect
-           python-setuptools))
+           python-setuptools
+           python-wheel))
    (propagated-inputs
     (list python-pytest))
    (home-page "https://github.com/pytest-dev/pytest-timeout")
@@ -2131,7 +2080,15 @@ timeout has been exceeded.")
    (build-system pyproject-build-system)
    (arguments
     ;; See <https://github.com/pytest-dev/pytest-forked/issues/88>.
-     (list #:tests? #f))
+     (list #:tests? #f
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'build 'pretend-version
+                 ;; The version string is usually derived via setuptools-scm,
+                 ;; but without the git metadata available, the version string
+                 ;; is set to '0.0.0'.
+                 (lambda _
+                   (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
    (native-inputs
     ;; XXX: The bootstrap variant of Pytest is used to ensure the
     ;; 'hypothesis' plugin is not in the environment (due to
@@ -2409,20 +2366,17 @@ since the last commit or what tests are currently failing.")
 (define-public python-coverage
  (package
    (name "python-coverage")
-    (version "7.13.2")
+    (version "7.11.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/coveragepy/coveragepy")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "coverage" version))
       (sha256
-        (base32 "1vf1qa2cndkrr0l6yc84frfmabr96vkly9nsw0n0cgxf10n1k23m"))))
+        (base32 "0l403f6d59q8rik9vvzb6982qad0zrfj87dqydzsz8hwmh2dayqn"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 1348 passed, 27 skipped
+      ;; tests: 1303 passed, 23 skipped
      #:test-flags
      #~(list "--numprocesses" (number->string (min 8 (parallel-job-count)))
              #$@(map (lambda (file) (string-append "--ignore=tests/" file))
@@ -2447,13 +2401,12 @@ since the last commit or what tests are currently failing.")
              #$@(map (lambda (test) (string-append "--deselect=tests/test_"
                                                    test))
                      ;; AssertionError
-                      (list "api.py::ReportIncludeOmitTest"
-                            "api.py::XmlIncludeOmitTest"
-                            "api.py::RelativePathTest::test_files_up_one_level"
+                      (list "api.py::RelativePathTest::test_files_up_one_level"
                            "concurrency.py::SigtermTest::\
 test_sigterm_multiprocessing_saves_data"
                            "oddball.py::DoctestTest::test_doctest"
-                            "oddball.py::MockingProtectionTest"
+                            "oddball.py::MockingProtectionTest::\
+test_os_path_exists"
                            "plugins.py::PluginTest::\
 test_local_files_are_importable"
                            "regions.py::test_real_code_regions"
@@ -2511,33 +2464,28 @@ executed.")
 (define-public python-pytest-asyncio
  (package
    (name "python-pytest-asyncio")
-    (version "1.3.0")
+    (version "1.0.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/pytest-dev/pytest-asyncio")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pytest_asyncio" version))
       (sha256
-        (base32 "02ibw934ppy66vkjc9ihwc5zp66pbzcsqg0irf7gnxpi9ck8qqii"))))
+        (base32 "0gwbqikldfy5yvyzhi71h7vicni2dchj0iarsbmf2mj47z8n6m6i"))))
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 233 passed, 7 deselected
      #:test-flags
+      ;; 4 failed, 163 passed
      #~(list "-k" (string-join
-                    ;; XXX: Not clear why these tests fail:
-                    (list "not test_event_loop_fixture_asyncgen_error"
-                          "test_event_loop_fixture_handles_unclosed_async_gen"
-                          (string-append "test_standalone_test_does_not_"
-                                         "trigger_warning_about_no_current_"
-                                         "event_loop_being_set")
-                          "test_warns_when_scope_argument_is_present")
+                    (list "not test_strict_mode_ignores_unmarked_coroutine"
+                          "test_strict_mode_ignores_unmarked_fixture"
+                          "test_strict_mode_marked_test_unmarked_fixture_warning"
+                          "test_strict_mode_marked_test_unmarked_autouse_fixture_warning")
                    " and not "))))
    (native-inputs
     (list python-setuptools
-           python-setuptools-scm))
+           python-setuptools-scm
+           python-wheel))
    (propagated-inputs
     (list python-pytest
           python-typing-extensions))
@@ -2549,8 +2497,17 @@ testing tools.  @code{pytest-asyncio} provides useful fixtures and markers
 to make testing async code easier.")
    (license license:asl2.0)))

-;; It's the last 0.26.X version which is still required and has breaking
-;; changes with 1.X.X.
+(define-public python-pytest-asyncio-0.23
+  (package
+    (inherit python-pytest-asyncio)
+    (version "0.23.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest_asyncio" version))
+       (sha256
+        (base32 "1lz4h8y6m6hxnsl7kqh0rjxqp5q2wc2m5gd88371rikd7ari16vm"))))))
+
 (define-public python-pytest-asyncio-0.26
  (package
    (inherit python-pytest-asyncio)
@@ -2560,25 +2517,24 @@ to make testing async code easier.")
       (method url-fetch)
       (uri (pypi-uri "pytest_asyncio" version))
       (sha256
-        (base32 "0bri1scs8whdrxb3jrv0ywiz20qb0mrll3kzkvriy928frljmpy4"))))
-    (arguments
-     (list
-      ;; tests: 202 passed, 4 deselected
-      #:test-flags
-      #~(list "-k" (string-join
-                    (list "not test_strict_mode_ignores_unmarked_coroutine"
-                          "test_strict_mode_ignores_unmarked_fixture"
-                          "test_strict_mode_marked_test_unmarked_fixture_warning"
-                          "test_strict_mode_marked_test_unmarked_autouse_fixture_warning")
-                    " and not "))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              (substitute* "pyproject.toml"
-                ;; Pytest is in propagated inputs, remove higher boundary to
-                ;; avoid propagation of python-pytest-8.
-                ((">=8.2,<9") ">=8.2")))))))))
+        (base32 "0bri1scs8whdrxb3jrv0ywiz20qb0mrll3kzkvriy928frljmpy4"))))))
+
+(define-public python-pytest-asyncio-0.21
+  (package
+    (inherit python-pytest-asyncio)
+    (version "0.21.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest_asyncio" version))
+       (sha256
+        (base32 "0iag2lmglfajiasxi3dr2110gq0nxc5paq6hp4kb751b4gy3hxyn"))))
+    (native-inputs
+     (list python-flaky
+           python-pytest-trio
+           python-setuptools-scm
+           python-setuptools
+           python-wheel))))

 (define-public python-codecov
  (package
@@ -2606,6 +2562,32 @@ to make testing async code easier.")
 C/C++, R, and more, and uploads it to the @code{codecov.io} service.")
    (license license:asl2.0)))

+(define-public python-testpath
+  (package
+    (name "python-testpath")
+    (version "0.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/jupyter/testpath")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0pib1xsvjwwyyhv0sqzxvgg814k83dmv1ppwfkkq9llkhr8k7s9y"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-flit-core
+           python-pytest))
+    (home-page "https://github.com/jupyter/testpath")
+    (synopsis "Test utilities for code working with files and commands")
+    (description
+     "Testpath is a collection of utilities for Python code working with files
+and commands.  It contains functions to check things on the file system, and
+tools for mocking system commands and recording calls to those.")
+    (license license:expat)))
+
 (define-public python-pytest-localserver
  (package
    (name "python-pytest-localserver")
@@ -2669,82 +2651,48 @@ across test runs.")
 (define-public python-pytest-sugar
  (package
    (name "python-pytest-sugar")
-    (properties '((commit . "4b1cd8d03060072db3737983ace80f416534a2c4")
-                  (revision . "0")))
-    (version (git-version "1.1.1"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
+    (version "1.0.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Teemu/pytest-sugar")
-             (commit (assoc-ref properties 'commit))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pytest-sugar" version))
       (sha256
-        (base32 "1smaxs7qabdfsvr9rvyyfp1d93j8vm0ghqwk4cskc9bnfhbhdn7d"))))
+        (base32 "02kc4y0ry4y9lp63kjq9p7yvbjijfxn1fcn6wx6c1c7mb0rfh8k4"))))
    (build-system pyproject-build-system)
-    (propagated-inputs (list python-pytest python-termcolor))
-    (native-inputs (list python-setuptools))
-    (home-page "https://github.com/Teemu/pytest-sugar")
+    (propagated-inputs
+     (list python-packaging python-pytest python-termcolor))
+    (native-inputs
+     (list python-setuptools python-wheel))
+    (home-page "https://pivotfinland.com/pytest-sugar/")
    (synopsis "Plugin for pytest that changes the default look and feel")
    (description
     "@code{pytest-sugar} is a plugin for py.test that changes the default
-look and feel of @code{python-pytest}, using a progress bar and showing
-failures and errors instantly.")
+look and feel of py.test, using a progress bar and showing failures and errors
+instantly.")
    (license license:bsd-3)))

 (define-public python-hypothesis
  (package
    (name "python-hypothesis")
-    (version "6.150.2")
+    (version "6.135.26")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/HypothesisWorks/hypothesis")
-              (commit (string-append "hypothesis-python-" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "hypothesis" version))
       (sha256
-        (base32 "0c8mrgvyhvgrkfzxi953hmz9h6jgbdr752rcm9x87mqfxg3vzvp6"))))
+        (base32 "0073lb8xp789fxs5g8dmi3pr2p8q7imfsksidy0ccfahrm30xbvk"))))
    (build-system pyproject-build-system)
    (arguments
-     (list
-      ;; tests: 3528 passed, 13 skipped, 15 deselected, 3 xfailed, 1 xpassed
-      #:test-flags
-      ;; Run slim portion of tests, see more test scenarios in
-      ;; <hypothesis-python/tests/README.rst>.
-      #~(list "tests/cover"
-              "-k"
-              (string-join
-               ;; ModuleNotFoundError: No module named 'pexpect'
-               (list "not test_interactive_example_does_not_emit_warning"
-                     ;; Network access is required or setting up local
-                     ;; timezone.
-                     "test_can_generate_from_all_registered_types[ZoneInfo]"
-                     "test_disallowed_inputs_to_target"
-                     "test_generic_collections_only_use_hashable_elements[Dict]"
-                     "test_generic_collections_only_use_hashable_elements[FrozenSet]"
-                     "test_generic_collections_only_use_hashable_elements[Set]"
-                     "test_generic_collections_only_use_hashable_elements[dict]"
-                     "test_generic_collections_only_use_hashable_elements[set]"
-                     "test_hashable_type_unhashable_value"
-                     "test_inference_on_generic_collections_abc_aliases[Hashable]"
-                     "test_is_not_identity"
-                     "test_resolves_builtin_types[object]"
-                     "test_resolves_forwardrefs_to_builtin_types[object]"
-                     "test_timezone_lookup[tzinfo]")
-               " and not "))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir-to-source
-            (lambda _
-              (chdir "hypothesis-python"))))))
+     ;; XXX: Tests are not distributed with the PyPI archive.
+     (list #:tests? #f))
    (native-inputs
-     (list python-pytest-bootstrap
-           python-setuptools))
+     (list python-pytest-bootstrap      ;to pass sanity check
+           python-setuptools
+           python-wheel))
    (propagated-inputs
-     (list python-sortedcontainers))
+     (list python-attrs-bootstrap
+           python-exceptiongroup
+           python-sortedcontainers))
    (home-page "https://hypothesis.works/")
    (synopsis "Library for property based testing")
    (description "Hypothesis is a library for testing your Python code against a
@@ -2753,6 +2701,9 @@ based on the Haskell library, Quickcheck, and is designed to integrate
 seamlessly into your existing Python unit testing work flow.")
    (license license:mpl2.0)))

+(define-deprecated/public-alias python-hypothesis-next
+  python-hypothesis)                   ;may be removed after 2025-12-01
+
 ;; WARNING: This package is a dependency of mesa.
 (define-public python-lit
  (package
@@ -2920,6 +2871,26 @@ a Pytest test execution.")
 mypy plugins.")
    (license license:expat)))

+(define-public python-pytest-mypy-testing
+  (package
+    (name "python-pytest-mypy-testing")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-mypy-testing" version))
+       (sha256
+        (base32 "0kqb3hi4jrc4knhc9pxv44m7c1jjkkwqx0dyghq4mw6wphlsv3q8"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-flit-core))
+    (propagated-inputs (list python-mypy python-pytest))
+    (home-page "https://github.com/davidfritzsche/pytest-mypy-testing")
+    (synopsis "Pytest plugin to check mypy output")
+    (description "This package provides a pytest plugin to test that mypy
+produces a given output.  As mypy can be told to display the type of an
+expression this allows you to check mypys type interference.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public python-pytest-perf
  (package
    (name "python-pytest-perf")
@@ -2992,7 +2963,7 @@ each of the environments.")
      #:test-flags
      '(list "-k" "not test_syntax_error")))
    (native-inputs
-     (list python-pytest python-setuptools python-wheel))
+     (list python-coverage python-pytest python-setuptools python-wheel))
    (propagated-inputs
     (list python-pyflakes))
    (home-page "https://github.com/fschulze/pytest-flakes")
@@ -3000,6 +2971,36 @@ each of the environments.")
    (description "Pytest plugin for checking Python source code with pyflakes.")
    (license license:expat)))

+(define-public python-coverage-test-runner
+  (package
+    (name "python-coverage-test-runner")
+    (version "1.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/"
+             "coverage-test-runner/snapshot/coverage-test-runner-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1kjjb9llckycnfxag8zcvqsn4z1s3dwyw6b1n0avxydihgf30rny"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "./testrun"))))))
+    (propagated-inputs
+     (list python-coverage))
+    (home-page "https://liw.fi/coverage-test-runner/")
+    (synopsis "Python module for running unit tests")
+    (description "@code{CoverageTestRunner} is a python module for running
+unit tests and failing them if the unit test module does not exercise all
+statements in the module it tests.")
+    (license license:gpl3+)))
+
 (define-public python-pylint
  (package
    (name "python-pylint")
@@ -3058,6 +3059,26 @@ pragmas to control it from within your code.  Additionally, it is
 possible to write plugins to add your own checks.")
    (license license:gpl2+)))

+(define-public python-discover
+  (package
+    (name "python-discover")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "discover" version))
+       (sha256
+        (base32
+         "0y8d0zwiqar51kxj8lzmkvwc3b8kazb04gk5zcb4nzg5k68zmhq5"))))
+    (build-system python-build-system)
+    (home-page "https://pypi.org/project/discover/")
+    (synopsis
+     "Python test discovery for unittest")
+    (description
+     "Discover provides test discovery for unittest, a feature that has been
+backported from Python 2.7 for Python 2.4+.")
+    (license license:bsd-3)))
+
 (define-public behave
  (package
    (name "behave")
@@ -3449,13 +3470,13 @@ with a focus on working with embedded toolchains.")
                (("\"date\"")
                 (format #f "~s" (search-input-file inputs "bin/date"))))))

-          #$@(if (target-32bit?)
+          #$@(if (target-64bit?)
+                 #~()
                 #~((add-after 'unpack 'apply-32bit-patch
                      (lambda _
                        (let ((patch #$(local-file
                                  (search-patch "libfaketime-32bit.patch"))))
-                          (invoke "patch" "--force" "-p1" "-i" patch)))))
-                 #~())
+                          (invoke "patch" "--force" "-p1" "-i" patch))))))

          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
@@ -3545,7 +3566,7 @@ pre-condition.")
 (define-public umockdev
  (package
    (name "umockdev")
-    (version "0.19.1")
+    (version "0.17.13")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/martinpitt/umockdev/"
@@ -3553,7 +3574,7 @@ pre-condition.")
                                  "umockdev-" version ".tar.xz"))
              (sha256
               (base32
-                "09plskc0rqwngqssbn2nr8da4zwzkhwg6x5yf109pf36wglf1v1c"))))
+                "1kqkraag5v1jl5qfv0mb3ckm8yq2im21mng08sbs9dh9c9pbyvkc"))))
    (build-system meson-build-system)
    (arguments
     (list #:phases
@@ -100,7 +100,7 @@
           mmtf-cpp
           googletest
           pkg-config
-           pybind11-2))
+           pybind11))
    (inputs
      `(("glew" ,glew)
        ("libarchive" ,libarchive)
@@ -194,8 +194,7 @@ bioinformatics, materials science, and related areas.")
           (sha256
             (base32
               "1vhjh0gilmm90269isrkvyzwwh1cj3bwcxls394psadw1a89mk14"))))))
-    (inputs (list avogadrolibs hdf5 molequeue openbabel qtbase-5 qtsvg-5
-                  qtwayland-5))
+    (inputs (list avogadrolibs hdf5 molequeue openbabel qtbase-5 qtsvg-5))
    ;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
    (arguments
     (list
@@ -217,8 +216,7 @@ bioinformatics, materials science, and related areas.")
                (list
                  "QT_PLUGIN_PATH"
                  'suffix
-                  (list (string-append #$qtsvg-5 "/lib/qt5/plugins")
-                        (string-append #$qtwayland-5 "/lib/qt5/plugins")))))))))
+                  (list (string-append #$qtsvg-5 "/lib/qt5/plugins")))))))))
    (home-page "https://www.openchemistry.org/projects/avogadro2/")
    (synopsis "Advanced molecule editor")
    (description
@@ -1062,6 +1060,7 @@ integrals for Gaussian type functions.")
              (string-append "-DPYTHON_INSTALL_DIR="
                             (site-packages %build-inputs %outputs)))
      #:phases
+      (with-extensions (list (pyproject-guile-json))
        #~(modify-phases %standard-phases
            (add-after 'unpack 'patch-includes
              (lambda _
@@ -1100,7 +1099,7 @@ integrals for Gaussian type functions.")
                  (with-directory-excursion "../source"
                    (setenv "PYTHONPATH" "../build/py")
                    (invoke "python3" "-m" "unittest" "discover" "-v"
-                          "-s" "tests"))))))))
+                            "-s" "tests")))))))))
    (inputs (list python zlib))
    (native-inputs
     (list fast-float
@@ -1470,6 +1469,7 @@ and rendering molecules.")
                  (guix build utils)
                  ((guix build pyproject-build-system) #:prefix py:))
      #:phases
+      (with-extensions (list (pyproject-guile-json))
        #~(modify-phases %standard-phases
            (add-before 'configure 'patch-cmake
              (lambda _
@@ -1512,14 +1512,9 @@ and rendering molecules.")
            (add-after 'install 'check
              (assoc-ref %standard-phases 'check))
            (add-before 'check 'add-install-to-pythonpath
-            (assoc-ref py:%standard-phases 'add-install-to-pythonpath)))))
+              (assoc-ref py:%standard-phases 'add-install-to-pythonpath))))))
    (inputs (list python))
-    (native-inputs
-     (list doxygen
-           python
-           python-cython-0
-           python-sphinx
-           python-setuptools))
+    (native-inputs (list doxygen python python-cython-0 python-sphinx))
    (home-page "https://github.com/rareylab/RingDecomposerLib")
    (synopsis "Calculate ring topology descriptions")
    (description "RingDecomposerLib is a library for the calculation of
@@ -1635,6 +1630,7 @@ Tanimoto scoring.")
               "-DCMAKE_INCLUDE_PATH="
               (search-input-directory %build-inputs "/include/avalontoolkit")))
      #:phases
+      (with-extensions (list (pyproject-guile-json))
        #~(modify-phases %standard-phases
            (add-after 'unpack 'copy-external-dependencies
              (lambda _
@@ -1694,7 +1690,7 @@ Tanimoto scoring.")
                              ;; Circular import
                              "pythonSourceTests"
                              ) "|")
-                         ")")))))))))
+                           ")"))))))))))
    (inputs
     (list avalon-toolkit
           cairo
@@ -1390,7 +1390,7 @@ libraries providing most of the functionality of the original.")
 (define-public schemesh
  (package
    (name "schemesh")
-    (version "0.9.3")
+    (version "0.9.2")
    (source
     (origin
       (method git-fetch)
@@ -1398,7 +1398,7 @@ libraries providing most of the functionality of the original.")
              (url "https://github.com/cosmos72/schemesh")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
-       (sha256 (base32 "1dki6qa2ws5gjqnmp8ldl4g2lg739i1r0cqflwavlyipb1f2j51s"))))
+       (sha256 (base32 "0rnd2mz3vnsxdac5q7i625mkmfc1znp865wxdqqx1c6dqb26bqrv"))))
    (build-system gnu-build-system)
    (arguments
     (list #:tests? #f
@@ -8,7 +8,7 @@
 ;;; Copyright © 2022, 2024 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2023 David Pflug <david@pflug.io>
 ;;; Copyright © 2025 David Thompson <davet@gnu.org>
-;;; Copyright © 2025-2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2025 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -93,7 +93,6 @@
                       (srfi srfi-1))
           #:configure-flags #~'("--localstatedir=/var" ;for /var/log/cuirass
                                 "--sysconfdir=/etc") ;for /etc/cuirass/forge-tokens
-
           ;; XXX: HTTP tests fail on aarch64 due to Fibers errors, disable them
           ;; on that architecture for now.
           #:tests? (let ((s (or (%current-target-system)
@@ -102,21 +101,6 @@
           #:parallel-tests? #f
           #:phases
           #~(modify-phases %standard-phases
-               (add-before 'check 'skip-known-failing-tests
-                 (lambda _
-                   ;; Skip tests that fail with SRFI-64 as found in Guile
-                   ;; 3.0.11.  Remove this phase when
-                   ;; <https://codeberg.org/guix/cuirass/pulls/125> is merged.
-                   (substitute* "tests/database.scm"
-                     (("\\(test-equal \"db-update-specification, \
-missing spec\"" all)
-                      (string-append "(test-skip 1)\n" all)))
-                   (substitute* "tests/forgejo.scm"
-                     (("\\(test-equal \"forgejo-handle-notification\"" all)
-                      (string-append "(test-skip 1)\n" all)))
-                   (substitute* "tests/remote.scm"
-                     (("\\(test-group-with-cleanup")
-                      "(test-group"))))
               (add-after 'install 'wrap-program
                 (lambda* (#:key inputs outputs #:allow-other-keys)
                   ;; Wrap the 'cuirass' command to refer to the right modules.
@@ -82,6 +82,7 @@
               "-Dpy-overrides-dir="
               (py:site-packages %build-inputs %outputs) "/gi/overrides"))
      #:phases
+      (with-extensions (list (pyproject-guile-json))
        #~(modify-phases %standard-phases
            (add-before 'configure 'set-gtk-module-path
              (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -101,7 +102,7 @@
                   (string-quote (string-append #$output "/bin/pastebin")))
                  (("'xdg-open'")
                   (string-quote (search-input-file inputs
-                                                  "/bin/xdg-open")))))))))
+                                                    "/bin/xdg-open"))))))))))
    (inputs
     (list dbus
           glib                         ; for gio
@@ -24,18 +24,17 @@

 (define-module (gnu packages clojure)
  #:use-module (gnu packages)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages guile)
  #:use-module (gnu packages java)
  #:use-module (gnu packages maven)
-  #:use-module (guix gexp)
+  #:use-module (gnu packages readline)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix build-system ant)
  #:use-module (guix build-system copy)
-  #:use-module (guix build-system clojure))
+  #:use-module (guix build-system clojure)
+  #:use-module (ice-9 match))

 (define-public clojure-spec-alpha
  (package
@@ -274,6 +273,7 @@ and line numbers not only to lists, but also to symbols, vectors and maps.")
                   (base32
                    "072dv6s2gxcg8snlgkpjk6bp1cb17bgfshdq6ijsa4yslpqbf9wc")))))
      (build-system ant-build-system)
+      (inputs (list icedtea))
      (arguments
       `(#:imported-modules ((guix build clojure-utils)
                             (guix build clojure-build-system)
@@ -391,61 +391,45 @@ designs.")
        `(delete-file ,(string-append "clojure-tools-" version ".jar")))))
    (build-system copy-build-system)
    (arguments
-     (list #:install-plan #~'(("deps.edn" "lib/clojure/")
-                              ("example-deps.edn" "lib/clojure/")
-                              ("tools.edn" "lib/clojure/")
-                              ("exec.jar" "lib/clojure/libexec/")
-                              ("clojure" "bin/")
-                              ("clojure.1" "share/man/man1/")
-                              ("clj" "bin/")
-                              ("clj.1" "share/man/man1/"))
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'install 'fix-paths
-                 (lambda _
-                   (substitute* "clj"
-                     (("BINDIR") (string-append #$output "/bin")))
-                   (substitute* "clojure"
-                     (("PREFIX") (string-append #$output "/lib/clojure")))))
-               (add-after 'fix-paths 'copy-tools-deps-alpha-jar
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* "clojure"
-                     (("\\$install_dir/libexec/clojure-tools-\\$version\\.jar")
-                      (let* ((selected (assq-remove! inputs "openjdk"))
-                             (input-dirs (map cdr selected))
-                             (jars (apply append
-                                          (map (lambda (dir)
-                                                 (find-files dir "\\.jar$"))
-                                               input-dirs))))
-                        (string-join jars ":"))))))
-               (add-after 'install 'wrap-clojure
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((coreutils (assoc-ref inputs "coreutils-minimal"))
-                         (jdk (assoc-ref inputs "openjdk")))
-                     (wrap-script (string-append #$output "/bin/clojure")
-                       ;; Ensure that coreutils and java are accessible.
-                       `("PATH" suffix (,(string-append coreutils "/bin")
-                                        ,(string-append jdk "/bin"))))))))))
-    (inputs (list clojure
+     `(#:install-plan
+       '(("deps.edn" "lib/clojure/")
+         ("example-deps.edn" "lib/clojure/")
+         ("tools.edn" "lib/clojure/")
+         ("exec.jar" "lib/clojure/libexec/")
+         ("clojure" "bin/")
+         ("clj" "bin/"))
+       #:modules ((guix build copy-build-system)
+                  (guix build utils)
+                  (srfi srfi-1)
+                  (ice-9 match))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-paths
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "clojure"
+               (("PREFIX") (string-append (assoc-ref outputs "out") "/lib/clojure")))
+             (substitute* "clj"
+               (("BINDIR") (string-append (assoc-ref outputs "out") "/bin"))
+               (("rlwrap") (which "rlwrap")))))
+         (add-after 'fix-paths 'copy-tools-deps-alpha-jar
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* "clojure"
+               (("\\$install_dir/libexec/clojure-tools-\\$version\\.jar")
+                (string-join
+                 (append-map (match-lambda
+                               ((label . dir)
+                                (find-files dir "\\.jar$")))
+                             inputs)
+                 ":"))))))))
+    (inputs (list rlwrap
+                  clojure
                  clojure-tools-deps
-                  coreutils-minimal
-                  guile-3.0/pinned
                  java-commons-logging-minimal
-                  java-slf4j-nop
-                  ;; Depend on JDK instead of JRE since common developer tools
-                  ;; such as ‘cider-nrepl’ require it.
-                  (list openjdk "jdk")))
+                  java-slf4j-nop))
    (home-page "https://clojure.org/releases/tools")
    (synopsis "CLI tools for the Clojure programming language")
-    (description "This package provides the @command{clojure} and
-@command{clj} command line tools that can be used to start a Clojure REPL,
-launch a main or execute any Clojure function.
-
-Dependencies declared in @file{deps.edn} files are resolved and downloaded
-beforehand.
-
-The @command{clj} executable is a readline wrapper around @command{clojure}
-delegating to the @command{rlwrap} optional dependency.")
+    (description "The Clojure command line tools can be used to start a
+Clojure repl, use Clojure and Java libraries, and start Clojure programs.")
    (license license:epl1.0)))

 (define-public clojure-algo-generic
@@ -769,32 +753,6 @@ Uses StAX internally
 lazy - should allow parsing and emitting of large XML documents")
    (license license:epl1.0)))

-(define-public clojure-data-zip
-  (package
-    (name "clojure-data-zip")
-    (version "1.1.1")
-    (home-page "https://github.com/clojure/data.zip")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url home-page)
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0l13xs0jlv2cyh3rqdp1f5r0jsff9p1h7dh49112xxrkcvzck876"))))
-    (build-system clojure-build-system)
-    (arguments
-     '(#:source-dirs '("src/main/clojure")
-       #:test-dirs '("src/test/clojure")
-       #:doc-dirs '()))
-    (synopsis
-     "Clojure library for filtering trees, and XML trees in particular")
-    (description
-     "@code{data.zip} is a Clojure library for filtering trees using the zipper
-abstraction.")
-    (license license:epl1.0)))
-
 (define-public clojure-instaparse
  (let ((version "1.4.12"))
    (package
@@ -962,7 +920,7 @@ work with command-line arguments.")
 (define-public clojure-tools-deps
  (package
    (name "clojure-tools-deps")
-    (version "0.28.1578")
+    (version "0.28.1569")
    (home-page "https://github.com/clojure/tools.deps")
    (source (origin
              (method git-fetch)
@@ -972,7 +930,7 @@ work with command-line arguments.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1w3f8cl81q4kln6iz74fnfzms4c4x279ivh1962pcg22q8l1w8d5"))))
+                "04s8cishxm1y4vnx8mpdk1qma6j0khmb356j69fsy14s615yjgfg"))))
    (build-system clojure-build-system)
    (arguments
     `(#:source-dirs '("src/main/clojure" "src/main/resources")
@@ -992,10 +950,15 @@ work with command-line arguments.")
                (string-append "org.clojure/clojure {:local/root \""
                               (assoc-ref inputs "clojure")
                               "/share/java/clojure.jar\"}"))))))))
-    (propagated-inputs (list maven-3.8-core
-                             maven-resolver-1.6-connector-basic
-                             maven-resolver-1.6-transport-http
-                             maven-resolver-1.6-transport-file
+    (propagated-inputs (list maven-resolver-api
+                             maven-resolver-spi
+                             maven-resolver-impl
+                             maven-resolver-util
+                             maven-resolver-connector-basic
+                             maven-resolver-provider
+                             maven-core
+                             maven-resolver-transport-http
+                             maven-resolver-transport-file
                             clojure-tools-gitlibs
                             clojure-tools-cli
                             clojure-data-xml
@@ -1175,7 +1138,7 @@ asynchronous support.")
 (define-public cognitect-aws-api
  (package
    (name "cognitect-aws-api")
-    (version "0.8.800")
+    (version "0.8.774")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1184,7 +1147,7 @@ asynchronous support.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "17sxj3mvq4iasr0kchbx2anmrh25v8bvmpam4si704vksmnm28p3"))
+                "1y3impishicd8niy1vddx6c80pnbpz24zfr7vysi4r56p1vqnwmb"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -37,7 +37,7 @@
  #:use-module (gnu packages libevent)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages ruby-xyz)
+  #:use-module (gnu packages ruby-check)
  #:use-module (gnu packages sphinx)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages texinfo)
@@ -8,7 +8,7 @@
 ;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019-2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2019-2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
 ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
@@ -571,33 +571,36 @@ Cmake files.  It supports syntax highlighting, indenting and refilling of
 comments.")))

 (define-public qmsetup
-  (package
-    (name "qmsetup")
-    (version "1.0.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/stdware/qmsetup")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0cfl26ff8y384cbgi340l1znxvdjmc4f5s86kl20gkkwlkc11zdy"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:tests? #f                     ;no test suite
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'patch-paths
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       (substitute* "src/corecmd/utils_unix.cpp"
-                         (("\"patchelf\"")
-                          (format #f "~s" (search-input-file
-                                           inputs "bin/patchelf")))))))))
-    (inputs (list patchelf syscmdline))
-    (home-page "https://github.com/stdware/qmsetup")
-    (synopsis "CMake modules and basic libraries for C/C++ projects")
-    (description "QMSetup is a set of CMake Modules and Basic Libraries for
+  (let ((commit "89fa57046241c26dfcfd97ceba174728b24bdd27")
+        (revision "0"))
+    (package
+      (name "qmsetup")
+      ;; The base version string is retrieved from the CMakeLists.txt file.
+      (version (git-version "0.0.1.5" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/stdware/qmsetup")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0nqpblv08yqv97vjv7cxkpf160s3877gnd7jjqxnfrrknm2396r1"))))
+      (build-system cmake-build-system)
+      (arguments
+       (list
+        #:tests? #f                     ;no test suite
+        #:phases #~(modify-phases %standard-phases
+                     (add-after 'unpack 'patch-paths
+                       (lambda* (#:key inputs #:allow-other-keys)
+                         (substitute* "src/corecmd/utils_unix.cpp"
+                           (("\"patchelf\"")
+                            (format #f "~s" (search-input-file
+                                             inputs "bin/patchelf")))))))))
+      (inputs (list patchelf syscmdline))
+      (home-page "https://github.com/stdware/qmsetup")
+      (synopsis "CMake modules and basic libraries for C/C++ projects")
+      (description "QMSetup is a set of CMake Modules and Basic Libraries for
 C/C++ projects.  It features:
@itemize
@item Helpful CMake utilities
@@ -607,12 +610,12 @@ C/C++ projects.  It features:
@item Support calling Doxygen via CMake conveniently
@item Support calling Qt Linguist Tools via CMake conveniently
@end itemize")
-    (license license:expat)))
+      (license license:expat))))

 (define-public tinycmmc
-  ;; XXX: No tagged releases; this is the master tip.
-  (let ((commit "2e007ba059a4991c011a7193c9d7df28826c9adc")
-        (revision "1"))
+  ;; XXX: Does not release anymore.
+  (let ((commit "8238a6c1b90536e211fddf356dc3af26ea7c2f2c")
+        (revision "0"))
    (package
      (name "tinycmmc")
      (version (git-version "0.1.0" revision commit))
@@ -620,14 +623,13 @@ C/C++ projects.  It features:
       (origin
         (method git-fetch)
         (uri (git-reference
-                (url "https://github.com/Grumbel/tinycmmc")
-                (commit commit)))
+               (url "https://github.com/Grumbel/tinycmmc")
+               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0ix2v0zrrcanflxdm0r4xpgda8lkls3ir7xqimdk2na4dfqnc05g"))))
+          (base32 "1nv1439psdnq99vqpmp4nj2630l85cfwxzmf7rgpa436q09ql77p"))))
      (build-system cmake-build-system)
-      (arguments
-       (list #:tests? #f))              ; No tests.
+      (arguments (list #:tests? #f))      ;no test suite
      (home-page "https://github.com/Grumbel/tinycmmc")
      (synopsis "Tiny CMake Module Collections")
      (description "The tinycmmc package contains a small collection of reusable
@@ -424,7 +424,7 @@ COCOMO model or user-provided parameters.")
 (define-public cloc
  (package
    (name "cloc")
-    (version "2.08")
+    (version "2.06")
    (source
     (origin
       (method git-fetch)
@@ -433,7 +433,7 @@ COCOMO model or user-provided parameters.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1pk4v9w2c8wzdjimk23gndrcrd3y6cxi0avds3a36yasd3mg45hm"))))
+        (base32 "02l56ks3p3344nf6lz9s3aym9f0xslkns8q8d8zm1i3whf98iymv"))))
    (build-system gnu-build-system)
    (inputs
     (list bash-minimal
@@ -1148,3 +1148,6 @@ will fail (i.e., it will exit with a non-zero exit code) when any of these
 requirements is not met.")
    (properties '((lint-hidden-cpe-vendors . ("vmware"))))
    (license license:expat)))
+
+(define-deprecated-package python-xenon
+  xenon)
@@ -88,7 +88,6 @@
  #:use-module (gnu packages curl)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages file)
-  #:use-module (gnu packages gcc)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gnome)
@@ -1475,7 +1474,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to
 (define-public 7zip
  (package
    (name "7zip")
-    (version "26.00")
+    (version "25.01")
    (source
     (origin
       (method git-fetch)
@@ -1483,7 +1482,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to
              (url "https://github.com/ip7z/7zip")
              (commit version)))
       (sha256
-        (base32 "1fvgl9qp2pl5c0jmvgbdx6qig3qd80mhxvml42yby8y412x65sh7"))
+        (base32 "01jg1fkc2zsdngv3ag3pwq4x8i5x01hjxsk30n78ffwiv2ps4rmq"))
       (file-name (git-file-name name version))
       (modules '((guix build utils)
                  (ice-9 regex)))
@@ -2398,7 +2397,7 @@ targeting storage applications.  ISA-L includes:
 (define-public brotli
  (package
    (name "brotli")
-    (version "1.1.0")
+    (version "1.0.9")
    (source
     (origin
       (method git-fetch)
@@ -2407,8 +2406,35 @@ targeting storage applications.  ISA-L includes:
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0cvcq302wpjpd1a2cmxcp9a01lwvc2kkir8vsdb3x11djnxc0nsk"))))
+        (base32 "1fikasxf7r2dwlk8mv8w7nmjkn0jw5ic31ky3mvpkdzwgd4xfndl"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Cherry-picked from upstream since the latest release
+           ;; https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc
+           (substitute* (find-files "scripts" "^lib.*pc\\.in")
+             (("-R\\$\\{libdir\\} ") ""))
+           #t))))
    (build-system cmake-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'rename-static-libraries
+           ;; The build tools put a 'static' suffix on the static libraries, but
+           ;; other applications don't know how to find these.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((lib (string-append (assoc-ref %outputs "out") "/lib/")))
+               (rename-file (string-append lib "libbrotlicommon-static.a")
+                            (string-append lib "libbrotlicommon.a"))
+               (rename-file (string-append lib "libbrotlidec-static.a")
+                            (string-append lib "libbrotlidec.a"))
+               (rename-file (string-append lib "libbrotlienc-static.a")
+                            (string-append lib "libbrotlienc.a"))
+               #t))))
+       #:configure-flags
+       (list ;; Defaults to "lib64" on 64-bit archs.
+             (string-append "-DCMAKE_INSTALL_LIBDIR="
+                            (assoc-ref %outputs "out") "/lib"))))
    (home-page "https://github.com/google/brotli")
    (synopsis "General-purpose lossless compression")
    (description "This package provides the reference implementation of Brotli,
@@ -2434,12 +2460,7 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.")
       #:source-dir "java"
       ;; Tests are mixed in with java sources, the ant build system
       ;; doesn't allow that
-       #:tests? #f
-       #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'drop-android-wrapper
-                    (lambda _
-                      (delete-file-recursively
-                       "java/org/brotli/wrapper/android"))))))
+       #:tests? #f))
    (native-inputs (list java-junit))))

 (define-public ucl
@@ -3050,7 +3071,7 @@ compression and decompression speed compared to Deflate using Zlib.")
    (version "1.0")
    (source (origin
              (method url-fetch)
-              (uri (string-append "https://oldhome.schmorp.de/marc/data/"
+              (uri (string-append "http://oldhome.schmorp.de/marc/data/"
                                  "fcrackzip-" version ".tar.gz"))
              (sha256
               (base32
@@ -3058,19 +3079,16 @@ compression and decompression speed compared to Deflate using Zlib.")
    (build-system gnu-build-system)
    (arguments
     (list
-      #:make-flags
-      #~(list "CFLAGS=-Wno-error=implicit-int")
      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-reference-to-unzip
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "main.c"
-                (("\"unzip")
-                 (string-append "\""
-                                (search-input-file inputs "/bin/unzip")))))))))
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'fix-reference-to-unzip
+           (lambda _
+             (substitute* "main.c"
+               (("\"unzip")
+                (string-append "\"" (which "unzip")))))))))
    (inputs
     (list perl unzip))
-    (home-page "https://oldhome.schmorp.de/marc/fcrackzip.html")
+    (home-page "http://oldhome.schmorp.de/marc/fcrackzip.html")
    (synopsis "Zip password cracker")
    (description "Fcrackzip is a Zip file password cracker.")
    (license license:gpl2+)))
@@ -3153,39 +3171,3 @@ exported by the zlib library.")
        ;; The changes break the examples.
        `(cons "-DBUILD_EXAMPLES=OFF" ,flags))))
    (properties '((hidden? . #t)))))
-
-(define-public cmix
-  (package
-    (name "cmix")
-    (version "21")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/byronknoll/cmix")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1alivia1hnhxa7z8vkqammacyhj8zfqwk7hjahj5nkfq28v2ddb4"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)
-          (delete 'check) ;No tests
-          (replace 'install
-            (lambda _
-              (install-file "cmix"
-                            (string-append #$output "/bin")))))
-      #:make-flags
-      #~(list (string-append "CXX=" #$(cxx-for-target))
-              ;; Linker fails when you use CC=cc-for-target
-              (string-append "CC=" #$(cxx-for-target)))))
-    (native-inputs (list clang))
-    (synopsis "Lossless data-compression program optimized for file size")
-    (description
-     "Cmix is a lossless data compression program aimed at optimizing compression
-ratio at the cost of high CPU/memory usage.")
-    (home-page "https://github.com/byronknoll/cmix")
-    (license license:gpl3)))
@@ -43,7 +43,7 @@
  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages ruby-xyz))
+  #:use-module (gnu packages ruby-check))

 (define-public compton
  (let ((upstream-version "0.1_beta2"))
@@ -115,7 +115,7 @@ performance).
 (define-public picom
  (package
    (name "picom")
-    (version "13")
+    (version "12.5")
    (source
     (origin
       (method git-fetch)
@@ -124,8 +124,8 @@ performance).
             (commit (string-append "v" version))))
       (sha256
        (base32
-         "0x81m06fhkgrl6vzm4a3cqxcldkq223q0jzlkkhd8kpjmrqaprw3"))
-       (file-name (git-file-name name version))))
+         "1skkchrlir9si9ljawg0xcgpfnd2macw7ny5vhx5f5zk7b7iphhz"))
+       (file-name (string-append "picom-" version))))
    (build-system meson-build-system)
    (inputs
     (list dbus
@@ -134,6 +134,7 @@ performance).
           libev
           libx11
           libxext
+           libxdg-basedir
           mesa
           pcre2
           pixman
@@ -144,7 +145,7 @@ performance).
           xprop))
    (native-inputs
     (append
-       (list pkg-config python-minimal-wrapper xorgproto)
+       (list pkg-config xorgproto)
       (if (supported-package? ruby-asciidoctor/minimal)
           (list ruby-asciidoctor/minimal)
           '())))
@@ -166,7 +167,7 @@ performance).
                   (substitute* "picom.desktop"
                     (("Exec=")
                      (string-append "Exec=" #$output "/bin/"))))))))
-    (home-page "https://picom.app/")
+    (home-page "https://github.com/yshui/picom")
    (synopsis "Compositor for X11, forked from Compton")
    (description
     "Picom is a standalone compositor for Xorg, suitable for use
@@ -1,233 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
-;;; Copyright © 2022-2023 Efraim Flashner <efraim@flashner.co.il>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages computer-architecture)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix build-system qt)
-  #:use-module (guix build-system scons)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages boost)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages electronics)
-  #:use-module (gnu packages engineering)
-  #:use-module (gnu packages graphviz)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages m4)
-  #:use-module (gnu packages maths)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages protobuf)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages qt)
-  #:use-module (gnu packages shells))
-
-;;; Strongly based on package gem5 in channel
-;; https://git.genenetwork.org/guix-bioinformatics
-(define-public gem5
-  (package
-    (name "gem5")
-    (version "25.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/gem5/gem5")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0p40cb3g29zwy3fskah6rxyn8a8xjh9cc6riyigg5l4i854hj2nj"))
-       (snippet
-        #~(begin
-            (use-modules (guix build utils))
-            ;; For reproducibility.
-            (substitute* "src/base/date.cc"
-              (("__DATE__") "\"1970-01-01\"")
-              (("__TIME__") "\"00:00:00\""))
-            ;; TODO: Unbundle systemc, libelf and googletest
-            (delete-file-recursively "ext/ply") ;unbundling of python-ply
-            ;; Unbundling of pybind11
-            (delete-file-recursively "ext/pybind11")
-            (substitute* "ext/sst/Makefile.linux"
-              (("-I../../ext/pybind11/include/")
-               "${shell pybind11-config --includes}"))
-            (substitute* "SConstruct"
-              ((".*pybind11.*") ""))))))
-    (build-system scons-build-system)
-    (arguments
-     (list
-      #:scons-flags #~(list "--verbose")
-      #:build-targets #~(list "build/ALL/gem5.opt")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-source
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "SConstruct"
-                ;; Force adding missing includes into the environment.
-                (("main\\.Append\\(CPPPATH=\\[Dir\\('" all)
-                 (string-append
-                  all (assoc-ref inputs "capstone") "/include')])\n"
-                  all (assoc-ref inputs "hdf5") "/include')])\n"
-                  all (assoc-ref inputs "kernel-headers") "/include')])\n"
-                  all (assoc-ref inputs "libpng") "/include')])\n"
-                  all (assoc-ref inputs "protobuf") "/include')])\n"
-                  all (assoc-ref inputs "pybind11") "/include')])\n"
-                  all (assoc-ref inputs "zlib") "/include')])\n"
-                  all)))
-              (substitute* "ext/libelf/SConscript"
-                (("m4env\\.Tool" all)
-                 (string-append
-                  "m4env.Append(CPPPATH=[Dir('"
-                  (assoc-ref inputs "kernel-headers")
-                  "/include')])\n"
-                  all)))
-              (substitute* "ext/libelf/native-elf-format"
-                (("cc") #$(cc-for-target)))))
-          ;; This uses the cached results from the previous 'build phase.
-          ;; Move to after 'install and delete build dir first?
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys #:rest args)
-              (when tests?
-                (apply (assoc-ref %standard-phases 'build)
-                       #:build-targets '("build/ALL/unittests.opt")
-                       args))))
-          (replace 'install
-            (lambda _
-              (let* ((bin (string-append #$output "/bin/")))
-                (mkdir-p bin)
-                (install-file "build/ALL/gem5.opt" bin)
-                (install-file "build/ALL/gem5py" bin)
-                (install-file "build/ALL/gem5py_m5" bin)
-                (copy-recursively
-                 "configs"
-                 (string-append #$output"/share/gem5/configs")))))
-          (add-after 'install 'wrap-binaries
-            (lambda _
-              (for-each
-               (lambda (file)
-                 (wrap-program file
-                   `("GUIX_PYTHONPATH" ":" prefix
-                     (,(getenv "GUIX_PYTHONPATH")))))
-               (find-files (string-append #$output "/bin"))))))))
-    (inputs
-     (list capstone
-           gperftools
-           hdf5
-           libpng
-           protobuf
-           pybind11-2
-           python
-           python-ply
-           python-pydot
-           zlib))
-    (native-inputs
-     (list boost
-           m4
-           tcsh
-           perl
-           python-minimal-wrapper
-           pkg-config))
-    (home-page "http://gem5.org/")
-    (synopsis "Modular platform for computer-system architecture research")
-    (description "The gem5 simulator is a modular platform for computer-system
-architecture research, encompassing system-level architecture as well as
-processor microarchitecture.")
-    (license license:bsd-3)))
-
-(define-public ripes
-  ;; Includes Qt6 support.
-  (let ((commit "720066f8d1c9f8d62fad058f44471763a0312084")
-        (revision "0"))
-    (package
-      (name "ripes")
-      (version (git-version "2.2.6" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/mortbopet/Ripes/")
-                (commit commit)
-                ;; TODO: Unbundle. Ripes recursively requires tones of non
-                ;; packaged dependencies in "external" directories.
-                (recursive? #t)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1kkdc3y18h985zvgmhbdbms3zynygrg5f64w1lm948hffj58x7gy"))))
-      (build-system qt-build-system)
-      (arguments
-       (list
-        #:qtbase qtbase                   ;for Qt6
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'disable-tests
-              (lambda _
-                (substitute* "test/CMakeLists.txt"
-                  ;; Fails with "Compared values are not the same"
-                  (("create_qtest\\(tst_riscv\\)") "")
-                  ;; Fails with "Internal test error"
-                  (("create_qtest\\(tst_reverse\\)") ""))))
-            (add-after 'unpack 'patch-bugs
-              (lambda* (#:key inputs #:allow-other-keys)
-                ;; TODO: Remove when fixed upstream.
-                ;; See https://github.com/mortbopet/Ripes/issues/388 and 62
-                (substitute*
-                    (string-append "external/VSRTL/external/cereal/include"
-                                   "/cereal/external/rapidjson/document.h")
-                  (("GenericStringRef& operator=.*")
-                   (string-append
-                    "GenericStringRef& operator=(const GenericStringRef& rhs)"
-                    " { s = rhs.s; return *this; }")))
-                ;; As suggested by error message itself.
-                (substitute* '("external/VSRTL/interface/vsrtl_vcdfile.cpp")
-                  (("#include <sstream>")
-                   "#include <sstream>\n#include <cstdint>"))
-                ;; As suggested by error message itself.
-                (substitute* '("external/VSRTL/interface/vsrtl_vcdfile.h")
-                  (("#include <map>")
-                   "#include <map>\n#include <cstdint>"))))
-            (add-before 'configure 'set-envs
-              (lambda* (#:key inputs #:allow-other-keys)
-                (setenv "VERILATOR_ROOT"
-                        (dirname
-                         (dirname
-                          (search-input-file inputs "/bin/verilator"))))))
-            (replace 'check             ;as for .github/workflows/test.yml
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  (for-each
-                   (lambda (f) (invoke f))
-                   (filter executable-file? (find-files "test"  "tst_")))))))
-        #:configure-flags
-        #~(list "-DRIPES_BUILD_VERILATOR_PROCESSORS=ON"
-                "-DRIPES_BUILD_TESTS=ON")))
-      (native-inputs
-       (list python-minimal-wrapper verilator))
-      (inputs
-       (list qtsvg qtcharts))
-      (home-page "https://github.com/mortbopet/Ripes/")
-      (synopsis "Visual computer architecture editor for RISCV")
-      (description
-       "Ripes is a visual computer architecture simulator and assembly code
-editor built for the RISCV instruction set architecture.")
-      (license license:expat))))
@@ -24,65 +24,18 @@
  #:use-module (guix build-system pyproject)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
-  #:use-module (gnu packages check)
  #:use-module (gnu packages golang-build)
  #:use-module (gnu packages golang-check)
  #:use-module (gnu packages golang-vcs)
  #:use-module (gnu packages golang-web)
  #:use-module (gnu packages golang-xyz)
  #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-crypto)
  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages python-web)
  #:use-module (gnu packages textutils)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix utils))

-(define-public bundlewrap
-  (package
-    (name "bundlewrap")
-    (version "5.0.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/bundlewrap/bundlewrap")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1p0082lwyfkppswm8cpr1yp28y0cm0f8rk3ly3xlym7qyidglkli"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags #~(list "tests/unit")))
-    (native-inputs
-     (list python-pytest
-           python-setuptools))
-    (inputs
-     (list python-bcrypt
-           python-cryptography
-           python-jinja2
-           python-librouteros
-           python-mako
-           python-pyyaml
-           python-requests
-           python-tomlkit))
-    (home-page "https://bundlewrap.org")
-    (synopsis "Config management with Python")
-    (description
-     "BundleWrap is a decentralized configuration management system that is
-designed to be powerful, easy to extend and extremely versatile.
-
-
-By allowing for easy and low-overhead config management, BundleWrap fills the
-gap between complex deployments using Chef or Puppet and old school system
-administration over SSH.  While most other config management systems rely on a
-client-server architecture, BundleWrap works off a repository cloned to local
-machine.  It then automates the process of SSHing into servers and making sure
-everything is configured the way it's supposed to be.")
-    (license license:gpl3)))
-
 (define-public chezmoi
  (package
    (name "chezmoi")
@@ -176,7 +129,7 @@ across multiple machines.")
 (define-public konsave
  (package
    (name "konsave")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method git-fetch)
@@ -185,7 +138,7 @@ across multiple machines.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0454cjcnlwpylia6lb40xzjvm07p3hxmfl21zmlxhl2xjlbjhsg4"))))
+        (base32 "1j5nszy41j4fd6b5w7188gphfk2s0dj44rs7fg55a4izvm0brbx9"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -0,0 +1,97 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
+;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2019, 2023 Vasile Dumitrascu <va511e@yahoo.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages conky)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages lua)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages xorg))
+
+(define-public conky
+  (package
+    (name "conky")
+    (home-page "https://github.com/brndnmtthws/conky")
+    (version "1.19.8")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1g712cw2nzd2qvgdmyvazyda0znyqzg6yckg98ss203fggwp93vj"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "-DRELEASE=true"
+             "-DBUILD_PULSEAUDIO=ON"
+             "-DBUILD_WLAN=ON"
+             "-DBUILD_TESTS=ON")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'add-freetype-to-search-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "cmake/ConkyPlatformChecks.cmake"
+               (("set\\(INCLUDE_SEARCH_PATH")
+                (string-append
+                 "set(INCLUDE_SEARCH_PATH "
+                 (assoc-ref inputs "freetype") "/include/freetype2 ")))
+             #t))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin")))
+               (install-file "src/conky" bin))
+             #t)))))
+    (inputs
+     (list freetype
+           imlib2
+           libx11
+           libxdamage
+           libxext
+           libxft
+           libxi
+           libxinerama
+           pulseaudio
+           lua
+           ncurses
+           curl
+           wireless-tools))
+    (native-inputs
+     (list pkg-config))
+    (synopsis "Lightweight system monitor for X")
+    (description
+     "Conky is a lightweight system monitor for X that displays operating
+system statistics (CPU, disk, and memory usage, etc.) and more on the
+desktop.")
+    (license license:gpl3+)))
@@ -144,7 +144,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
     (list bash-minimal                 ;for wrap-program
           efl
           python-wrapper
-           python-dbus-1.2
+           python-dbus
           python-efl))
    (home-page "https://www.enlightenment.org")
    (synopsis "Connman User Interface written using the EFL")
@@ -10,8 +10,6 @@
 ;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
 ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2025 Foster Hangdaan <foster@hangdaan.email>
-;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
-;;; Copyright © 2026 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,10 +37,8 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
-  #:use-module (guix build-system guile)
  #:use-module (guix build-system meson)
  #:use-module (guix build-system pyproject)
-  #:use-module ((guix search-paths) #:select ($GUIX_EXTENSIONS_PATH))
  #:use-module (guix utils)
  #:use-module (gnu packages admin)
  #:use-module (gnu packages autotools)
@@ -62,13 +58,11 @@
  #:use-module (gnu packages golang-web)
  #:use-module (gnu packages golang-xyz)
  #:use-module (gnu packages guile)
-  #:use-module (gnu packages guile-xyz)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages man)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages python)
  #:use-module (gnu packages networking)
-  #:use-module (gnu packages package-management)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages python-build)
@@ -80,73 +74,6 @@
  #:use-module (gnu packages web)
  #:use-module (gnu packages wget))

-;;; Code:
-
-;;;
-;;; Libraries:
-;;;
-
-(define-public go-github-com-checkpoint-restore-checkpointctl
-  (package
-    (name "go-github-com-checkpoint-restore-checkpointctl")
-    (version "1.5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/checkpoint-restore/checkpointctl")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0qvgld9vji5f7h2idk6r3q30909hqws0rkpvgina43i57bsfh2sv"))
-       (snippet
-        #~(begin
-            (use-modules (guix build utils))
-            (delete-file-recursively "vendor")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/checkpoint-restore/checkpointctl"))
-    (native-inputs
-     (list go-github-com-spf13-cobra))
-    (propagated-inputs
-     (list go-github-com-checkpoint-restore-go-criu-v8
-           go-github-com-containers-storage
-           go-github-com-opencontainers-runtime-spec
-           go-github-com-xlab-treeprint))
-    (home-page "https://github.com/checkpoint-restore/checkpointctl")
-    (synopsis "Tool for in-depth analysis of container checkpoints")
-    (description
-     "This package provides a Go library to read and manipulate checkpoint
-archives as created by Podman, CRI-O and containerd.")
-    (license license:asl2.0)))
-
-;;;
-;;; Executables:
-;;;
-
-(define-public checkpointctl
-  (package/inherit go-github-com-checkpoint-restore-checkpointctl
-    (name "checkpointctl")
-    (arguments
-     (substitute-keyword-arguments
-         (package-arguments go-github-com-checkpoint-restore-checkpointctl)
-       ((#:build-flags _) #~(list (string-append "-X main.version="
-                                                 #$version)))
-       ((#:install-source? _ #t) #f)
-       ((#:skip-build? _ #t) #f)
-       ((#:tests? _ #t) #f)))
-    (native-inputs
-     (append
-      (package-native-inputs go-github-com-checkpoint-restore-checkpointctl)
-      (package-propagated-inputs go-github-com-checkpoint-restore-checkpointctl)))
-    (propagated-inputs '())
-    (inputs '())
-    (description
-     "This package provides a tool to read and manipulate checkpoint archives
-as created by Podman, CRI-O and containerd.")))
-
 (define-public crun
  (package
    (name "crun")
@@ -244,7 +171,7 @@ runtime (like runc or crun) for a single container.")
 (define-public distrobox
  (package
    (name "distrobox")
-    (version "1.8.2.4")
+    (version "1.8.2.1")
    (source
     (origin
       (method git-fetch)
@@ -252,7 +179,7 @@ runtime (like runc or crun) for a single container.")
             (url "https://github.com/89luca89/distrobox")
             (commit version)))
       (sha256
-        (base32 "07kqgr5diwvkks3fn1r0nnpfqq6gngqyx4x7lxs06ri6g0a4knvf"))
+        (base32 "1la9qkhmj9277r6b2vfadb3fnvrwa435x6la5bwvm8ch0js2dfx0"))
       (file-name (git-file-name name version))))
    (build-system copy-build-system)
    (arguments
@@ -305,7 +232,7 @@ runtime (like runc or crun) for a single container.")
     (list guile-3.0 ; for wrap-script
           podman
           wget))
-    (home-page "https://distrobox.it")
+    (home-page "https://distrobox.privatedns.org/")
    (synopsis "Create and start containers highly integrated with the hosts")
    (description
     "Distrobox is a fancy wrapper around Podman or Docker to create and start
@@ -328,11 +255,11 @@ containers highly integrated with the hosts.")
    (build-system go-build-system)
    (arguments
     (list
+      #:go go-1.23
      #:install-source? #f
      #:build-flags
      #~(list (string-append "-ldflags=-X main.version=" #$version))
-      #:import-path "github.com/wagoodman/dive"
-      #:test-flags #~(list "-vet=off")))
+      #:import-path "github.com/wagoodman/dive"))
    (native-inputs
     (list go-github-com-awesome-gocui-gocui
           go-github-com-awesome-gocui-keybinding
@@ -359,69 +286,6 @@ containers highly integrated with the hosts.")
 contents, and discovering ways to shrink the size of Docker/OCI image.")
    (license license:expat)))

-(define-public guix-compose
-  (package
-    (name "guix-compose")
-    (version "0.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://codeberg.org/fishinthecalculator/guix-compose")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ij6rfs5pfykk8c53q029sl2qx3k572dqdfb6pn5s569l6697ci1"))))
-    (build-system guile-build-system)
-    (arguments
-     (list
-      #:source-directory "src"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'set-load-paths-in-entry-point
-            (lambda _
-              (define load-path
-                (cons (string-append #$output "/share/guile/site/3.0")
-                      (parse-path (getenv "GUILE_LOAD_PATH"))))
-              (define load-compiled-path
-                (cons (string-append #$output "/lib/guile/3.0/site-ccache")
-                      (parse-path (getenv "GUILE_LOAD_COMPILED_PATH"))))
-              (define search-paths-header
-                `(begin
-                   (set! %load-path
-                         (append (list ,@load-path) %load-path))
-                   (set! %load-compiled-path
-                         (append (list ,@load-compiled-path)
-                                 %load-compiled-path))))
-
-              (substitute* "src/guix/extensions/compose.scm"
-                ((";;@load-paths@")
-                 (with-output-to-string
-                   (lambda () (write search-paths-header)))))))
-          (add-after 'build 'add-extension-to-search-path
-            (lambda _
-              (with-directory-excursion #$output
-                (mkdir-p "share/guix/extensions")
-                (symlink
-                 (string-append
-                  #$output "/share/guile/site/3.0/guix/extensions/compose.scm")
-                 "share/guix/extensions/compose.scm"))))
-          (add-after 'add-extension-to-search-path 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke
-                 "guile" "-L" "./modules" "-s" "tests/test-compose.scm")))))))
-    (native-inputs (list guile-3.0))
-    ;; Avoid setting propagated so that we use the user’s profile.
-    (inputs (list guix guile-yamlpp))
-    (native-search-paths
-     (list $GUIX_EXTENSIONS_PATH))
-    (synopsis "Guix' docker compose compatibility layer")
-    (description "A toolkit to run, read and write docker-compose.yml files with
-Guix machinery.")
-    (home-page "https://codeberg.org/fishinthecalculator/guix-compose")
-    (license license:gpl3+)))
-
 (define-public libslirp
  (package
    (name "libslirp")
@@ -532,7 +396,7 @@ Layer-4 sockets.")
 (define-public cni-plugins
  (package
    (name "cni-plugins")
-    (version "1.9.0")
+    (version "1.8.0")
    (source
     (origin
       (method git-fetch)
@@ -541,7 +405,7 @@ Layer-4 sockets.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0l3jgbizq0yaxld07hsdbh6ix2w6i789101ddk0ldnsmr93jg6ni"))
+        (base32 "0bwczkf4kbrx47sa6mnp5kyn65dbg52qnlfyjyydrwshal8rz3gw"))
       (snippet
        #~(begin (use-modules (guix build utils))
                 (delete-file-recursively "vendor")))))
@@ -549,10 +413,19 @@ Layer-4 sockets.")
    (arguments
     (list
      #:install-source? #f
-      ;; XXX: Tests require root access, see test_linux.sh.
-      #:tests? #f
-      #:import-path "github.com/containernetworking/plugins/plugins/..."
-      #:unpack-path "github.com/containernetworking/plugins"))
+      #:tests? #f ; TODO: Figure out how to run tests.
+      #:import-path "github.com/containernetworking/plugins"
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                ;; XXX: Migrate to go-build-system logic.
+                (invoke "./build_linux.sh"))))
+          (replace 'install
+            (lambda* (#:key import-path #:allow-other-keys)
+              (copy-recursively (string-append "src/"import-path "/bin")
+                                (string-append #$output "/bin")))))))
    (native-inputs
     (list go-github-com-alexflint-go-filemutex
           go-github-com-buger-jsonparser
@@ -584,7 +457,7 @@ configure network interfaces in Linux containers.")
 (define-public gvisor-tap-vsock
  (package
    (name "gvisor-tap-vsock")
-    (version "0.8.8")
+    (version "0.8.7")
    (source
     (origin
       (method git-fetch)
@@ -593,7 +466,7 @@ configure network interfaces in Linux containers.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1xz710dmy58gngd0qizjw8g9nkraksqald8vzhwc5h36dqkc8nrf"))
+        (base32 "1p9vypphssvqfcm3y2nc7b9v0wcc2smkrqq8k60vskaiza89974k"))
       (modules '((guix build utils)))
       (snippet
        #~(begin
@@ -617,7 +490,7 @@ configure network interfaces in Linux containers.")
      ;; network connection
      #~(list "-skip" "TestSuite")
      #:test-subdirs
-      #~(list "../../...")       ;test the whole library
+      #~(list "../../...")       ;test the whole libary
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'prune-tests
@@ -636,9 +509,7 @@ configure network interfaces in Linux containers.")
           go-github-com-containers-winquit
           go-github-com-coreos-stream-metadata-go
           go-github-com-dustin-go-humanize
-           go-github-com-foxcpp-go-mockdns
           go-github-com-google-gopacket
-           go-github-com-inetaf-tcpproxy
           go-github-com-insomniacslk-dhcp
           ;; go-github-com-linuxkit-virtsock  ;Windows only
           go-github-com-mdlayher-vsock
@@ -647,6 +518,7 @@ configure network interfaces in Linux containers.")
           go-github-com-onsi-ginkgo
           go-github-com-onsi-gomega
           go-github-com-opencontainers-go-digest
+           go-github-com-pkg-errors
           go-github-com-sirupsen-logrus
           go-github-com-songgao-packets
           go-github-com-songgao-water
@@ -656,7 +528,6 @@ configure network interfaces in Linux containers.")
           go-golang-org-x-mod
           go-golang-org-x-sync
           go-golang-org-x-sys
-           go-gopkg-in-yaml-v3
           go-gvisor-dev-gvisor))
    (home-page "https://github.com/containers/gvisor-tap-vsock")
    (synopsis "Network stack for virtualization based on gVisor")
@@ -701,11 +572,11 @@ Its main purpose is to support the key usage by @code{docker-init}:
 (define-public podman
  (package
    (name "podman")
-    (version "5.8.1")
+    (version "5.7.1")
    (outputs '("out" "docker"))
    (properties
     `((output-synopsis "docker" "docker alias for podman")
-       ;; XXX: Addressed already.
+       ;; XXX: Adressed already.
       (lint-hidden-cve . ("CVE-2022-2989"))))
    (source
     (origin
@@ -714,7 +585,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
             (url "https://github.com/containers/podman")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "1wdsdc0nj4m1v8mn95dhavi87ad0adqmld70da59gvp2abff5f0f"))
+        (base32 "16lb58r8vkngics6fn1b3six8bl3nrl9awrnq6ivdv1grfgy9z61"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -775,7 +646,6 @@ Its main purpose is to support the key usage by @code{docker-init}:
                   ,(string-append #$crun           "/bin")
                   ,(string-append #$gcc            "/bin") ; cpp
                   ,(string-append #$iptables       "/sbin")
-                   ,(string-append #$nftables       "/sbin")
                   ,(string-append #$passt          "/bin")
                   ,(string-append #$procps         "/bin") ; ps
                   "/run/privileged/bin")))))
@@ -790,9 +660,8 @@ Its main purpose is to support the key usage by @code{docker-init}:
                   (("[$][{]ETCDIR[}]") "/etc")))
                (invoke "make" "install.docker"
                        (string-append "PREFIX=" (assoc-ref outputs "docker"))
-                        (string-append "ETCDIR="
-                                       (string-append (assoc-ref outputs "docker")
-                                                      "/etc"))))))
+                        (string-append "ETCDIR=" (string-append (assoc-ref outputs "docker")
+                                                                "/etc"))))))
          (add-after 'install 'install-completions
            (lambda _
              (invoke "make" "install.completions"
@@ -8,7 +8,7 @@
 ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
 ;;; Copyright © 2020, 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
 ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2020, 2021, 2023-2026 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020, 2021, 2023, 2024, 2025 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020, 2021, 2022, 2024, 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
@@ -31,7 +31,7 @@
 ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2022-2025 David Elsing <david.elsing@posteo.net>
 ;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2022-2024, 2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
 ;;; Copyright © 2023, 2025 Sughosha <Sughosha@disroot.org>
 ;;; Copyright © 2023, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -51,7 +51,6 @@
 ;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
 ;;; Copyright © 2025 Murilo <murilo@disroot.org>
-;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -186,9 +185,9 @@ easy to use API.")
    (license license:expat)))

 (define-public argpp
-  ;; No tagged releases; this is the master tip.
-  (let ((commit "b52420a843327361713b6242e47afaa6b6ab2a89")
-        (revision "1"))
+  ;; XXX: Does not release anymore.
+  (let ((commit "9e1d54f8ed20af0aa5857e6653ab605b2ab63d5c")
+        (revision "0"))
    (package
      (name "argpp")
      (version (git-version "0.0.0" revision commit))
@@ -196,18 +195,17 @@ easy to use API.")
       (origin
         (method git-fetch)
         (uri (git-reference
-                (url "https://github.com/Grumbel/argpp")
-                (commit commit)))
+               (url "https://github.com/Grumbel/argpp")
+               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "07kmw7qz8l7qz572axpag7db4s97fl1mprblsrw238wdmvh9lvwc"))))
+          (base32 "1izn9xfplhnqi9vs4w28dixqd2vy0n1n3asaa1751grg30bw0xxs"))))
      (build-system cmake-build-system)
      (arguments
       (list
        #:configure-flags
        #~(list "-DBUILD_TESTS=ON")))
-      (native-inputs
-       (list tinycmmc))
+      (native-inputs (list tinycmmc))
      (home-page "https://github.com/Grumbel/argpp")
      (synopsis "Argument parser for C++")
      (description "This package provides a simple argument parser for C++.")
@@ -850,33 +848,6 @@ combination of these streams.")
 enabled in different parts of your code.")
      (license license:zlib)))

-(define-public xbyak
-  (package
-    (name "xbyak")
-    (version "7.30")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/herumi/xbyak")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "0rb0q5i3lj2jfrkmkxcgbczflw05p1x9fdpwrhv7gng7vp2byydw"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      ;; No tests are registered with CTest; the test/ directory contains
-      ;; shell scripts that are not integrated into the CMake build.
-      #:tests? #f))
-    (native-inputs
-     (list pkg-config))
-    (synopsis "JIT assembler for x86(IA-32)/x64(AMD64/x86-64) architecture")
-    (description "Xbyak is a C++ header-only JIT assembler for x86(IA-32),
-x64(AMD64/x86-64) architecture.  It supports MASM/NASM-like syntax and
-advanced instruction sets including AVX-512, APX, and AVX10.2.")
-    (home-page "https://github.com/herumi/xbyak")
-    (license license:bsd-3)))
-
 (define-public xdgpp
  (let ((commit "f01f810714443d0f10c333d4d1d9c0383be41375")
        (revision "0"))
@@ -1051,6 +1022,17 @@ utilities used across the hypr* ecosystem.")
               (base32
                "06wiizy73f0x6zj1ar878gm1w9zam1gmgjw0ybixj3qag0gxqv34"))))
    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-cross-compilation
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("find_package.PkgConfig" all)
+                 (string-append
+                  "set(PKG_CONFIG_EXECUTABLE " #$(pkg-config-for-target) ")\n"
+                  all))))))))
    (native-inputs (list gcc-15 pkg-config))
    (inputs (list hyprutils))
    (home-page "https://wiki.hypr.land/Hypr-Ecosystem/hyprlang/")
@@ -1074,7 +1056,18 @@ language used in Hyprland.")
               (base32
                "1ymiqzncppdik8lw3ad7xaqig6c7bjcy7crcwbq3rjfk2hrc8rmc"))))
    (build-system cmake-build-system)
-    (arguments (list #:tests? #f)) ; No tests in Release build type
+    (arguments
+     (list
+      #:tests? #f ; No tests in Release build type
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-cross-compilation
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("find_package.PkgConfig" all)
+                 (string-append
+                  "set(PKG_CONFIG_EXECUTABLE " #$(pkg-config-for-target) ")\n"
+                  all))))))))
    (native-inputs (list gcc-15 pkg-config))
    (inputs (list pixman))
    (home-page "https://github.com/hyprwm/hyprutils")
@@ -1124,7 +1117,7 @@ apps.")
 (define-public hyprwire
  (package
    (name "hyprwire")
-    (version "0.3.0")
+    (version "0.2.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1133,7 +1126,7 @@ apps.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0jasbbsqqysp88vn75dl9kcx3mzvvdldbq9g2jdpd25j3w8wl7rx"))))
+                "0rzclhk42x9im9n6fz2bj98l9lb7jhl3vijvck4rj6yhb80kvli0"))))
    (build-system cmake-build-system)
    (arguments (list #:tests? #f)) ; There are no tests
    (native-inputs (list pkg-config gcc-15))
@@ -1725,36 +1718,32 @@ lock-free fixed size queue written in C++11.")
    (license license:expat)))

 (define-public syscmdline
-  (let ((commit "0c9f3de8b11bd2f33b03bea5521bf446af4ead69")
-        (revision "0"))
-    (package
-      (name "syscmdline")
-      ;; The version string is taken from
-      ;; <https://raw.githubusercontent.com/SineStriker/syscmdline/refs/heads/main/CMakeLists.txt>.
-      (version (git-version "1.0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/SineStriker/syscmdline")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "168dij7p2kjl0qs3k5lzrnbzf2s2mbfpm83jimk028whx8cbv4jh"))))
-      (build-system cmake-build-system)
-      (arguments
-       (list #:configure-flags
-             #~(list "-DSYSCMDLINE_BUILD_STATIC=OFF" ;build a shared library
-                     "-DSYSCMDLINE_BUILD_TESTS=ON")
-             #:phases #~(modify-phases %standard-phases
-                          (replace 'check
-                            ;; There isn't currently any exposed test target.
-                            (lambda* (#:key tests? #:allow-other-keys)
-                              (when tests?
-                                (invoke "bin/tst_basic")))))))
-      (home-page "https://github.com/SineStriker/syscmdline")
-      (synopsis "C++ advanced command line parser")
-      (description "SysCmdLine is a C++ command line parser that is inspired by
+  (package
+    (name "syscmdline")
+    (version "0.0.1.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/SineStriker/syscmdline")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "00n9vkyymp1dzixxl93f6pkpd3ndsk1vib7shhlxv4zvy5hjqhqw"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "-DSYSCMDLINE_BUILD_STATIC=OFF" ;build a shared library
+                   "-DSYSCMDLINE_BUILD_TESTS=ON")
+           #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          ;; There isn't currently any exposed test target.
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (invoke "bin/tst_basic")))))))
+    (home-page "https://github.com/SineStriker/syscmdline")
+    (synopsis "C++ advanced command line parser")
+    (description "SysCmdLine is a C++ command line parser that is inspired by
@code{QCommandLineParser} from Qt and @code{System.CommandLine} from C#.  It
 has features such as:
@itemize
@@ -1769,7 +1758,7 @@ has features such as:
@item Highly configurable
@item Friendly interface
@end itemize")
-      (license license:expat))))
+    (license license:expat)))

 (define-public gperftools
  (package
@@ -1917,32 +1906,64 @@ using the string similarity calculations from FuzzyWuzzy.")
 (define-public cpplint
  (package
    (name "cpplint")
-    (version "2.0.2")
+    (version "2.0.0")
    (source
     (origin
       (method git-fetch)
+       ;; Fetch from github instead of pypi, since the test cases are not in
+       ;; the pypi archive.
       (uri (git-reference
-              (url "https://github.com/cpplint/cpplint")
-              (commit version)))
+             (url "https://github.com/cpplint/cpplint")
+             (commit version)))
       (sha256
-        (base32 "0n9v4zayxp2r6lhmsi4xpk5lnjs4x6h6p7isr86xyhm7mjxd7jp1"))
+        (base32 "06km4wh4944az1hk61g5w8pjhbvbccpgarz1dy7vhwkhfvmvggnk"))
       (file-name (git-file-name name version))))
    (build-system pyproject-build-system)
    (arguments
-     (list
-      ;; tests: 222 passed
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-pytest-config
-            (lambda _
-              (substitute* "pyproject.toml"
-                ((" \"pytest-cov\", ") "")
-                ((" --cov-fail-under=90 --cov=cpplint") "")))))))
+     (list #:modules `((srfi srfi-1)
+                       (srfi srfi-26)
+                       ,@%pyproject-build-system-modules)
+           #:phases
+           #~(modify-phases (@ (guix build pyproject-build-system) %standard-phases)
+               (add-after 'unpack 'patch-build-system
+                 (lambda _
+                   (substitute* "pyproject.toml"
+                     (("setuptools\\.build_meta:__legacy__")
+                      "setuptools.build_meta"))))
+               (add-before 'wrap 'reduce-GUIX_PYTHONPATH
+                 (lambda _
+                   ;; Hide the transitive native inputs from GUIX_PYTHONPATH
+                   ;; to prevent them from ending up in the run-time closure.
+                   ;; See also <https://bugs.gnu.org/25235>.
+                   (let ((transitive-native-inputs
+                          '#$(match (package-transitive-native-inputs
+                                     this-package)
+                               (((labels packages) ...) packages))))
+                     ;; Save the original PYTHONPATH because we need it for
+                     ;; tests later.
+                     (setenv "TMP_PYTHONPATH" (getenv "GUIX_PYTHONPATH"))
+                     (setenv "GUIX_PYTHONPATH"
+                             (string-join
+                              (filter (lambda (path)
+                                        (not (any (cut string-prefix? <> path)
+                                                  transitive-native-inputs)))
+                                      (search-path-as-string->list
+                                       (getenv "GUIX_PYTHONPATH")))
+                              ":")))))
+               (add-after 'wrap 'reset-GUIX_PYTHONPATH
+                 (lambda _
+                   (setenv "GUIX_PYTHONPATH"
+                           (getenv "TMP_PYTHONPATH")))))))
    (native-inputs
-     (list python-pytest
+     (list python-coverage
+           python-parameterized
+           python-pytest
+           python-pytest-cov
+           python-pytest-runner
           python-pytest-timeout
           python-setuptools
-           python-testfixtures))
+           python-testfixtures
+           python-wheel))
    (home-page "https://github.com/cpplint/cpplint")
    (synopsis "Static code checker for C++")
    (description "@code{cpplint} is a command-line tool to check C/C++ files
@@ -2590,7 +2611,7 @@ of C++14 components that complements @code{std} and Boost.")
 (define-public poco
  (package
    (name "poco")
-    (version "1.15.0")
+    (version "1.13.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2599,7 +2620,7 @@ of C++14 components that complements @code{std} and Boost.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0fzf46y7rga233nsg7d1jc6xa83i6qajxil6rak1z2z2bmhk5xa8"))))
+                "1b8w3s6j020r356s6j6ijpnvzjdby4qwwndhzhfjc3rm727m085g"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -2607,10 +2628,6 @@ of C++14 components that complements @code{std} and Boost.")
                                "-DENABLE_NETSSL=ON")
      #:phases
      #~(modify-phases %standard-phases
-          (add-before 'check 'check-setenv
-            (lambda _
-              (setenv "HOME" "/tmp")
-              (setenv "TMPDIR" "/tmp")))
          (add-after 'unpack 'disable-problematic-tests
            (lambda _
              (substitute* (list "Foundation/CMakeLists.txt" ; XXX: fails.
@@ -2734,68 +2751,46 @@ provides a number of utilities to make coding with expected cleaner.")
    (home-page "https://tl.tartanllama.xyz/")
    (license license:cc0)))

-(define-public libfccp
-  ;; Header-only library without any official release versions available.
-  (let ((commit "4ade42d5f8c454c6c57b3dce9c51c6dd02182a66")
+(define-public immer
+  ;; Use latest commit to fix build with gcc 14.
+  (let ((commit "df6ef46d97e1fe81f397015b9aeb32505cef653b")
        (revision "0"))
    (package
-      (name "libfccp")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/ben-strasser/fast-cpp-csv-parser")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1y7ads97gkrjg1jc532n8gmjry0qhqxginw1gq7b4lk9s0pyl540"))))
-      (build-system copy-build-system)
+      (name "immer")
+      (version (git-version "0.8.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/arximboldi/immer")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32 "032rb84ahvdnc1m6sj4lflrwnk4p1f2jsq1pv03xbgizp2lr2pkx"))))
+      (build-system cmake-build-system)
      (arguments
       (list
-        #:install-plan
-        #~`(("csv.h" "include/libfccp/"))))
-      (synopsis "Fast header-only library for reading CSV files")
-      (description
-       "This is a small, easy-to-use and fast header-only library for reading
-comma separated value (CSV) files.")
-      (home-page "https://github.com/ben-strasser/fast-cpp-csv-parser")
-      (license license:bsd-3))))
-
-(define-public immer
-  (package
-    (name "immer")
-    (version "0.9.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/arximboldi/immer")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "04ckvmi391pspqiglzgi8h57gwr8822xhlrg5qdxf5yg6scgkfj2"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:modules `((guix build cmake-build-system)
-                  ((guix build gnu-build-system) #:prefix gnu:)
-                  (guix build utils))
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check (assoc-ref gnu:%standard-phases 'check)))))
-    (inputs (list boost libgc c-rrb))
-    (native-inputs (list catch2-3 doctest fmt pkg-config))
-    (home-page "https://sinusoid.es/immer")
-    (synopsis "Immutable data structures")
-    (description "Immer is a library of persistent and immutable data structures
+        ;; -Werror appears to report false positives.
+        ;; See <https://github.com/arximboldi/immer/issues/223>.
+        #:configure-flags #~'("-DDISABLE_WERROR=ON")
+        #:modules `((guix build cmake-build-system)
+                    ((guix build gnu-build-system) #:prefix gnu:)
+                    (guix build utils))
+        #:phases
+        #~(modify-phases %standard-phases
+            (replace 'check (assoc-ref gnu:%standard-phases 'check)))))
+      (inputs (list boost libgc c-rrb))
+      (native-inputs (list catch2-3 doctest fmt pkg-config))
+      (home-page "https://sinusoid.es/immer")
+      (synopsis "Immutable data structures")
+      (description "Immer is a library of persistent and immutable data structures
 written in C++.")
-    (properties '((lint-hidden-cpe-vendors . ("immer_project"))))
-    (license license:boost1.0)))
+      (properties '((lint-hidden-cpe-vendors . ("immer_project"))))
+      (license license:boost1.0))))

 (define-public zug
  (package
   (name "zug")
-   (version "0.1.2")
+   (version "0.1.1")
   (source (origin
            (method git-fetch)
            (uri (git-reference
@@ -2803,7 +2798,7 @@ written in C++.")
                  (commit (string-append "v" version))))
            (file-name (git-file-name name version))
            (sha256
-             (base32 "1fy6wvvlp1253lzh66zcq5sp656jxvanxf7iq8pi37ymjq5fyynh"))
+             (base32 "06vsbzx4ripidpb6ia7y1y8pmjk6gxzr93ilby90ahj6p2x08baf"))
            (modules '((guix build utils)))
            (snippet #~(delete-file-recursively "tools"))))
   (build-system cmake-build-system)
@@ -2825,7 +2820,7 @@ composable sequential transformations.")
 (define-public lager
  (package
   (name "lager")
-   (version "0.1.3")
+   (version "0.1.1")
   (source (origin
            (method git-fetch)
            (uri (git-reference
@@ -2833,7 +2828,7 @@ composable sequential transformations.")
                  (commit (string-append "v" version))))
            (file-name (git-file-name name version))
            (sha256
-             (base32 "123a75qklhiyic3yaj74h4p8jav2m92x9ssjnfsdiilhycp4p764"))))
+             (base32 "1by9d49qnkncifyjcq16zy605d7v4ps6hvc01q5nsp1nbswm94m4"))))
   (build-system cmake-build-system)
   (arguments (list #:configure-flags #~(list "-Dlager_BUILD_EXAMPLES=no")
                    #:modules `((guix build cmake-build-system)
@@ -3701,9 +3696,9 @@ different floating point sizes and complex transformations.")
      (license license:bsd-3))))

 (define-public priocpp
-  ;; Latest release is from 2022-08-14.
-  (let ((commit "ea15402adcd0d9191dc29ca6f7e4dd0bff67b9b5")
-        (revision "1"))
+  ;; XXX: No releases.
+  (let ((commit "214a0ff789d5c58e76d870fe2e75f98857991855")
+        (revision "0"))
    (package
      (name "priocpp")
      (version (git-version "0.0.0" revision commit))
@@ -3715,15 +3710,15 @@ different floating point sizes and complex transformations.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0x4cgivaprj5c74yyyzny5dsg288w9y8sf21h79sl9r303ins867"))))
+          (base32 "0ksrgajcwqvim5ymxikj26akza3sbhvx3kn4n9xib6r57131kq2m"))))
      (build-system cmake-build-system)
      (arguments
       (list
        #:configure-flags
        #~(list "-DBUILD_TESTS=ON")))
-      (inputs (list fmt-10 logmich))
+      (inputs (list fmt-8 logmich))
      (native-inputs (list googletest pkg-config tinycmmc))
-      ;; TODO: cmake-built dependents currently require propagation -- why?
+      ;; XXX: CMake-built dependents currently require propagation.
      (propagated-inputs (list jsoncpp sexp-cpp))
      (home-page "https://github.com/Grumbel/priocpp")
      (synopsis "Property input/output for C++")
@@ -4153,16 +4148,16 @@ features:
 (define-public juce
  (package
    (name "juce")
-    (version "8.0.12")
+    (version "8.0.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                     (url "https://github.com/juce-framework/JUCE")
-                     (commit version)))
+                    (url "https://github.com/juce-framework/JUCE")
+                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0m4kbpwg2gblnilly0h2a3rr7f7lb13gsx4fvs2mnvyvy6jfbbls"))))
+                "1n2w571wc7fl178x5ynxiaxvhjvqskfwnd0x295yzr6vpc35a1mv"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                  ;no test suite
@@ -4172,17 +4167,20 @@ features:
               (add-after 'unpack 'patch-paths
                 (lambda* (#:key inputs #:allow-other-keys)
                   (substitute*
-                       (find-files "." "juce_Fonts_linux.cpp$")
+                       (find-files "." "jucer_ProjectExport_CodeBlocks.h$")
+                     (("/usr/include/freetype2")
+                      (search-input-directory inputs "/include/freetype2")))
+                   (substitute*
+                       (find-files "." "juce_linux_Fonts.cpp$")
                     (("fonts\\.conf\" };")
                      (string-append
-                       "fonts.conf\",\n\""
+                       "fonts.conf\"\n\""
                       (search-input-file inputs "/etc/fonts/fonts.conf")
                       "\"\n};"))))))))
    (native-inputs
     (list alsa-lib
           curl
-           jack-2
-           ladspa
+           jack-1
           libx11
           pkg-config
           webkitgtk-with-libsoup2))
@@ -5025,52 +5023,3 @@ and stable references (iterators are NOT stable) on insert.")
    (description "This package provides a single-header C++14 library for
 saving and loading C++ objects using a binary format.")
    (license license:expat)))
-
-(define-public libdivide
-  (package
-    (name "libdivide")
-    (version "5.2.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/ridiculousfish/libdivide")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "18gpi9z9kimidkijpbrbf9vxg9s2md3nhyx9yh3n17cdj6aabgq2"))))
-    (build-system cmake-build-system)
-    (home-page "https://libdivide.com/")
-    (synopsis "Header-only library for optimized integer division")
-    (description "This package provides a header-only C and C++ library for
-calculating integer division by using shift, add and multiply instructions.")
-    ;; dual licensed
-    (license (list license:zlib license:boost1.0))))
-
-(define-public functionalplus
-  (package
-    (name "functionalplus")
-    (version "0.2.27")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/Dobiasd/FunctionalPlus")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1my5npxj9fnm1lxpqnx5jpp7s278zjb9l06wdzjbg4f52z7rsm9f"))))
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "test"))))))
-    (build-system cmake-build-system)
-    (native-inputs (list doctest-next))
-    (home-page "https://github.com/Dobiasd/FunctionalPlus")
-    (synopsis "Functional Programming Library for C++")
-    (description "@code{FunctionalPlus} is a header-only library for
-simplifying functional programming in C++.")
-    (license license:boost1.0)))
@@ -146,9 +146,7 @@
                    ;; TODO: This seems like a deeper problem that warrants
                    ;; deeper investigation.
                    binutils "--enable-compressed-debug-sections" "no")
-                   (search-patches
-                    "binutils-cross-windres.patch"
-                    "binutils-mingw-w64-deterministic.patch")))
+                   (search-patches "binutils-mingw-w64-deterministic.patch")))
                 (else binutils))
           target)))

@@ -455,7 +453,6 @@ target that libc."
                         "i386")
                        ((? target-x86-64?)
                         "x86_64")))))))))))
-    (supported-systems %supported-systems)
    (native-inputs
     (modify-inputs (package-native-inputs gnumach-headers)
       (prepend xgcc xbinutils)))))
@@ -490,8 +487,6 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                            '#$%gcc-cross-include-paths))))))))
    (propagated-inputs
     (list xgnumach-headers))
-    (inputs (modify-inputs (package-inputs mig)
-              (delete "gnumach-headers")))
    (native-inputs
     (modify-inputs (package-native-inputs mig)
       (prepend xgcc xbinutils)))))
@@ -548,7 +543,7 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
          `(cons* ,(string-append "--build=" (%current-system))
                  ,(string-append "--host=" target)
                  ,flags))))
-      (supported-systems %supported-systems)
+
      (native-inputs `(("cross-gcc" ,xgcc)
                       ("cross-binutils" ,xbinutils)
                       ("cross-mig" ,xmig)
@@ -581,7 +576,7 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
          `(cons* ,(string-append "--build=" (%current-system))
                  ,(string-append "--host=" target)
                  ,flags))))
-      (supported-systems %supported-systems)
+
      (propagated-inputs `(("gnumach-headers" ,xgnumach-headers)
                           ("hurd-headers" ,xhurd-headers)))

@@ -626,7 +621,7 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                   (for-each (cut setenv <> cpath)
                             '#$%gcc-cross-include-paths)
                   #t)))))))
-      (supported-systems %supported-systems)
+
      (inputs `(("cross-glibc-hurd-headers" ,xglibc/hurd-headers)
                ("cross-gnumach-headers" ,xgnumach-headers)))

@@ -641,7 +636,7 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
      (inherit hurd-core-headers)
      (name (string-append (package-name hurd-core-headers)
                           "-cross-" target))
-      (supported-systems %supported-systems)
+
      (inputs `(("gnumach-headers" ,xgnumach-headers)
                ("hurd-headers" ,xhurd-headers)
                ("hurd-minimal" ,xhurd-minimal)))))
@@ -48,9 +48,3 @@

 (define-public gcc-cross-x86_64-w64-mingw32-toolchain
  (cross-gcc-toolchain "x86_64-w64-mingw32"))
-
-(define-public gcc-cross-i586-pc-gnu-toolchain
-  (cross-gcc-toolchain "i586-pc-gnu"))
-
-(define-public gcc-cross-x86_64-pc-gnu-toolchain
-  (cross-gcc-toolchain "x86_64-pc-gnu"))
@@ -31,7 +31,6 @@
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Robin Templeton <robin@guixotic.coop>
 ;;; Copyright © 2026 Hennadii Stepanov <hebasto@gmail.com>
-;;; Copyright © 2026 Noé Lopez <noelopez@free.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -145,49 +144,6 @@
 CRC32C algorithm, which is specified in RFC 3720, section 12.1.")
    (license license:bsd-3)))

-(define-public crcpp
-  (package
-    (name "crcpp")
-    (version "1.2.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/d-bahr/CRCpp.git")
-                     (commit (string-append "release-" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "005hc25srr4r80md57cg9fax98c8n57ljrhxyw0chjlyq3c0d07n"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'install-pkgconfig-description
-            (lambda _
-              (let ((dir (string-append #$output "/lib/pkgconfig")))
-                (mkdir-p (string-append dir))
-                (with-output-to-file (string-append dir "/CRCpp.pc")
-                  (lambda _
-                    (simple-format #t "\
-prefix=~a
-includedir=${prefix}/include
-
-Name: ~a
-Description: CRC (cyclic redundancy check) library for C++
-Version: ~a
-Cflags: -I${includedir}"
-                                   #$output #$name #$version)))))))))
-    (home-page "https://github.com/d-bahr/CRCpp")
-    (synopsis "@acronym{CRC, cyclic redundancy check} library for C++")
-    (description "CRC++ is a C++ library for calculating cyclic redundancy
-checks.  It supports bit-by-bit and byte-by-byte calculation of full and
-multipart CRCs.  It aims to have highly optimized algorithms that can run
-branchless for projects with a need for efficiency.  Many common CRCs are
-provided out-of-the-box, such as CRC-32 (used in PKZip and Ethernet),
-CRC-XMODEM, and CRC-CCITT.")
-    (license license:bsd-3)))
-
 (define-public libblake3
  (package
    (name "libblake3")
@@ -241,9 +197,9 @@ fast, secure, parallelizable, capable of incremental updates.")
      (outputs '("out" "python" "doc"))
      (arguments
       (list #:imported-modules (append %cmake-build-system-modules
-                                        %pyproject-build-system-modules)
+                                        %python-build-system-modules)
             #:modules '((guix build cmake-build-system)
-                         ((guix build pyproject-build-system) #:prefix python:)
+                         ((guix build python-build-system) #:prefix python:)
                         (guix build utils))
             #:configure-flags #~(list "-DENABLE_STATIC=OFF")
             #:phases
@@ -1241,7 +1197,7 @@ trivial to build for local use.  Portability is emphasized over performance.")
 (define-public libsecp256k1
  (package
    (name "libsecp256k1")
-    (version "0.7.1")
+    (version "0.7.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1250,7 +1206,7 @@ trivial to build for local use.  Portability is emphasized over performance.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "10cvh8jks3rjg6p7y0vm1v4kw9y7vljbfijj0zxwkxzysxx60w0f"))))
+                "1d0cnd2s607j642h64821mpklfvvzy70mkyl2dlsm5s9lgvndn2p"))))
    (build-system gnu-build-system)
    (arguments
     (list #:configure-flags
@@ -1783,16 +1739,16 @@ SunMD5, sha1crypt, NT, bsdicrypt, bigcrypt, and descrypt.")
 (define-public keychain
  (package
    (name "keychain")
-    (version "2.9.8")
+    (version "2.9.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                    (url "https://github.com/danielrobbins/keychain")
+                    (url "https://github.com/funtoo/keychain")
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1ps1hm6xf12agbrgw3jpja28q6b52cpa0fgsvkyhp4j1b2hfhkf6"))))
+                "0nj5rq9vzvf5g8axmicy5zfcjir7a6fr1ai4ha3cpqj4zgridga7"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1819,13 +1775,13 @@ with various operating systems (including GNU/Linux and HURD) and
 shells (like bourne-compatible, csh-compatible and fish shells).  By
 default Keychain will only start ssh-agent, but it can also be
 configured to start gpg-agent.")
-    (home-page "https://github.com/danielrobbins/keychain")
+    (home-page "https://www.funtoo.org/Keychain")
    (license license:gpl2)))

 (define-public libdigidocpp
  (package
    (name "libdigidocpp")
-    (version "4.3.0")
+    (version "4.2.0")
    (source
     (origin
       (method git-fetch)
@@ -1834,7 +1790,7 @@ configured to start gpg-agent.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1kv1cyc8ylsxcvhsx1lgbjaar7ilf14gmcnmzclql2wd5vf1973z"))
+        (base32 "1lz8zahdmzav6csnx9r40dhzvaj7zjwvlgdjlx1s0idfrlbs3zd3"))
       (modules '((guix build utils)))
       (snippet '(delete-file-recursively "src/minizip"))))
    (build-system cmake-build-system)
@@ -1858,7 +1814,7 @@ for creation and reading of DigiDoc files.")
 (define-public osslsigncode
  (package
    (name "osslsigncode")
-    (version "2.13")
+    (version "2.11")
    (source
     (origin
       (method git-fetch)
@@ -1867,7 +1823,7 @@ for creation and reading of DigiDoc files.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0l58mnagv16k1sbxda6iykrd75szp7hs9k8dfjjjxmmx6758hx7b"))))
+        (base32 "17vzkrv4qzjrjinjlgk8fbimkzd5b5akkpangkpn8cdficxgibxr"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -35,13 +35,13 @@
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages popt)
  #:use-module (gnu packages linux)
-  #:use-module (gnu packages ruby-xyz)
+  #:use-module (gnu packages ruby-check)
  #:use-module (gnu packages web))

 (define-public cryptsetup-minimal
  (package
   (name "cryptsetup-minimal")
-   (version "2.8.4")
+   (version "2.8.0")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v"
@@ -49,7 +49,7 @@
                                "/cryptsetup-" version ".tar.xz"))
            (sha256
             (base32
-              "10wa3vx0dx04kv2wy165gvnyi81swawgnnj51xwcr6jcjvw4cgj4"))))
+              "18j3a8zzcwc0sragq47vf0b0qyr06bajh2sj6zm1r1ssq8vjv7nc"))))
   (build-system gnu-build-system)
   (arguments
    `(#:configure-flags
@@ -647,6 +647,7 @@ should only be used as part of the Guix cups-pk-helper service.")
              "--enable-qt5"
              "--disable-qt4")
      #:phases
+      (with-extensions (list (pyproject-guile-json))
        #~(modify-phases %standard-phases
            (add-after 'unpack 'set-gcc-14-cflags
              ;; We set CFLAGS here because adding setting it in
@@ -742,7 +743,7 @@ should only be used as part of the Guix cups-pk-helper service.")
                                     bin target)))
                         (chmod file #o755)))
                              (find-files "." (lambda (file stat)
-                                     (eq? 'symlink (stat:type stat))))))))))))
+                                                (eq? 'symlink (stat:type stat)))))))))))))
    ;; Note that the error messages printed by the tools in the case of
    ;; missing dependencies are often downright misleading.
    ;; TODO: hp-toolbox still fails to start with:
@@ -755,7 +756,7 @@ should only be used as part of the Guix cups-pk-helper service.")
           libjpeg-turbo
           libusb
           python
-           python-dbus-1.2
+           python-dbus
           python-pygobject
           python-pyqt
           python-wrapper
--- a/Show More
+++ b/Show More