Add Graal

Change-Id: I0350197af84ac351031e70a63fd0d483d022bad9
2026-01-01 18:33:49 +01:00
983 changed files with 125481 additions and 348696 deletions
@@ -98,27 +98,9 @@
  ((indent-tabs-mode . nil)

   ;; Emacs 28 changed the behavior of 'lisp-fill-paragraph', which causes the
-   ;; first line of package descriptions to extrude past 'fill-column', and
-   ;; somehow that is deemed more correct upstream (see:
-   ;; https://issues.guix.gnu.org/56197).
-   (eval . (progn
-             (require 'lisp-mode)
-             (defun emacs27-lisp-fill-paragraph (&optional justify)
-               (interactive "P")
-               (or (fill-comment-paragraph justify)
-                   (let ((paragraph-start
-                          (concat paragraph-start
-                                  "\\|\\s-*\\([(;\"]\\|\\s-:\\|`(\\|#'(\\)"))
-                         (paragraph-separate
-                          (concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
-                         (fill-column (if (and (integerp emacs-lisp-docstring-fill-column)
-                                               (derived-mode-p 'emacs-lisp-mode))
-                                          emacs-lisp-docstring-fill-column
-                                        fill-column)))
-                     (fill-paragraph justify))
-                   ;; Never return nil.
-                   t))
-             (setq-local fill-paragraph-function #'emacs27-lisp-fill-paragraph)))
+   ;; first line of package descriptions to extrude past 'fill-column'. The
+   ;; following variable reverts its behavior to the previous one.
+   (lisp-fill-paragraphs-as-doc-string nil)

   ;; This notably allows '(' in Paredit to not insert a space when the
   ;; preceding symbol is one of these.
@@ -28,7 +28,6 @@ Tick a box by changing it from [ ] to [x].
  - [ ] i586-gnu

 - Package **update**
-  - Closure size increase after update (`./pre-inst-env guix size PACKAGE`).
  - Build status of direct dependents (`./pre-inst-env guix build -k -P1 PACKAGE ...`):
 ```text

@@ -38,14 +37,13 @@ Tick a box by changing it from [ ] to [x].

 ```
 - Package **addition**
-  - [ ] The packages includes tests when available.
-  - [ ] Closure size given by `guix size`.
  - [ ] Fixed errors reported by `guix lint` (`./pre-inst-env guix lint PACKAGE ...`).
  - [ ] Verified cryptographic signature provided by upstream.
  - [ ] The packages don't use bundled copies of software.
  - [ ] Synopsis and description are written in conformance with [the guidelines](https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html).
-  - [ ] Commit messages follow [the "ChangeLog" style](https://www.gnu.org/prep/standards/html_node/Change-Logs.html).
-  - [ ] The change doesn't break `guix pull` (`guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master --disable-authentication`).
+
+- [ ] Commit messages follow [the "ChangeLog" style](https://www.gnu.org/prep/standards/html_node/Change-Logs.html).
+- [ ] The change doesn't break `guix pull` (`guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master --disable-authentication`).

 - Successfully cross-compiled to the following target(s) (this is optional):
  - [ ] x86_64-linux-gnu
@@ -36,8 +36,6 @@
   (name "efraim"))
  ("5DBE 23D3 9053 6526 7F8C  C76A FDB9 52BD 3F73 56D6"
   (name "ekaitz"))
-  ("50E1 7BE0 D210 C883 D675  3150 4A3D 07EF D05C 4045"
-   (name "fishinthecalculator"))
  (;; primary: "D1BD 1EB7 B655 AECE 0BA7  8F94 4940 7E7E 89CA 9B07"
   "0807 AC76 DFE8 4303 6D5F  5879 F51D 4A16 DCEE 6FA7"
   (name "futurile"))
@@ -49,7 +47,7 @@
  (;; primary: "220F 98D9 5E86 204C 0036  DA7B 6DEC 4360 408B 4185"
   "F4C2 D1DF 3FDE EA63 D1D3  0776 ACC6 6D09 CA52 8292"
   (name "hako"))
-  ("3D58 BE78 5C1B E400 E214  0755 43F4 B499 3A1F 9D20"
+  ("B943 509D 633E 80DD 27FC  4EED 634A 8DFF D3F6 31DF"
   (name "htgoebel"))
  ( ;; primary: "FECD 9EBA FAAD 1831 7E05  DAC0 E55F 4198 D2A7 0CD7"
   "6980 A9B9 5202 AA11 EB1D  8922 8499 AC88 F1A7 1CF2"
@@ -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

@@ -161,7 +146,6 @@ gnu/system/examples/lightweight-desktop\.tmpl      @guix/documentation
 gnu/system/examples/desktop\.tmpl                  @guix/documentation

 gnu/packages/electronics\.scm                      @guix/electronics
-gnu/packages/hdl\.scm                              @guix/electronics
 gnu/packages/libftdi\.scm                          @guix/electronics
 gnu/packages/engineering\.scm                      @guix/electronics
 gnu/packages/flashing-tools\.scm                   @guix/electronics
@@ -186,8 +170,6 @@ gnu/packages/game-development\.scm                 @guix/games
 gnu/packages/luanti\.scm                           @guix/games
 gnu/packages/esolangs\.scm                         @guix/games
 gnu/packages/motti\.scm                            @guix/games
-gnu/services/games\.scm                            @guix/games
-gnu/tests/games\.scm                               @guix/games
 guix/build/luanti-build-system\.scm                @guix/games

 etc/teams/gnome                                    @guix/gnome
@@ -195,7 +177,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 +193,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
@@ -241,11 +216,7 @@ tests/home-services\.scm                           @guix/home

 gnu/packages/mpi\.scm                              @guix/hpc
 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 +229,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,12 +268,8 @@ 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

 gnu/build/icecat-extension\.scm                    @guix/mozilla
 gnu/packages/browser-extensions\.scm               @guix/mozilla
@@ -324,39 +287,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
@@ -380,7 +322,7 @@ etc/manifests/release-desktop\.scm                 @guix/release

 gnu/packages/diffoscope\.scm                       @guix/reproduciblebuilds

-gnu/packages/(ruby)(-.+|)\.scm$                    @guix/ruby
+gnu/packages/ruby\.scm                             @guix/ruby
 guix/build/ruby-build-system\.scm                  @guix/ruby
 guix/build-system/ruby\.scm                        @guix/ruby
 guix/import/gem\.scm                               @guix/ruby
@@ -406,7 +348,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

@@ -419,7 +360,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
@@ -439,25 +380,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
@@ -479,15 +401,6 @@ tests/import/texlive\.scm                          @guix/tex
 etc/news\.scm                                      @guix/translations
 po/                                                @guix/translations

-gnu/packages/version-control\.scm                  @guix/vcs
-gnu/services/version-control\.scm                  @guix/vcs
-gnu/tests/version-control\.scm                     @guix/vcs
-guix/build/bzr\.scm                                @guix/vcs
-guix/build/cvs\.scm                                @guix/vcs
-guix/build/git\.scm                                @guix/vcs
-guix/build/hg\.scm                                 @guix/vcs
-guix/build/svn\.scm                                @guix/vcs
-
 gnu/packages/xfce\.scm                             @guix/xfce

 gnu/packages/zig\.scm                              @guix/zig
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012-2026 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 # Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
 # Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
@@ -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>
@@ -87,7 +87,6 @@ MODULES =					\
  guix/base64.scm				\
  guix/ci.scm					\
  guix/cpio.scm					\
-  guix/amd-gpu.scm				\
  guix/cpu.scm					\
  guix/deprecation.scm				\
  guix/docker.scm	   			\
@@ -117,7 +116,6 @@ MODULES =					\
  guix/narinfo.scm				\
  guix/derivations.scm				\
  guix/grafts.scm				\
-  guix/remote-procedures.scm			\
  guix/repl.scm					\
  guix/rpm.scm					\
  guix/transformations.scm			\
@@ -269,6 +267,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				\
@@ -297,7 +296,6 @@ MODULES =					\
  guix/build/toml.scm			\
  guix/search-paths.scm				\
  guix/packages.scm				\
-  guix/import/apache.scm			\
  guix/import/cabal.scm				\
  guix/import/composer.scm			\
  guix/import/cpan.scm				\
@@ -378,7 +376,6 @@ MODULES =					\
  guix/scripts/import/luanti.scm  		\
  guix/scripts/import/minetest.scm  		\
  guix/scripts/import/npm-binary.scm		\
-  guix/scripts/import/nuget.scm  		\
  guix/scripts/import/opam.scm			\
  guix/scripts/import/pypi.scm			\
  guix/scripts/import/stackage.scm		\
@@ -455,12 +452,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	\
@@ -482,6 +477,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		\
@@ -493,6 +492,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		\
@@ -505,8 +505,7 @@ EXAMPLES =					\
  gnu/system/examples/plasma.tmpl		\
  gnu/system/examples/raspberry-pi-64.tmpl	\
  gnu/system/examples/raspberry-pi-64-nfs-root.tmpl	\
-  gnu/system/examples/vm-image.tmpl		\
-  gnu/system/examples/vm-image-efi.tmpl
+  gnu/system/examples/vm-image.tmpl

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

@@ -578,7 +577,6 @@ SCM_TESTS =					\
  tests/import/hexpm.scm			\
  tests/import/luanti.scm			\
  tests/import/npm-binary.scm			\
-  tests/import/nuget.scm			\
  tests/import/opam.scm				\
  tests/import/print.scm			\
  tests/import/pypi.scm				\
@@ -749,7 +747,7 @@ dist_fishcompletion_DATA = etc/completion/fish/guix.fish
 nodist_selinux_policy_DATA = etc/guix-daemon.cil

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

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

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

 *** X session is executed from a login shell (<http://bugs.gnu.org/19119>)
 *** grub.cfg is now a garbage-collector root (<http://bugs.gnu.org/19160>)
-*** Substituter progress report properly formatted
+*** Substituter progress report properly formatted 
    (<http://bugs.gnu.org/19313>)
 *** Document permissions for /gnu/store (<http://bugs.gnu.org/19316>)
 *** Make sure config.go is newer than config.scm
@@ -5994,18 +5920,18 @@ This could cause problems with ancient Linux kernel.
 *** download: Use the 'SERVER NAME' TLS extension when possible
    (<http://bugs.gnu.org/18526>)
 *** libdaemon: Add alternate source URLs (<http://bugs.gnu.org/18639>)
-*** icu4c: Reinstate RUNPATH on shared libraries
+*** icu4c: Reinstate RUNPATH on shared libraries 
    (<http://bugs.gnu.org/18695>)
 *** nss-mdns: Add alternate source URLs (<http://bugs.gnu.org/18704>)
 *** download: Add "Accept: */*" to the HTTP headers
    (<http://bugs.gnu.org/18768>)
-*** guix-register: Do not attempt to create NIX_STORE_DIR
+*** guix-register: Do not attempt to create NIX_STORE_DIR 
    (<http://bugs.gnu.org/18689>)
 *** Allow Linux-libre to find our 'modprobe' command
    (<http://bugs.gnu.org/18525>)
 *** man-pages: Build sequentially (<http://bugs.gnu.org/18701>)
 *** Fix intermittent test failures involving GC (<http://bugs.gnu.org/18935>)
-*** guix import: pypi: Gracefully handle non-existent packages
+*** guix import: pypi: Gracefully handle non-existent packages 
    (<http://bugs.gnu.org/18831>)
 *** Make sure the shared library has the '.so' extension
    (<http://bugs.gnu.org/18521>)
@@ -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"))
@@ -30,7 +30,6 @@
             (guix ui)
             ((guix ui) #:select (build-notifier))
             (ice-9 match)
-             (ice-9 pretty-print)
             (ice-9 threads))

 (define %top-srcdir
@@ -43,6 +42,11 @@
  ((command directory)
   (let ((real-build-things build-things))
     (with-store store
+       ;; Make sure we don't resort to substitutes.
+       (set-build-options store
+                          #:use-substitutes? #f
+                          #:substitute-urls '())
+
       ;; The evaluation of Guix itself requires building a "trampoline"
       ;; program, and possibly everything it depends on.  Thus, allow builds
       ;; but print a notification.
@@ -100,7 +104,7 @@
                      (close-inferior inferior)
                      (call-with-output-file file
                        (lambda (port)
-                          (pretty-print jobs port)))))))
+                          (write jobs port)))))))
              %cuirass-supported-systems
              inferiors)))))))
  (x
@@ -3,11 +3,10 @@ exec guile --no-auto-compile -e main -s "$0" "$@"
 !#
 ;;;; test-driver.scm - Guile test driver for Automake testsuite harness

-(define script-version "2026-03-21.02") ;UTC
+(define script-version "2023-12-08.14") ;UTC

 ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify it
 ;;; under the terms of the GNU General Public License as published by
@@ -36,8 +35,7 @@ exec guile --no-auto-compile -e main -s "$0" "$@"
             (srfi srfi-1)
             (srfi srfi-19)
             (srfi srfi-26)
-             (srfi srfi-64)
-             (srfi srfi-71))
+             (srfi srfi-64))

 (define (show-help)
  (display "Usage:
@@ -97,21 +95,6 @@ case is shown.\n"))
                       "[m")          ;no color
        result)))

-(define* (test-result-kind* #:optional (runner (test-runner-current)))
-  ;; TODO: Since Guile 3.0.11, the test-result-kind value of tests not
-  ;; selected by specifiers is #f instead of 'skip, which seems like a bug.
-  ;; Revert to use 'test-result-kind' after
-  ;; <https://codeberg.org/guile/guile/issues/133> is resolved and made and
-  ;; available in Guix.
-  (or (test-result-ref runner 'result-kind)
-      'skip))
-
-(define (current-test-full-name runner)
-  "Get full name (test group path + name) of current test."
-  (format #f "~{~a~^/~}: ~a"
-          (test-runner-group-path runner)
-          (test-runner-test-name runner)))
-

 ;;;
 ;;; SRFI 64 custom test runner.
@@ -122,30 +105,27 @@ case is shown.\n"))
                          (out-port (current-output-port))
                          (trs-port (%make-void-port "w"))
                          select exclude)
-  "Return a custom SRFI-64 test runner and a `finalize' procedure as multiple
-values.  TEST-NAME is a string specifying the file name of the current the
-test.  COLOR?  specifies whether to use colors.  When BRIEF? is true, the
-individual test cases results are masked and only the summary is shown.
-ERRORS-ONLY?  reduces the amount of test case metadata logged to only that of
-the failed test cases.  OUT-PORT and TRS-PORT must be output ports.  OUT-PORT
-defaults to the current output port, while TRS-PORT defaults to a void port,
-which means no TRS output is logged.  SELECT and EXCLUDE may take a regular
-expression to select or exclude individual test cases based on their names.
-
-After the tests are finished running, the `finalize' procedure should be
-called to do the final reporting."
+  "Return an custom SRFI-64 test runner.  TEST-NAME is a string specifying the
+file name of the current the test.  COLOR? specifies whether to use colors.
+When BRIEF? is true, the individual test cases results are masked and only the
+summary is shown.  ERRORS-ONLY? reduces the amount of test case metadata
+logged to only that of the failed test cases.  OUT-PORT and TRS-PORT must be
+output ports.  OUT-PORT defaults to the current output port, while TRS-PORT
+defaults to a void port, which means no TRS output is logged.  SELECT and
+EXCLUDE may take a regular expression to select or exclude individual test
+cases based on their names."

  (define test-cases-start-time (make-hash-table))

  (define (test-on-test-begin-gnu runner)
    ;; Procedure called at the start of an individual test case, before the
    ;; test expression (and expected value) are evaluated.
-    (let ((test-case-name (current-test-full-name runner))
+    (let ((test-case-name (test-runner-test-name runner))
          (start-time     (current-time time-monotonic)))
      (hash-set! test-cases-start-time test-case-name start-time)))

  (define (test-skipped? runner)
-    (eq? 'skip (test-result-kind* runner)))
+    (eq? 'skip (test-result-kind runner)))

  (define (test-failed? runner)
    (not (or (test-passed? runner)
@@ -157,7 +137,7 @@ called to do the final reporting."
    (let* ((results (test-result-alist runner))
           (result? (cut assq <> results))
           (result  (cut assq-ref results <>))
-           (test-case-name (current-test-full-name runner))
+           (test-case-name (test-runner-test-name runner))
           (start (hash-ref test-cases-start-time test-case-name))
           (end (current-time time-monotonic))
           (time-elapsed (time-difference end start))
@@ -166,12 +146,12 @@ called to do the final reporting."
      (unless (or brief? (and errors-only? (test-skipped? runner)))
        ;; Display the result of each test case on the console.
        (format out-port "~a: ~a - ~a ~@[[~,3fs]~]~%"
-                (result->string (test-result-kind* runner) #:colorize? color?)
+                (result->string (test-result-kind runner) #:colorize? color?)
                test-name test-case-name
                (and show-duration? time-elapsed-seconds)))

      (unless (and errors-only? (not (test-failed? runner)))
-        (format #t "test-name: ~A~%" test-case-name)
+        (format #t "test-name: ~A~%" (result 'test-name))
        (format #t "location: ~A~%"
                (string-append (result 'source-file) ":"
                               (number->string (result 'source-line))))
@@ -188,29 +168,18 @@ called to do the final reporting."
        (newline))

      (format trs-port ":test-result: ~A ~A [~,3fs]~%"
-              (result->string (test-result-kind* runner))
-              test-case-name time-elapsed-seconds)))
+              (result->string (test-result-kind runner))
+              (test-runner-test-name runner) time-elapsed-seconds)))

-  (define (finalize runner)
-    "Procedure to call after all tests finish to do the final reporting."
+  (define (test-on-group-end-gnu runner)
+    ;; Procedure called by a 'test-end', including at the end of a test-group.
    (let ((fail (or (positive? (test-runner-fail-count runner))
                    (positive? (test-runner-xpass-count runner))))
          (skip (or (positive? (test-runner-skip-count runner))
                    (positive? (test-runner-xfail-count runner)))))
-      (format trs-port ":global-test-result: ~{~A~^,~}~%"
-              (filter-map (λ (proc str)
-                            (let ((n (proc runner)))
-                              (if (positive? n) str #f)))
-                          (list test-runner-pass-count
-                                test-runner-fail-count
-                                test-runner-xpass-count
-                                test-runner-xfail-count
-                                test-runner-skip-count)
-                          (list "PASS"
-                                "FAIL"
-                                "XPASS"
-                                "XFAIL"
-                                "SKIP")))
+      ;; XXX: The global results need some refinements for XPASS.
+      (format trs-port ":global-test-result: ~A~%"
+              (if fail "FAIL" (if skip "SKIP" "PASS")))
      (format trs-port ":recheck: ~A~%"
              (if fail "yes" "no"))
      (format trs-port ":copy-in-global-log: ~A~%"
@@ -220,14 +189,15 @@ called to do the final reporting."
        (format out-port "~A: ~A~%"
                (result->string (if fail 'fail (if skip 'skip 'pass))
                                #:colorize? color?)
-                test-name))))
+                test-name))
+      #f))

  (let ((runner (test-runner-null)))
    (test-runner-on-test-begin! runner test-on-test-begin-gnu)
    (test-runner-on-test-end! runner test-on-test-end-gnu)
+    (test-runner-on-group-end! runner test-on-group-end-gnu)
    (test-runner-on-bad-end-name! runner test-on-bad-end-name-simple)
-    (values runner
-            (λ () (finalize runner)))))
+    runner))


 ;;;
@@ -235,11 +205,27 @@ called to do the final reporting."
 ;;;
 (define (test-match-name* regexp)
  "Return a test specifier that matches a test name against REGEXP."
-  (compose (cut string-match regexp <>) current-test-full-name))
+  (lambda (runner)
+    (string-match regexp (test-runner-test-name runner))))

 (define (test-match-name*/negated regexp)
  "Return a negated test specifier version of test-match-name*."
-  (compose not (test-match-name* regexp)))
+  (lambda (runner)
+    (not (string-match regexp (test-runner-test-name runner)))))
+
+;;; XXX: test-match-all is a syntax, which isn't convenient to use with a list
+;;; of test specifiers computed at run time.  Copy this SRFI 64 internal
+;;; definition here, which is the procedural equivalent of 'test-match-all'.
+(define (%test-match-all . pred-list)
+  (lambda (runner)
+    (let ((result #t))
+      (let loop ((l pred-list))
+	(if (null? l)
+	    result
+	    (begin
+	      (if (not ((car l) runner))
+		  (set! result #f))
+	      (loop (cdr l))))))))


 ;;;
@@ -263,7 +249,7 @@ called to do the final reporting."
                               identity
                               (list (and=> select test-match-name*)
                                     (and=> exclude test-match-name*/negated))))
-             (test-specifier (apply test-match-all test-specifiers))
+             (test-specifier (apply %test-match-all test-specifiers))
             (color-tests (if (assoc 'color-tests opts)
                              (option->boolean opts 'color-tests)
                              #t)))
@@ -271,19 +257,17 @@ called to do the final reporting."
          (redirect-port log (current-output-port))
          (redirect-port log (current-warning-port))
          (redirect-port log (current-error-port)))
-        (let ((runner
-               finalize (test-runner-gnu
-                         test-name
-                         #:color? color-tests
-                         #:brief? (option->boolean opts 'brief)
-                         #:errors-only? (option->boolean opts 'errors-only)
-                         #:show-duration? (option->boolean
-                                           opts 'show-duration)
-                         #:out-port out #:trs-port trs)))
-          (test-apply runner test-specifier
+        (test-with-runner
+            (test-runner-gnu test-name
+                             #:color? color-tests
+                             #:brief? (option->boolean opts 'brief)
+                             #:errors-only? (option->boolean opts 'errors-only)
+                             #:show-duration? (option->boolean
+                                               opts 'show-duration)
+                             #:out-port out #:trs-port trs)
+          (test-apply test-specifier
                      (lambda _
-                        (load-from-path test-name)))
-          (finalize))
+                        (load-from-path test-name))))
        (and=> log close-port)
        (and=> trs close-port)
        (close-port out))))
@@ -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)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012-2021, 2022-2023, 2025 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012-2021, 2022-2023 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013, 2016 Mark H Weaver <mhw@netris.org>
 # Copyright © 2014-2016 Alex Kost <alezost@gmail.com>
 # Copyright © 2014-2016 David Thompson <davet@gnu.org>
@@ -130,8 +130,7 @@ if test "x$GUILD" = "x"; then
 fi

 dnl (guix ui), notably, requires 'default-optimization-level' added in 3.0.3.
-dnl (guix serialization) requires 'bytevector-slice' added in 3.0.9.
-PKG_CHECK_MODULES([GUILE], [guile-3.0 >= 3.0.9])
+PKG_CHECK_MODULES([GUILE], [guile-3.0 >= 3.0.3])

 dnl Get CFLAGS and LDFLAGS for libguile.
 GUILE_FLAGS
@@ -199,12 +198,6 @@ if test "x$have_guile_lzlib" != "xyes"; then
  AC_MSG_ERROR([Guile-lzlib is missing; please install it.])
 fi

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

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

 (define (texinfo-manual-images source)
  "Return a directory containing all the images used by the user manual, taken
@@ -777,8 +777,7 @@ in SOURCE."
              (define version-links
                (list (menu-item #$latest-version
                                 (string-append
-                                  "/manual/" #$latest-version
-                                  "/" language
+                                  "/manual/" language
                                  (if split-node? "/html_node" "")))
                      (menu-item "development"
                                 (string-append
@@ -943,8 +942,7 @@ makeinfo OPTIONS."
                      (let* ((texi (language->texi-file-name language))
                             (opts `("--html"
                                     "-c" ,(string-append "TOP_NODE_UP_URL=/manual/"
-                                                          #$%latest-guix-version
-                                                          "/" language)
+                                                         language)
                                     #$@options
                                     ,texi)))
                        (format #t "building HTML manual for language '~a'...~%"
@@ -25,6 +25,7 @@ choice.
 * Running the Test Suite::      Testing Guix.
 * Running Guix Before It Is Installed::  Hacker tricks.
 * The Perfect Setup::           The right tools.
+* Alternative Setups::          Other possible tools that do the job.
 * Source Tree Structure::       Source code guided tour.
 * Packaging Guidelines::        Growing the distribution.
 * Coding Style::                Hygiene of the contributor.
@@ -65,8 +66,8 @@ GNU Guix depends on the following packages:

@itemize
@item @url{https://gnu.org/software/guile/, GNU Guile}, version 3.0.x,
-version 3.0.9 or later;
-@item @url{https://codeberg.org/guile-gcrypt/guile-gcrypt, Guile-Gcrypt}, version
+version 3.0.3 or later;
+@item @url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version
 0.1.0 or later;
@item
@uref{https://gitlab.com/gnutls/guile/, Guile-GnuTLS} (@pxref{Guile
@@ -75,11 +76,11 @@ gnutls-guile, GnuTLS-Guile})@footnote{The Guile bindings to
@uref{https://gnutls.org/, GnuTLS} were distributed as part of GnuTLS
 until version 3.7.8 included.};
@item
-@uref{https://codeberg.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0
+@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0
 or later;
-@item @uref{https://codeberg.org/guile-compression/guile-zlib, Guile-zlib},
+@item @uref{https://notabug.org/guile-zlib/guile-zlib, Guile-zlib},
 version 0.1.0 or later;
-@item @uref{https://codeberg.org/guile-compression/guile-lzlib, Guile-lzlib};
+@item @uref{https://notabug.org/guile-lzlib/guile-lzlib, Guile-lzlib};
@item @uref{https://www.nongnu.org/guile-avahi/, Guile-Avahi};
@item
@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.10.0
@@ -101,7 +102,7 @@ Support for build offloading (@pxref{Daemon Offload Setup}) and
 version 0.13.0 or later.

@item
-@uref{https://codeberg.org/guile-compression/guile-zstd, Guile-zstd}, for zstd
+@uref{https://notabug.org/guile-zstd/guile-zstd, Guile-zstd}, for zstd
 compression and decompression in @command{guix publish} and for
 substitutes (@pxref{Invoking guix publish}).

@@ -141,7 +142,6 @@ Guix Consensus Document 003}.}:

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

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

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

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

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

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

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

 From there you can generate the build system infrastructure
@@ -535,64 +530,14 @@ to build again each time you update a package file, run
@node The Perfect Setup
@section The Perfect Setup

-@cindex editor setup, for Scheme
-@cindex Scheme code editing
-All configuration and development in Guix is done in the Scheme
-language.  Like all languages of the Lisp family, Scheme has a simple
-syntax.  The perfect setup is one where the editor you choose makes
-working with that syntax seamless and pleasant; for that it must
-absolutely support a few things for Scheme:
-
-@itemize
-@item
-automatic indentation, such that hitting the ``Enter'' key (or
-@kbd{RET}) places cursor ``at the right place'' on the next line;
-@item
-``parentheses matching'', allowing you to jump from a closing
-parenthesis to the corresponding opening parenthesis and vice-versa;
-@item
-syntax highlighting, so that keywords are visually distinguishable.
-@end itemize
-
-The following optional features can make your life easier:
-
-@itemize
-@item
-structural editing of Scheme syntax;
-@item
-Guile integration so you can easily evaluate code, jump to procedure
-definitions, view documentation, and so on.
-@end itemize
-
-The following sections look at editor setups that are known to work
-well.  Do share your setup for these and other editors for inclusion in
-this manual!  @xref{Submitting Patches}.
-
-@menu
-* Emacs::                       Best-of-breed editor for Scheme code.
-* Guile Studio::                First step in your transition to Emacs.
-* Vim and NeoVim::              Classical Unix editors.
-@end menu
-
-@node Emacs
-@subsection Emacs
-
-@url{https://www.gnu.org/software/emacs, Emacs} is probably the most
-widely used editor in the community; it is also the one that,
-historically, has always had excellent support for Lisp languages, being
-itself a Lisp implementation!
-
-@quotation Note
-If you are just getting started with Emacs, @pxref{Guile Studio} for a
-smooth way to start your transition.
-@end quotation
-
-Just like for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile
-Reference Manual}), Emacs works best when empowered by the wonderful
-@url{https://nongnu.org/geiser/, Geiser}.  To set that up, run:
+The Perfect Setup to hack on Guix is basically the perfect setup used
+for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference
+Manual}).  First, you need more than an editor, you need
+@url{https://www.gnu.org/software/emacs, Emacs}, empowered by the
+wonderful @url{https://nongnu.org/geiser/, Geiser}.  To set that up, run:

@example
-guix install emacs guile emacs-geiser emacs-geiser-guile emacs-guix
+guix install emacs guile emacs-geiser emacs-geiser-guile
@end example

 Geiser allows for interactive and incremental development from within
@@ -611,15 +556,6 @@ facilities to directly operate on the syntax tree, such as raising an
 s-expression or wrapping it, swallowing or rejecting the following
 s-expression, etc.

-Cherry on the cake: the Emacs-Guix package provides a convenient
-interface to many commands---e.g., it lets you browse packages, install
-or remove packages, and so on---as well as development helpers that
-enhance @code{scheme-mode} and Geiser.  @xref{Introduction,,,
-emacs-guix, Emacs-Guix Reference Manual}, to make sure you don't miss
-out!
-
-@unnumberedsubsubsec Taming Boilerplate with Templates
-
@cindex code snippets
@cindex templates
@cindex reducing boilerplate
@@ -659,8 +595,6 @@ trigger string @code{origin...}, which can be expanded further.  The
@code{origin} snippet in turn may insert other trigger strings ending on
@code{...}, which also can be expanded further.

-@unnumberedsubsubsec Updating Copyright Lines
-
@cindex insert or update copyright
@cindex @code{M-x guix-copyright}
@cindex @code{M-x copyright-update}
@@ -689,30 +623,104 @@ copyright-update}.  If you want to do it automatically after each buffer
 save then add @code{(add-hook 'after-save-hook 'copyright-update)} in
 Emacs.

-@unnumberedsubsubsec Referencing Bug Reports
+@node Viewing Bugs within Emacs
+@subsection Viewing Bugs within Emacs

-@cindex bug references, Emacs
-Emacs has a nice minor mode called @code{bug-reference}, which can be
-used to follow link to issues and pull requests such as @samp{#1234} or
-@samp{guix/guix#1234} (@pxref{Bug Reference,,, emacs, The GNU Emacs
-Manual}).  To set it up, enable it in the relevant modes:
+Emacs has a nice minor mode called @code{bug-reference}, which, when
+combined with @samp{emacs-debbugs} (the Emacs package), can be used to
+open links such as @samp{<https://bugs.gnu.org/58697>} or
+@samp{<https://issues.guix.gnu.org/58697>} as bug report buffers.  From
+there you can easily consult the email thread via the Gnus interface,
+reply or modify the bug status, all without leaving the comfort of
+Emacs!  Below is a sample configuration to add to your @file{~/.emacs}
+configuration file:

@lisp
+;;; Bug references.
 (require 'bug-reference)
 (add-hook 'prog-mode-hook #'bug-reference-prog-mode)
+(add-hook 'gnus-mode-hook #'bug-reference-mode)
 (add-hook 'erc-mode-hook #'bug-reference-mode)
-;; Add extra hooks for your mail user agent: Gnus, mu4e, etc.
+(add-hook 'gnus-summary-mode-hook #'bug-reference-mode)
+(add-hook 'gnus-article-mode-hook #'bug-reference-mode)
+
+;;; This extends the default expression (the top-most, first expression
+;;; provided to 'or') to also match URLs such as
+;;; <https://issues.guix.gnu.org/58697> or <https://bugs.gnu.org/58697>.
+;;; It is also extended to detect "Fixes: #NNNNN" git trailers.
+(setq bug-reference-bug-regexp
+      (rx (group (or (seq word-boundary
+                          (or (seq (char "Bb") "ug"
+                                   (zero-or-one " ")
+                                   (zero-or-one "#"))
+                              (seq (char "Pp") "atch"
+                                   (zero-or-one " ")
+                                   "#")
+                              (seq (char "Ff") "ixes"
+                                   (zero-or-one ":")
+                                   (zero-or-one " ") "#")
+                              (seq "RFE"
+                                   (zero-or-one " ") "#")
+                              (seq "PR "
+                                   (one-or-more (char "a-z+-")) "/"))
+                          (group (one-or-more (char "0-9"))
+                                 (zero-or-one
+                                  (seq "#" (one-or-more
+                                            (char "0-9"))))))
+                     (seq (? "<") "https://bugs.gnu.org/"
+                          (group-n 2 (one-or-more (char "0-9")))
+                          (? ">"))
+                     (seq (? "<") "https://issues.guix.gnu.org/"
+                          (? "issue/")
+                          (group-n 2 (one-or-more (char "0-9")))
+                          (? ">"))))))
+(setq bug-reference-url-format "https://issues.guix.gnu.org/%s")
+
+(require 'debbugs)
+(require 'debbugs-browse)
+(add-hook 'bug-reference-mode-hook #'debbugs-browse-mode)
+(add-hook 'bug-reference-prog-mode-hook #'debbugs-browse-mode)
+
+;; The following allows Emacs Debbugs user to open the issue directly within
+;; Emacs.
+(setq debbugs-browse-url-regexp
+      (rx line-start
+          "http" (zero-or-one "s") "://"
+          (or "debbugs" "issues.guix" "bugs")
+          ".gnu.org" (one-or-more "/")
+          (group (zero-or-one "cgi/bugreport.cgi?bug="))
+          (group-n 3 (one-or-more digit))
+          line-end))
+
+;; Change the default when run as 'M-x debbugs-gnu'.
+(setq debbugs-gnu-default-packages '("guix" "guix-patches"))
+
+;; Show feature requests.
+(setq debbugs-gnu-default-severities
+ '("serious" "important" "normal" "minor" "wishlist"))
@end lisp

-When working from a Git checkout of Guix, setup is automatic:
-@code{bug-reference} automatically detects that the project is hosted on
-Codeberg@footnote{
-@c 'vc-git-repository-url' is used by
-@c 'bug-reference-setup-from-vc-alist', which checks for one of these
-@c names for the remote.
-As of Emacs@tie{}30.2, auto-detection works if and
-only if the Git remote is called @code{upstream} or @code{origin}.} and
-infers the issue and pull request URL from there.
+For more information, refer to @ref{Bug Reference,,, emacs, The GNU
+Emacs Manual} and @ref{Minor Mode,,, debbugs-ug, The Debbugs User
+Guide}.
+
+@node Alternative Setups
+@section Alternative Setups
+
+Alternative setups than Emacs may let you work on Guix with a
+similar development experience and they might work better with the
+tools you currently use or help you make the transition to Emacs.
+
+The options listed below only provide the alternatives to the Emacs
+based setup, which is the most widely used in the Guix community.  If
+you want to really understand how the perfect setup for Guix development
+is supposed to work, we encourage you to read the section before this
+regardless of the editor you choose to use.
+
+@menu
+* Guile Studio::                First step in your transition to Emacs.
+* Vim and NeoVim::              When you are evil to the root.
+@end menu

@node Guile Studio
@subsection Guile Studio
@@ -730,9 +738,9 @@ Guile Studio comes with Geiser preinstalled and prepared for action.
@node Vim and NeoVim
@subsection Vim and NeoVim

-@cindex Vim, for Scheme code editing
-Vim (and NeoVim) are also packaged in Guix, in case these popular modal
-editors are more to your taste.
+
+Vim (and NeoVim) are also packaged in Guix, just in case you decided
+to go for the evil path.

@example
 guix install vim
@@ -1500,30 +1508,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
@@ -1535,20 +1550,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
@@ -1563,9 +1579,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}.

@@ -1926,60 +1942,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}).
@@ -2146,13 +2137,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,
@@ -2172,6 +2186,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

@@ -2182,26 +2356,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
@@ -2313,10 +2492,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
@@ -2496,8 +2676,8 @@ For example, to list all open issues on @code{guix-patches}, hit:
 For a more convenient (shorter) way to access both the bugs and patches
 submissions, you may want to configure the
@code{debbugs-gnu-default-packages} and
-@code{debbugs-gnu-default-severities} Emacs variables (@pxref{Minor
-Mode,,, debbugs-ug, The Debbugs User Guide}).
+@code{debbugs-gnu-default-severities} Emacs variables (@pxref{Viewing
+Bugs within Emacs}).

 To search for bugs, @samp{@kbd{M-x} debbugs-gnu-guix-search} can be
 used.
@@ -2505,6 +2685,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

@@ -3006,7 +3243,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
@@ -22,7 +22,7 @@ Copyright @copyright{} 2020 André Batista@*
 Copyright @copyright{} 2020 Christine Lemmer-Webber@*
 Copyright @copyright{} 2021 Joshua Branson@*
 Copyright @copyright{} 2022, 2023 Maxim Cournoyer@*
-Copyright @copyright{} 2023--2026 Ludovic Courtès@*
+Copyright @copyright{} 2023-2025 Ludovic Courtès@*
 Copyright @copyright{} 2023 Thomas Ieong@*
 Copyright @copyright{} 2024 Florian Pelz@*
 Copyright @copyright{} 2025 45mg@*
@@ -523,9 +523,6 @@ info sicp

 You'll find more books, tutorials and other resources at
@url{https://schemers.org/}.
-
-@xref{The Perfect Setup,,, guix, GNU Guix Reference Manual}, on how to
-set up your editor for Scheme hacking.
@end quotation


@@ -1737,8 +1734,8 @@ At this stage, the package @code{cargo-audit} is buildable.

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

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

@node Using Rust Libraries in Other Build Systems
@@ -5297,7 +5294,7 @@ did above with transformation options. We can add them like so:
  "Return P with FLAGS as additional 'configure' flags."
  (package/inherit p
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments p)
       ((#:configure-flags original-flags #~(list))
        #~(append #$original-flags #$flags))))))

@@ -5961,15 +5958,6 @@ installation instructions (@pxref{Binary Installation,,, guix, GNU Guix
 Reference Manual}).  Thanks to the installation script, this should be
 quick.  Once installation is complete, we need to make some adjustments.

-@quotation Note
-Starting from Guix version 1.5.0, @command{guix-daemon} runs without
-root privileges by default; previously installed systems can also be
-migrated to this ``rootless'' mode (@pxref{Build Environment Setup,,,
-guix, GNU Guix Reference Manual}).  Learn more about this change in a
-@uref{https://hpc.guix.info/blog/2025/03/build-daemon-drops-its-privileges/,
-2025 blog post}.
-@end quotation
-
 Since we want @code{guix-daemon} to be reachable not just from the head
 node but also from the compute nodes, we need to arrange so that it
 listens for connections over TCP/IP.  To do that, we'll edit the systemd
@@ -5984,12 +5972,13 @@ something like this:
@ifnothtml
@example
 ExecStart=/var/guix/profiles/per-user/root/current-guix/bin/guix-daemon \
+    --build-users-group=guixbuild \
    --listen=/var/guix/daemon-socket/socket --listen=0.0.0.0
@end example
@end ifnothtml
@ifhtml
@example
-ExecStart=/var/guix/profiles/per-user/root/current-guix/bin/guix-daemon --listen=/var/guix/daemon-socket/socket --listen=0.0.0.0
+ExecStart=/var/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild --listen=/var/guix/daemon-socket/socket --listen=0.0.0.0
@end example
@end ifhtml

@@ -6025,51 +6014,32 @@ The @file{/gnu/store} directory can be exported read-only since only
 package}; thus, to allow users to install packages with @code{guix
 package}, this must be read-write.

-@quotation Note
-Although it is rarely used, Guix allows for the creation of profiles in
-non-default locations.  For instance, @code{guix package -p
-~/dev/python-dev -i python} installs Python in a profile reachable from
-the @code{~/dev/python-dev} symlink instead of the default
-@file{~/.guix-profile}.
-
-To make sure that
+Users can create as many profiles as they like in addition to the
+default profile, @file{~/.guix-profile}.  For instance, @code{guix
+package -p ~/dev/python-dev -i python} installs Python in a profile
+reachable from the @code{~/dev/python-dev} symlink.  To make sure that
 this profile is protected from garbage collection---i.e., that Python
 will not be removed from @file{/gnu/store} while this profile exists---,
@emph{home directories should be mounted on the head node} as well so
 that @code{guix-daemon} knows about these non-standard profiles and
 avoids collecting software they refer to.

-@c The following paragraph refers to Guix commit
-@c d12c4452a49b355369636de1dfc766b5bad6437b, which changed
-@c 'time-machine' and 'shell' to store GC roots under /var/guix.
-Doing so is optional though: profiles created by default by
-@command{guix package}, @command{guix pull}, and @command{guix shell}
-are all stored under @file{/var/guix} and thus protected from garbage
-collection.
-@end quotation
-
 It may be a good idea to periodically remove unused bits from
@file{/gnu/store} by running @command{guix gc} (@pxref{Invoking guix
 gc,,, guix, GNU Guix Reference Manual}).  This can be done by adding a
-systemd timer based on the one shipped with Guix:
+crontab entry on the head node:

@example
-cp \
- /var/guix/profiles/per-user/root/current-guix/lib/systemd/system/guix-gc.* \
- /etc/systemd/system
+root@@master# crontab -e
@end example

-Make sure to edit @file{guix-gc.service} and @file{guix-gc.timer} under
-@file{/etc/systemd/system} to adjust the parameters to your need: timer
-frequency, amount of free space, and whether to delete user's old
-generations.  We recommend executing @command{guix gc -F50G} every
-night, which will ensure that at least 50@tie{}GiB are available,
-without deleting user generations.  Once you're satisfied, you can start
-the timer:
+@noindent
+... with something like this:

@example
-systemctl daemon-reload
-systemctl start guix-gc.timer
+# Every day at 5AM, run the garbage collector to make sure
+# at least 10 GB are free on /gnu/store.
+0 5 * * 1  /usr/local/bin/guix gc -F10G
@end example

 We're done with the head node! Let's look at compute nodes now.
@@ -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=2025-11-29.21; # UTC

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

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

 # There’s no point in confining the guix executable, since it can run
 # any user code and so everything is expected.  We just need to
-# explicitly enable userns for systems with the
+# explicitely enable userns for systems with the
 # kernel.apparmor_restrict_unprivileged_userns sysctl.
 profile guix @{guix_storedir}/{*-guix-command,*-guix-*/bin/guix} flags=(unconfined) {
  userns,
@@ -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,

@@ -1,9 +1,3 @@
 #!/bin/sh
 # Authenticate the repo upon 'git pull' and similar.
-if ! git config guix.authentication.introduction-commit; then
-    exec guix git authenticate 9edb3f66fd807b096b48283debdcddccfea34bad \
-         "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA" \
-         -k origin/keyring
-else
-    exec guix git authenticate
-fi
+exec guix git authenticate
@@ -110,7 +110,6 @@ GNU_URL="https://ftpmirror.gnu.org/gnu/guix/"
 declare -A GPG_SIGNING_KEYS
 GPG_SIGNING_KEYS["civodul"]=3CE464558A84FDC69DB40CFB090B11993D9AEBB5  # ludo
 GPG_SIGNING_KEYS["apteryx"]=27D586A4F8900854329FF09F1260E46482E63562 # maxim
-GPG_SIGNING_KEYS["efraim"]=A28BF40C3E551372662D14F741AAE7DCCA3D8351 # efraim
 PUBLIC_KEYSERVERS="keys.openpgp.org pgpkeys.eu keyserver.ubuntu.com"

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

 # User's default profile, if it exists
 GUIX_PROFILE="$HOME/.guix-profile"
-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
@@ -68,6 +68,7 @@
  "hexchat"
  "hyprland"
  "icecat"
+  "idris"
  "imagemagick"
  "imapfilter"
  "jami"
@@ -1,11 +1,11 @@
 ;; GNU Guix news, for use by 'guix pull'.
 ;;
-;; Copyright © 2019-2026 Ludovic Courtès <ludo@gnu.org>
+;; Copyright © 2019-2025 Ludovic Courtès <ludo@gnu.org>
 ;; Copyright © 2019–2021, 2024 Tobias Geerinckx-Rice <me@tobias.gr>
 ;; 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,198 +42,6 @@
 (channel-news
 (version 0)

- (entry (commit "a7c8e68dc51144a6d3981b770aca9c4897fc7c0c")
-        (title
-         (en "Records can refer to inherited values of thunked fields")
-         (de "Vererbung in Verbundsobjekten erlaubt Verweise auf geerbte Werte verzögert ausgewerteter Felder"))
-        (body
-         (en "A new feature has been added to records—the facility used when
-defining packages, services, operating systems, and many other things—that,
-when inheriting from another record, allows you to refer to inherited field
-values.  When defining package variants, you may have seen this pattern:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs (package-inputs gdb)
-            (delete \"guile\"))))
-@end lisp
-
-This can now be written like this:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs inputs ;<- notice the change
-            (delete \"guile\"))))
-@end lisp
-
-Within the @code{inputs} body, the @code{inputs} identifier is now bound to
-the @dfn{inherited value}—i.e., the value this field inherits from @code{gdb}.
-The same mechanism can be used when changing other input fields or the
-@code{arguments} field.  It is less verbose but also
-@uref{https://issues.guix.gnu.org/50335, more accurate}.
-
-This change applies to \"thunked\" fields of all record types produced by
-@code{define-record-type*}: @code{package}, @code{origin},
-@code{operating-system}, @code{home-environment}, and so on.
-
-Note that this is an incompatible change: the newly introduced
-bindings—@code{inputs} in the example above—could shadow same-named bindings.")
-         (de "Als neue Funktionalität kann man in Verbundsobjekten – also beim
-Definieren von Paketen, Diensten, Betriebssystemen und vielem anderen – beim
-Erben von einem anderen Verbundsobjekt auf die geerbten Werte verweisen. Zum
-Definieren von Paketvarianten wurde früher etwas geschrieben wie:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs (package-inputs gdb)
-            (delete \"guile\"))))
-@end lisp
-
-Das lässt sich jetzt schreiben als:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs inputs ;<- hier ändert sich was
-            (delete \"guile\"))))
-@end lisp
-
-Innerhalb des @code{inputs}-Rumpfes ist der Bezeichner @code{inputs} jetzt
-an den @dfn{geerbten Wert} gebunden, d.h. an den Wert, den das Feld von
-@code{gdb} erbt. Derselbe Mechanismus kann beim Ändern anderer Felder mit
-Eingaben oder im Feld @code{arguments} benutzt werden. Das spart Platz und
-@uref{https://issues.guix.gnu.org/50335, verhält sich richtiger}.
-
-Die Änderung wirkt sich auf verzögert ausgewertete \"thunked\"-Felder aller
-Verbundstypen aus, die mit @code{define-record-type*} erstellt wurden:
-@code{package}, @code{origin}, @code{operating-system}, @code{home-environment}
-und so weiter.
-
-Hinweis: das ist eine inkompatible Änderung. Die neu eingeführte Bindung –
-@code{inputs} im obigen Beispiel – kann gleichnamige Bindungen überschatten.")))
-
- (entry (commit "b52ce9041ad58aeababd2d50d3e72bc23dffff60")
-        (title
-         (en "GNOME 48 is now available")
-         (fr "GNOME 48 maintenant disponible")
-         (pt "GNOME 48 já está disponível")
-         (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")
-         (pt "GNOME desktop foi atualizado da versão 46 para a 48, trazendo
-cores acentuadas, um aplicativo de arquivos (Nautilus) melhorado, um novo
-visualizador de imagens (Loupe), e mais:
-
-@itemize
-@item @url{https://release.gnome.org/47/, Notas de lançamento do GNOME 47}
-@item @url{https://release.gnome.org/48/, Notas de lançamento do GNOME 48}
-@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")
-         (de "@code{%desktop-services} enthält jetzt GDM auf AArch64")
-         (pt "@code{%desktop-services} agora inclui GDM no AArch64"))
-        (body
-         (en "On Guix System in an operating system configuration, your value for the
-@code{services} field is based on @code{%desktop-services} for desktop
-machines.
-
-The @code{%desktop-services} contains a login manager that is
-architecture-dependent.  Previously, GDM has been used on x86_64 and SDDM on
-other architectures.
-
-Now, GDM is used on all 64-bit architectures.  This affects only AArch64 in
-the end, as other 64-bit architectures aren't mature enough to use
-%desktop-services, yet.
-
-In case you're on AArch64 and you've changed the login manager, you will have
-to adapt your config to remove @code{gdm-service-type} instead of
-@code{sddm-service-type}.")
-         (de "Auf Guix System liegen in einer Betriebssystemkonfiguration Ihrem
-Wert des @code{services}-Feldes auf Desktop-Maschinen die
-@code{%desktop-services} zugrunde.
-
-Zu den @code{%desktop-services} gehört eine Anmeldeverwaltung, die sich je nach
-Architektur unterscheidet. Bisher wurde GDM auf x86_64 benutzt und SDDM auf
-anderen Architekturen.
-
-Ab jetzt wird GDM auf allen 64-Bit-Architekturen benutzt. Das betrifft
-letztlich nur AArch64, weil andere 64-Bit-Architecturen bisher noch nicht weit
-genug fortgeschritten sind, um die %desktop-services zu benutzen.
-
-Falls Sie auf AArch64 sind und die Anmeldeverwaltung geändert haben, müssen Sie
-Ihre Konfiguration ändern und dort @code{gdm-service-type} entfernen statt
-@code{sddm-service-type}.")
-         (pt "Em uma configuração de sistema operacional do Guix System, seu
-valor para o campo @code{services} é baseado em @code{%desktop-services} para
-máquinas desktop.
-
-@code{%desktop-services} contém um gerenciador de login dependente de
-arquitetura.  Anteriormente, GDM fora usado em x86_64 e SDDM nas demais.
-
-Agora, GDM é usado em todas as arquiteturas de 64 bits. Esta mudança afeta
-apenas a AArch64 no frigir dos ovos, dado que as demais arquiteturas de 64
-bits não são maduras o bastante para usar @code{%desktop-services}, por
-enquanto.
-
-No caso de você estar em um AArch64 e ter modificado o gerenciador de login,
-você terá que adaptar sua configuração para remover @code{gdm-service-type} em
-vez de @code{sddm-service-type}.")))
-
 (entry (commit "d3b79beaa806452dceaffb8b211b69dc4c346aba")
        (title
         (en "Linux-libre 5.4 no longer supported")
@@ -33,7 +33,7 @@
                                          "node-build-system"
                                          "ocaml-build-system"
                                          "perl-build-system"
-                                          "pyproject-build-system"
+                                          "python-build-system"
                                          "qt-build-system"
                                          "r-build-system"
                                          "rakudo-build-system"
@@ -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.
@@ -92,7 +92,7 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@"
  (email   person-email)
  (account person-codeberg-account))

-(define (person name email account)
+(define* (person name #:optional email account)
  (make-person name email account))

 (define* (team id #:key name description (members '())
@@ -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"
@@ -530,19 +505,11 @@ of Rebar and Mix build systems and Hex.pm importer."
                      "gnu/packages/ninja.scm"
                      "gnu/packages/valgrind.scm")))

-(define-team community
-  (team 'community
-        #:name "Community"
-        #:description
-        "We focus on collaboration, project growth and future (social)
-challenges"))
-
 (define-team core
  (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"
@@ -602,7 +569,6 @@ challenges"))
              "guix/read-print.scm"
              "guix/records.scm"
              "guix/remote.scm"
-              "guix/remote-procedures.scm"
              "guix/repl.scm"
              "guix/search-paths.scm"
              "guix/self.scm"
@@ -664,7 +630,6 @@ challenges"))
        #:name "Electronics team"
        #:description "Electronics and hardware related packages."
        #:scope (list "gnu/packages/electronics.scm"
-                      "gnu/packages/hdl.scm"
                      "gnu/packages/libftdi.scm"
                      "gnu/packages/engineering.scm"
                      "gnu/packages/flashing-tools.scm")))
@@ -701,8 +666,6 @@ ecosystem."
                      "gnu/packages/luanti.scm"
                      "gnu/packages/esolangs.scm" ; granted, rather niche
                      "gnu/packages/motti.scm"
-                      "gnu/services/games.scm"
-                      "gnu/tests/games.scm"
                      "guix/build/luanti-build-system.scm")))

 (define-team gnome
@@ -716,7 +679,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"
@@ -736,17 +698,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"
@@ -788,11 +739,7 @@ the haskell-build-system."
        #:description "High-performance computing (HPC) related packages."
        #:scope (list "gnu/packages/mpi.scm"
                      "gnu/packages/oneapi.scm"
-                      "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")))
@@ -819,20 +766,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
@@ -894,26 +837,12 @@ 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"
        #:description "LXQt desktop environment."
        #:scope (list "gnu/packages/lxqt.scm")))

-(define-team mate
-  (team 'mate
-        #:name "MATE team"
-        #:description "MATE desktop environment"
-        #:scope (list "gnu/packages/mate.scm")))
-
 (define-team mentors
  (team 'mentors
        #:name "Mentors"
@@ -949,21 +878,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"
@@ -975,32 +889,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
@@ -1057,7 +952,7 @@ release."
 (define-team ruby
  (team 'ruby
        #:name "Ruby team"
-        #:scope (list (make-regexp* "^gnu/packages/(ruby)(-.+|)\\.scm$")
+        #:scope (list "gnu/packages/ruby.scm"
                      "guix/build/ruby-build-system.scm"
                      "guix/build-system/ruby.scm"
                      "guix/import/gem.scm"
@@ -1083,15 +978,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
@@ -1107,7 +999,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")))

@@ -1130,7 +1021,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"
@@ -1149,26 +1040,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
@@ -1204,20 +1076,6 @@ the \"texlive\" importer."
        #:scope (list "etc/news.scm"
                      (make-regexp* "^po/"))))

-(define-team vcs
-  (team 'vcs
-        #:name "Version control team"
-        #:description
-        "Version control packages, services, and Guix download backends."
-        #:scope (list "gnu/packages/version-control.scm"
-                      "gnu/services/version-control.scm"
-                      "gnu/tests/version-control.scm"
-                      "guix/build/bzr.scm"
-                      "guix/build/cvs.scm"
-                      "guix/build/git.scm"
-                      "guix/build/hg.scm"
-                      "guix/build/svn.scm")))
-
 (define-team xfce
  (team 'xfce
        #:name "Xfce team"
@@ -1248,12 +1106,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"
@@ -1313,7 +1171,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"
@@ -1330,11 +1188,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")
@@ -1345,6 +1198,10 @@ the \"texlive\" importer."
                       "jpoiret")
  installer)

+(define-member (person "("
+                       "paren@disroot.org")
+  )
+
 (define-member (person "Simon Tournier"
                       "zimon.toutoune@gmail.com"
                       "zimoun")
@@ -1358,7 +1215,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"
@@ -1373,17 +1230,17 @@ 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"
                       "gabber")
-  audio community documentation electronics embedded)
+  audio documentation electronics embedded)

 (define-member (person "Ekaitz Zarraga"
                       "ekaitz@elenq.tech"
@@ -1405,16 +1262,19 @@ the \"texlive\" importer."
                       "Hellseher")
  go julia python science sysadmin)

-(define-member (person "Arthur Rodrigues"
-                       "arthurhdrodrigues@proton.me"
-                       "arthurhdrodrigues")
-  go)
+(define-member (person "Vivien Kraus"
+                       "vivien@planete-kraus.eu")
+  gnome)

 (define-member (person "Mark H Weaver"
                       "mhw@netris.org"
                       "mhw")
  mozilla)

+(define-member (person "Adam Faiz"
+                       "adam.faiz@disroot.org")
+  games)
+
 (define-member (person "Laurent Gatto"
                       "lgatto@protonmail.ch"
                       "lgatto")
@@ -1433,7 +1293,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"
@@ -1443,7 +1303,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"
@@ -1458,7 +1318,7 @@ the \"texlive\" importer."
 (define-member (person "Cayetano Santos"
                       "csantosb@inventati.org"
                       "csantosb")
-  ai emacs electronics hpc crypto reproduciblebuilds)
+  ai emacs electronics hpc crypto)

 (define-member (person "Greg Hogan"
                       "code@greghogan.com"
@@ -1479,6 +1339,10 @@ the \"texlive\" importer."
                       "Ashvith")
  games go javascript sysadmin xfce)

+(define-member (person "Trevor Richards"
+                       "trev@trevdev.ca")
+  lisp emacs)
+
 (define-member (person "Konrad Hinsen"
                       "guix@khinsen.fastmail.net"
                       "khinsen")
@@ -1512,12 +1376,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"
@@ -1552,98 +1411,13 @@ the \"texlive\" importer."
 (define-member (person "Nguyễn Gia Phong"
                       "cnx@loang.net"
                       "cnx")
-  build-tools python qa-packages sysadmin vcs)
+  python)

 (define-member (person "Lilah Tascheter"
                       "lilah@lunabee.space"
                       "tinystar")
  hare)

-(define-member (person "FuncProgLinux"
-                       "softwarelibre@urutau-ltd.org"
-                       "FuncProgLinux")
-  mate)
-
-(define-member (person "Reza Housseini"
-                       "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")
-  community 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-member (person "Thanos Apollo"
-                       "public@thanosapollo.org"
-                       "thanosapollo")
-  vcs)
-
-(define-member (person "Ashish SHUKLA"
-                       "ashish.is@lostca.se"
-                       "group")
-  vcs)
-
-(define-member (person "Spencer King"
-                       "spencer.king@wustl.edu"
-                       "spencerking")
-  julia)
-
-(define-member (person "Peter Polidoro"
-                       "peter@polidoro.io"
-                       "peterpolidoro")
-  electronics)
-

 (define (find-team name)
  (or (hash-ref %teams (string->symbol name))
@@ -1833,12 +1607,8 @@ and REV-END, two git revision strings."
 # usually suited as a reviewer.\n\n"
             port)
    (for-each (lambda (team)
-                (let ((scope (team->codeowners-snippet team)))
-                  ;; Some teams, like Mentors and Community have no scope,
-                  ;; which would result in seemingly arbitrary newlines.
-                  (unless (string-null? scope)
-                    (display scope port)
-                    (newline port))))
+                (display (team->codeowners-snippet team) port)
+                (newline port))
              teams)))


@@ -48,7 +48,8 @@
 (define %gnome-releng-versions-uri
  (make-parameter
   (or (getenv "GNOME_RELENG_VERSIONS_URI")
-       "https://gitlab.gnome.org/GNOME/releng/-/raw/master/tools/versions-49")))
+       "https://gitlab.gnome.org/GNOME/releng/-/raw/master/\
+tools/versions-stable")))

 (define (fetch-releng-content)
  "Return a string corresponding to the content of the %GNOME-RELENG-VERSIONS-URI
@@ -72,10 +73,7 @@ C < ':'
 NL < '\n'")

 (define %names
-  '(("adwaita-fonts" . "font-adwaita")
-    ("glycin" . "glycin-loaders")
-    ("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,34 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 FuncProgLinux <softwarelibre@urutau-ltd.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(use-modules (guix packages)
-             (guix profiles)
-             (gnu packages mate)
-             (ice-9 match)
-             (srfi srfi-1))
-
-(define (propagated-inputs package)
-  (map
-   (match-lambda
-     ((_ (? package? pkg)) pkg)
-     ((_ (? package? pkg) output) (list pkg output)))
-   (package-propagated-inputs package)))
-
-(packages->manifest
- (append-map propagated-inputs
-             (list mate)))
@@ -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))
-       '())))
@@ -187,7 +187,7 @@ configuration.scm."
            (package-arguments guix)))))

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

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

 ;;;
@@ -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))
@@ -29,7 +29,7 @@
 ;;; Code:

 (define %artwork-repository
-  (let ((commit "08259679a0faef63e3ba169df5b937d836bd9262"))
+  (let ((commit "4c7f2ce6428a63e202cd2a9474a06f68a946934d"))
    (origin
      (method git-fetch)
      (uri (git-reference
@@ -39,6 +39,6 @@
                                "-checkout"))
      (sha256
       (base32
-        "0anryix0y8w9brksiaz39r8c10vdd0fp4h96b9f3m4aw0xpv8xlf")))))
+        "1rl569759q9wm1dxn7nkq3873d2k92giic7aa6jwzwr3n16prc7y")))))

 ;;; artwork.scm ends here
@@ -2,7 +2,7 @@
 ;;; Copyright © 2017 David Craven <david@craven.ch>
 ;;; Copyright © 2017, 2020, 2022 Mathieu Othacehe <othacehe@gnu.org>
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2019, 2021, 2023, 2025 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz>
 ;;; Copyright © 2022 Reza Alizadeh Majd <r.majd@pantherx.org>
@@ -26,8 +26,7 @@
 (define-module (gnu bootloader)
  #:use-module (gnu system file-systems)
  #:use-module (gnu system uuid)
-  #:autoload   (guix discovery) (fold-module-public-variables)
-  #:autoload   (guix describe) (modules-from-current-profile)
+  #:use-module (guix discovery)
  #:use-module (guix gexp)
  #:use-module (guix profiles)
  #:use-module (guix records)
@@ -306,8 +305,10 @@ instead~%")))

 (define (bootloader-modules)
  "Return the list of bootloader modules."
-  (modules-from-current-profile "gnu/bootloader"
-                                #:warn warn-about-load-error))
+  (all-modules (map (lambda (entry)
+                      `(,entry . "gnu/bootloader"))
+                    %load-path)
+               #:warn warn-about-load-error))

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


 ;;;
@@ -200,33 +147,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 +174,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]*)")
@@ -83,8 +83,7 @@ turn doesn't take any constant overhead into account, force a 1-MiB minimum."
        (label (partition-label partition))
        (uuid (partition-uuid partition)))
    (apply invoke
-           `("unshare" "--map-root-user" "mkfs.btrfs"
-             "-r" ,root
+           `("fakeroot" "mkfs.btrfs" "-r" ,root
             "-L" ,label
             ,@(if uuid
                   `("-U" ,(uuid->string uuid))
@@ -46,26 +46,7 @@
            make-static-device-nodes
            configure-qemu-networking

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

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

-(define-record-type <linux-console>
-  (make-linux-console device can-read? can-write? can-unblank?
-                      enabled? preferred? primary? printk? braille?
-                      safe-when-cpu-offline? major minor virtual?)
-  linux-console?
-  (device linux-console-device)
-  (can-read? linux-console-can-read?)
-  (can-write? linux-console-can-write?)
-  (can-unblank? linux-console-can-unblank?)
-  (enabled? linux-console-enabled?)
-  (preferred? linux-console-preferred?)
-  (primary? linux-console-primary?)
-  (printk? linux-console-printk?)
-  (braille? linux-console-braille?)
-  (safe-when-cpu-offline? linux-console-safe-when-cpu-offline?)
-  (major linux-console-major)
-  (minor linux-console-minor)
-  (virtual? linux-console-virtual?))
-
-(define* (read-linux-consoles #:optional (consoles-file "/proc/consoles"))
-  "Parses CONSOLES-FILE and returns a list of <linux-console> records."
-  (if (not (file-exists? consoles-file))
-      '()
-      (with-input-from-file consoles-file
-        (lambda ()
-          (let ((line-regex (make-regexp
-                             "^([^ ]+)[ ]+(.+)[ ]+([0-9]+):([0-9]+)$"))
-                (virt-regex (make-regexp "^tty[0-9]+$")))
-            (let loop ((line (read-line))
-                       (results '()))
-              (cond
-               ((eof-object? line)
-                (reverse results))
-               ((regexp-exec line-regex line)
-                => (lambda (m)
-                     (let* ((dev      (match:substring m 1))
-                            (flags    (match:substring m 2))
-                            (major    (string->number (match:substring m 3)))
-                            (minor    (string->number (match:substring m 4)))
-                            (virtual? (regexp-exec virt-regex dev))
-                            (has?     (lambda (c)
-                                      (string-any (lambda (f) (char=? f c)) flags))))
-                       (loop (read-line)
-                             (cons (make-linux-console
-                                    dev
-                                    (has? #\R) (has? #\W) (has? #\U) (has? #\E)
-                                    (has? #\C) (has? #\B) (has? #\p) (has? #\b)
-                                    (has? #\a)
-                                    major minor virtual?)
-                                   results)))))
-               (else (loop (read-line) results)))))))))
-
 ;;; linux-boot.scm ends here
@@ -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>
@@ -37,7 +37,7 @@
  #:use-module (guix ui)
  #:use-module ((guix licenses)
                #:select (gpl3+ license? license-name))
-  #:use-module (guix utils)
+  #:use-module ((guix utils) #:select (%current-system))
  #:use-module ((guix scripts system) #:select (read-operating-system))
  #:use-module ((guix scripts pack)
                #:select (self-contained-tarball))
@@ -48,13 +48,9 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages gdb)
-  #:use-module (gnu packages man)
  #:use-module (gnu packages base)
  #:use-module (gnu packages gawk)
-  #:use-module (gnu packages hurd)
-  #:use-module (gnu packages admin)
  #:use-module (gnu packages guile)
-  #:use-module (gnu packages linux)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages multiprecision)
@@ -140,43 +136,19 @@ SYSTEM."
                 #:cross? #t
                 #:target target)))

-(define %core-packages-for-mingw
-  ;; Core packages that can be built for any target, including MinGW.  This
-  ;; excludes the bootstrap tarballs, which do not support MinGW.
-  (list gcc-10 gcc-11 gcc-12 glibc binutils gdb-minimal
-        gmp mpfr mpc coreutils findutils diffutils patch sed grep
-        gawk gnu-gettext hello guile-2.2 guile-3.0 zlib gzip bzip2 xz zstd))
-
 (define %core-packages
-  ;; General set of core packages.
  ;; Note: Don't put the '-final' package variants because (1) that's
  ;; implicit, and (2) they cannot be cross-built (due to the explicit input
  ;; chain.)
-  (append %core-packages-for-mingw
-          (list util-linux procps psmisc which e2fsprogs man-db inetutils
-                guix shepherd
-                %bootstrap-binaries-tarball
-                %binutils-bootstrap-tarball
-                (%glibc-bootstrap-tarball)
-                %gcc-bootstrap-tarball
-                %guile-bootstrap-tarball
-                %bootstrap-tarballs)))
-
-(define %linux-packages
-  ;; Extra Linux-specific packages.
-  (list linux-libre))
-
-(define %hurd-packages
-  ;; Extra Hurd-specific packages
-  (list gnumach mig hurd-minimal hurd netdde rumpkernel))
-
-(define (core-packages system)
-  "Return the 'core' package set suitable for SYSTEM, which might be a system
-type or a GNU triplet."
-  (cond ((target-linux? system) (append %core-packages %linux-packages))
-        ((target-hurd? system) (append %core-packages %hurd-packages))
-        ((target-mingw? system) %core-packages-for-mingw)
-        (else '())))
+  (list gcc-10 gcc-11 gcc-12 glibc binutils gdb-minimal
+        gmp mpfr mpc coreutils findutils diffutils patch sed grep
+        gawk gnu-gettext hello guile-2.2 guile-3.0 zlib gzip xz guix
+        %bootstrap-binaries-tarball
+        %binutils-bootstrap-tarball
+        (%glibc-bootstrap-tarball)
+        %gcc-bootstrap-tarball
+        %guile-bootstrap-tarball
+        %bootstrap-tarballs))

 (define (commencement-packages system)
  "Return the list of bootstrap packages from the commencement module for
@@ -193,7 +165,10 @@ SYSTEM."

 (define (packages-to-cross-build target)
  "Return the list of packages to cross-build for TARGET."
-  (core-packages target))
+  ;; Don't cross-build the bootstrap tarballs for MinGW.
+  (if (string-contains target "mingw")
+      (drop-right %core-packages 6)
+      %core-packages))

 (define %bare-platform-triplets
  ;; Cross-compilation triplets of platforms that lack a proper user-space and
@@ -257,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))

@@ -280,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
@@ -571,8 +544,7 @@ names, for each one of SYSTEMS."
           (map (lambda (package)
                  (package-job store (job-name package)
                               package system))
-                (append (commencement-packages system)
-                        (core-packages system)))
+                (append (commencement-packages system) %core-packages))
           (cross-jobs store system)))
         ('guix
          ;; Build Guix modules only.
@@ -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)
@@ -1,83 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Yarl Baudig <yarl-baudig@mailoo.org>
-
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu home services git-annex-assistant)
-  #:use-module (guix gexp)
-  #:use-module ((guix packages) #:select (package?))
-  #:use-module (guix records)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services shepherd)
-  #:use-module (gnu packages haskell-apps)
-  #:use-module (srfi srfi-1)
-  #:export (home-git-annex-assistant-configuration
-            home-git-annex-assistant-service-type))
-
-(define-configuration/no-serialization home-git-annex-assistant-configuration
-  (package
-    (package git-annex)
-    "Package that provides @code{git-annex}.")
-  (directories
-   (list-of-strings '())
-   "List of directories."))
-
-(define (home-git-annex-assistant-shepherd-services config)
-  (match-record config
-      <home-git-annex-assistant-configuration> (package directories)
-    (let ((gaa-command
-           #~(list (string-append #$package "/bin/git-annex") "assistant")))
-      (map
-       (lambda (dir)
-         (let ((pid-file (in-vicinity dir ".git/annex/daemon.pid")))
-           (shepherd-service
-	     (documentation
-              (string-append "Run git-annex assistant against " dir "."))
-	     (provision
-	      (list
-	       (symbol-append 'home-git-annex-assistant-
-                              (string->symbol dir))))
-	     (start #~(lambda _
-		        (and (zero? (spawn-command #$gaa-command
-					           #:directory #$dir))
-			     (read-pid-file #$pid-file))))
-	     (stop #~(lambda _
-		       (unless (zero? (spawn-command
-				       (append #$gaa-command '("--stop"))
-				       #:directory #$dir))
-		         (error "failed to stop git-annex assistant"))
-		       #f)))))
-       directories))))
-
-(define home-git-annex-assistant-service-type
-  (service-type
-    (name 'git-annex-assistant)
-    (extensions
-     (list (service-extension home-shepherd-service-type
-			      home-git-annex-assistant-shepherd-services)))
-    (compose concatenate)
-    (extend (lambda (config directories)
-              (home-git-annex-assistant-configuration
-               (inherit config)
-               (directories
-                (append
-                 (home-git-annex-assistant-configuration-directories config)
-                 directories)))))
-    (description
-     "Run the git-annex assistant daemon on a list of directories.")))
-
@@ -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.
 ;;;
@@ -118,6 +129,9 @@
 (define (list-of-string-ish? lst)
  (every string-ish? lst))

+(define (list-of-packages? lst)
+  (every package? lst))
+
 (define (bar-position? p)
  (member p '(top bottom)))

@@ -882,13 +896,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 +922,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
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2024,2026 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -168,10 +168,8 @@ or #f.  Return #t on success and #f on failure."
                            (const '())))
         (install-command (append `( "guix" "system" "init"
                                     "--fallback"
-                                     ,@(if (%current-target-system)
-                                           `(,(string-append
-                                               "--target="
-                                               (%current-target-system)))
+                                     ,@(if (target-hurd?)
+                                           '("--target=i586-pc-gnu")
                                           '()))
                                  options
                                  (list (%installer-configuration-file)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,8 +27,7 @@
  str)

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

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

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

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

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

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

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

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

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

 (define (run-services-page)
-  (let ((desktop (run-desktop-environments-cbt-page/maybe)))
+  (let ((desktop (run-desktop-environments-cbt-page)))
    ;; When the user did not select any desktop services, and thus didn't get
    ;; '%desktop-services', offer network management services.
    (append desktop
@@ -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
@@ -195,21 +195,8 @@
 (define (system-services->configuration services)
  "Return the configuration field for SERVICES."
  (let* ((snippets (append-map system-service-snippet services))
+         (packages (append-map system-service-packages services))
         (desktop? (find desktop-system-service? services))
-         (packages
-          (append (append-map system-service-packages services)
-                  (if desktop?
-                      (cons (comment (G_ ";; Fonts to cover all languages.\n"))
-                            (map (lambda (package)
-                                   `(specification->package ,package))
-                                 '("font-google-noto"
-                                   "font-google-noto-emoji"
-                                   ;; FIXME: Selection of fonts depends on the
-                                   ;; locale.  Use a monospaced CJK font with
-                                   ;; latin letters before there's proper fix.
-                                   ;; See <https://codeberg.org/guix/guix/pulls/5654#issuecomment-9928509>
-                                   "font-sarasa-gothic")))
-                      '())))
         (base     (if desktop?
                       (if (target-hurd?)
                           '%desktop-services/hurd
@@ -243,33 +230,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))))))
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012-2026 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024, 2025 Andreas Enge <andreas@enge.fr>
 # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw@netris.org>
@@ -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>
@@ -19,7 +19,7 @@
 # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
 # Copyright © 2018, 2019, 2020, 2021, 2022, 2024, 2025 Oleg Pykhalov <go.wigust@gmail.com>
 # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
-# Copyright © 2018, 2020-2026 Maxim Cournoyer <maxim@guixotic.coop>
+# Copyright © 2018, 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
 # Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv@posteo.net>
 # Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
 # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@@ -35,14 +35,14 @@
 # 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>
 # Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 # Copyright © 2021 Greg Hogan <code@greghogan.com>
 # Copyright © 2021-2024 Philip McGrath <philip@philipmcgrath.com>
-# Copyright © 2021, 2026 Arun Isaac <arunisaac@systemreboot.net>
+# Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 # Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 # Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
 # Copyright © 2021 Andrew Tropin <andrew@trop.in>
@@ -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>
@@ -101,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					\
@@ -113,7 +113,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/home/services/dotfiles.scm		\
  %D%/home/services/symlink-manager.scm		\
  %D%/home/services/fontutils.scm		\
-  %D%/home/services/git-annex-assistant.scm	\
  %D%/home/services/gnome.scm			\
  %D%/home/services/gnupg.scm			\
  %D%/home/services/guix.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,12 +207,12 @@ 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			\
-  %D%/packages/codex.scm				\
+  %D%/packages/cook.scm				\
  %D%/packages/coq.scm				\
  %D%/packages/cpio.scm				\
  %D%/packages/cpp.scm 				\
@@ -306,7 +304,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/freeipmi.scm			\
  %D%/packages/ftp.scm				\
  %D%/packages/fribidi.scm			\
-  %D%/packages/fusion.scm			\
  %D%/packages/gambas.scm			\
  %D%/packages/game-development.scm		\
  %D%/packages/games.scm			\
@@ -315,6 +312,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/gd.scm				\
  %D%/packages/gdb.scm				\
  %D%/packages/genealogy.scm			\
+  %D%/packages/genimage.scm			\
  %D%/packages/geo.scm				\
  %D%/packages/gettext.scm			\
  %D%/packages/ghostscript.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			\
@@ -346,6 +343,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/gperf.scm			\
  %D%/packages/gpodder.scm			\
  %D%/packages/gps.scm				\
+  %D%/packages/graal.scm			\
  %D%/packages/graph.scm			\
  %D%/packages/graphics.scm			\
  %D%/packages/graphviz.scm			\
@@ -370,7 +368,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/haskell-web.scm			\
  %D%/packages/haskell-xyz.scm			\
  %D%/packages/haxe.scm				\
-  %D%/packages/hdl.scm				\
  %D%/packages/heads.scm			\
  %D%/packages/hexedit.scm			\
  %D%/packages/high-availability.scm			\
@@ -380,6 +377,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/i2p.scm				\
  %D%/packages/ibus.scm				\
  %D%/packages/icu4c.scm			\
+  %D%/packages/idris.scm			\
  %D%/packages/idutils.scm			\
  %D%/packages/image.scm			\
  %D%/packages/image-processing.scm	\
@@ -480,6 +478,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/mc.scm				\
  %D%/packages/mcrypt.scm			\
  %D%/packages/medical.scm			\
+  %D%/packages/mercury.scm			\
  %D%/packages/mes.scm				\
  %D%/packages/messaging.scm			\
  %D%/packages/minetest.scm			\
@@ -551,12 +550,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			\
@@ -604,9 +601,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/regex.scm				\
  %D%/packages/robotics.scm			\
  %D%/packages/rocm.scm				\
-  %D%/packages/rocm-apps.scm			\
-  %D%/packages/rocm-libs.scm			\
-  %D%/packages/rocm-tools.scm			\
  %D%/packages/rpc.scm				\
  %D%/packages/rpm.scm				\
  %D%/packages/rrdtool.scm			\
@@ -741,7 +735,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				\
@@ -767,7 +760,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/services/networking.scm			\
  %D%/services/nix.scm				\
  %D%/services/nfs.scm			\
-  %D%/services/opensnitch.scm			\
  %D%/services/pam-mount.scm			\
  %D%/services/power.scm			\
  %D%/services/science.scm			\
@@ -813,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	\
@@ -873,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				\
@@ -981,6 +971,15 @@ 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/aegis-constness-error.patch         	\
+  %D%/packages/patches/aegis-perl-tempdir1.patch           	\
+  %D%/packages/patches/aegis-perl-tempdir2.patch           	\
+  %D%/packages/patches/aegis-test-fixup-1.patch            	\
+  %D%/packages/patches/aegis-test-fixup-2.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	\
@@ -996,6 +995,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/amd-smi-python.patch			\
  %D%/packages/patches/ibus-anthy-fix-tests.patch		\
  %D%/packages/patches/ibus-table-paths.patch			\
+  %D%/packages/patches/anki-mpv-args.patch			\
  %D%/packages/patches/antiword-CVE-2014-8123.patch			\
  %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch	\
  %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch	\
@@ -1005,7 +1005,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	\
@@ -1043,7 +1045,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		\
@@ -1059,12 +1060,10 @@ 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		\
  %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch	\
-  %D%/packages/patches/bmake-run-check-separately.patch	\
  %D%/packages/patches/boolector-find-googletest.patch	\
  %D%/packages/patches/boost-fix-duplicate-definitions-bug.patch	\
  %D%/packages/patches/btanks-scons-python.patch		\
@@ -1079,10 +1078,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			\
@@ -1093,7 +1092,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		\
@@ -1110,7 +1108,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	\
@@ -1124,19 +1121,11 @@ 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/collectd-5.11.0-noinstallvar.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		\
@@ -1154,8 +1143,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/crc32c-unbundle-googletest.patch		\
  %D%/packages/patches/crda-optional-gcrypt.patch		\
  %D%/packages/patches/clucene-contribs-lib.patch               \
-  %D%/packages/patches/cryfs-boost-1.88-fix.patch		\
-  %D%/packages/patches/cryfs-boost-1.89-fix.patch		\
  %D%/packages/patches/csvkit-set-locale-for-tests.patch			\
  %D%/packages/patches/ctranslate2-local-build.patch		\
  %D%/packages/patches/ctune-cmake-disable-git-clone.patch		\
@@ -1180,6 +1167,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/dbacl-icheck-multiple-definitions.patch	\
  %D%/packages/patches/dblatex-inkscape-1.0.patch		\
  %D%/packages/patches/dbus-helper-search-path.patch		\
+  %D%/packages/patches/dbus-c++-gcc-compat.patch		\
+  %D%/packages/patches/dbus-c++-threading-mutex.patch		\
  %D%/packages/patches/ddd-build.patch				\
  %D%/packages/patches/debops-setup-py-avoid-git.patch	\
  %D%/packages/patches/dee-vapi.patch			\
@@ -1187,7 +1176,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/dhclient-script-resolvconf-support.patch \
  %D%/packages/patches/dicedb-remove-init-from-config-subpkg.patch	\
  %D%/packages/patches/directfb-davinci-glibc-228-compat.patch	\
-  %D%/packages/patches/django-compressor-build-with-beautifulsoup-4.14+.patch	\
  %D%/packages/patches/dkimproxy-add-ipv6-support.patch		\
  %D%/packages/patches/doc++-gcc-14.patch			\
  %D%/packages/patches/docbook-utils-documentation-edits.patch	\
@@ -1217,24 +1205,18 @@ 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/e9patch-zydis-4.1-compat.patch		\
-  %D%/packages/patches/efitools-riscv64-support.patch		\
  %D%/packages/patches/efivar-fix-fprint-format.patch		\
-  %D%/packages/patches/elastix-1404.patch			\
  %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch	\
  %D%/packages/patches/einstein-build.patch			\
  %D%/packages/patches/elfutils-tests-ptrace.patch		\
-  %D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch			\
  %D%/packages/patches/elixir-path-length.patch			\
  %D%/packages/patches/elm-ghc9.2.patch	\
-  %D%/packages/patches/exaile-gstreamer-1.28.patch	\
  %D%/packages/patches/python-treelib-remove-python2-compat.patch	\
  %D%/packages/patches/elm-offline-package-registry.patch	\
  %D%/packages/patches/elm-reactor-static-files.patch		\
-  %D%/packages/patches/emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch	\
+  %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch	\
  %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
  %D%/packages/patches/emacs-disable-jit-compilation.patch			\
-  %D%/packages/patches/emacs-doc-toc-shell-commands.patch	\
  %D%/packages/patches/emacs-elisp-autofmt-fix-region-send.patch	\
  %D%/packages/patches/emacs-exec-path.patch			\
  %D%/packages/patches/emacs-fix-scheme-indent-function.patch	\
@@ -1252,7 +1234,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	\
@@ -1263,9 +1248,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/ergodox-firmware-fix-numpad.patch	\
  %D%/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch	\
  %D%/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch	\
-  %D%/packages/patches/erlang-binpp-disable-failing-tests.patch	\
  %D%/packages/patches/erlang-man-path.patch			\
-  %D%/packages/patches/erlang-mochiweb-disable-known-to-fail-tests.patch	\
  %D%/packages/patches/esmini-use-pkgconfig.patch		\
  %D%/packages/patches/esmtp-add-lesmtp.patch		\
  %D%/packages/patches/esound-c99.patch         		\
@@ -1341,11 +1324,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/freeimage-unbundle.patch		\
  %D%/packages/patches/freeimage-CVE-2020-21428.patch		\
  %D%/packages/patches/freeimage-CVE-2020-22524.patch		\
+  %D%/packages/patches/freerdp-3.16.0-rpath.patch		\
  %D%/packages/patches/freesolid-automake.patch			\
  %D%/packages/patches/freesolid-autotools.patch		\
  %D%/packages/patches/freesolid-configure.patch		\
  %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		\
@@ -1373,7 +1356,6 @@ dist_patch_DATA =						\
  %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		\
@@ -1389,6 +1371,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		\
@@ -1433,6 +1416,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/gemmi-fix-pegtl-usage.patch		\
  %D%/packages/patches/gemmi-fix-sajson-types.patch		\
  %D%/packages/patches/gemrb-remove-ifdef-and-externalize-path-setting-to-cmake.patch	\
+  %D%/packages/patches/genimage-mke2fs-test.patch		\
  %D%/packages/patches/geoclue-config.patch			\
  %D%/packages/patches/gettext-libunicode-update.patch		\
  %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch	\
@@ -1483,7 +1467,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	\
@@ -1509,21 +1492,24 @@ dist_patch_DATA =						\
  %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
  %D%/packages/patches/gmp-faulty-test.patch			\
  %D%/packages/patches/gnome-2048-fix-positional-argument.patch	\
-  %D%/packages/patches/gnome-contacts-evolution-compat.patch	\
  %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-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		\
@@ -1533,17 +1519,19 @@ 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			\
  %D%/packages/patches/gpodder-disable-updater.patch		\
+  %D%/packages/patches/graalvm-mx-check-failed-after-join.patch	\
  %D%/packages/patches/grantlee-fix-i586-precision.patch	\
  %D%/packages/patches/grantlee-register-metaenumvariable.patch	\
  %D%/packages/patches/grep-timing-sensitive-test.patch		\
  %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            \
@@ -1551,13 +1539,13 @@ dist_patch_DATA =						\
  %D%/packages/patches/guile-default-utf8.patch			\
  %D%/packages/patches/guile-2.2-default-utf8.patch		\
  %D%/packages/patches/guile-relocatable.patch			\
-  %D%/packages/patches/guile-3.0.11-cross-compilation.patch	\
  %D%/packages/patches/guile-3.0-relocatable.patch		\
  %D%/packages/patches/guile-linux-syscalls.patch		\
  %D%/packages/patches/guile-3.0-linux-syscalls.patch		\
  %D%/packages/patches/guile-ac-d-bus-fix-tests.patch		\
  %D%/packages/patches/guile-lib-fix-tests-for-guile2.2.patch		\
  %D%/packages/patches/guile-fibers-cross-build-fix.patch 	\
+  %D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \
  %D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \
  %D%/packages/patches/guile-fibers-fd-finalizer-leak.patch	\
  %D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \
@@ -1583,10 +1571,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			\
@@ -1601,7 +1589,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		\
@@ -1610,8 +1597,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-proc-zombies.patch			\
  %D%/packages/patches/hwloc-1-test-btrfs.patch			\
-  %D%/packages/patches/hwloc-add-with-opencl.patch		\
  %D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch	\
  %D%/packages/patches/i7z-gcc-10.patch				\
  %D%/packages/patches/icecat-adjust-mozilla-desktop.patch      \
@@ -1625,29 +1612,13 @@ dist_patch_DATA =						\
  %D%/packages/patches/icedove-observer-fix.patch               \
  %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch	\
  %D%/packages/patches/icedtea-7-hotspot-pointer-comparison.patch	\
-  %D%/packages/patches/icu4c-20548-dateinterval-timezone.patch	\
-  %D%/packages/patches/icu4c-22132-standardize-vtzone-output.patch	\
-  %D%/packages/patches/icu4c-23069-rosh-hashanah-postponement.patch	\
-  %D%/packages/patches/icu4c-78-double-conversion.patch		\
-  %D%/packages/patches/icu4c-bug-1706949-wasi-workaround.patch	\
-  %D%/packages/patches/icu4c-bug-1790071-ICU-22132-standardize-vtzone-output.patch	\
-  %D%/packages/patches/icu4c-bug-1856290-ICU-20548-dateinterval-timezone.patch	\
-  %D%/packages/patches/icu4c-bug-1954138-dtitvfmt-adopt-calendar.patch	\
-  %D%/packages/patches/icu4c-bug-1972781-chinese-based-calendar.patch	\
-  %D%/packages/patches/icu4c-bug-2000225-ICU-23264-increase-measure-unit-capacity.patch	\
-  %D%/packages/patches/icu4c-bug-2002735-ICU-23277-coptic-single-era.patch	\
-  %D%/packages/patches/icu4c-dayperiod-fractional-seconds.patch	\
-  %D%/packages/patches/icu4c-double-conversion.patch		\
-  %D%/packages/patches/icu4c-dtitvfmt-adopt-calendar.patch	\
-  %D%/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch	\
  %D%/packages/patches/icu4c-icu-22132-fix-vtimezone.patch	\
-  %D%/packages/patches/icu4c-suppress-warnings.patch		\
-  %D%/packages/patches/icu4c-wasi-workaround.patch		\
+  %D%/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch	\
  %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
  %D%/packages/patches/id3lib-UTF16-writing-bug.patch			\
+  %D%/packages/patches/idris-test-ffi008.patch			\
  %D%/packages/patches/ilmbase-fix-tests.patch			\
  %D%/packages/patches/inferno-fix-crash.patch		\
-  %D%/packages/patches/iniparser-remove-fetchcontent-usage.patch		\
  %D%/packages/patches/inkscape-libxml2.patch		\
  %D%/packages/patches/instead-use-games-path.patch		\
  %D%/packages/patches/intltool-perl-compatibility.patch	\
@@ -1657,7 +1628,11 @@ 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-avutil-link.patch   		\
+  %D%/packages/patches/jami-find-package-avutil.patch		\
+  %D%/packages/patches/jami-libjami-headers-search.patch	\
+  %D%/packages/patches/jami-qwindowkit.patch			\
+  %D%/packages/patches/jami-skip-tests-requiring-internet.patch	\
+  %D%/packages/patches/jami-unbundle-dependencies.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	\
@@ -1667,6 +1642,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch	\
  %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch	\
  %D%/packages/patches/java-commons-collections-fix-java8.patch \
+  %D%/packages/patches/java-commons-lang-fix-dependency.patch \
  %D%/packages/patches/java-guava-remove-annotation-deps.patch \
  %D%/packages/patches/java-jeromq-fix-tests.patch		\
  %D%/packages/patches/java-openjfx-build-jdk_version.patch     \
@@ -1688,6 +1664,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		\
@@ -1701,18 +1679,13 @@ 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/libmaus2-fix-gcc-13-require-include-cstdint.patch	\
-  %D%/packages/patches/libportal-qt-6.9.patch                   \
  %D%/packages/patches/libretro-dolphin-emu-data.patch		\
  %D%/packages/patches/libretro-dolphin-emu-gc-font-tool.patch  \
  %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
  %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch        \
-  %D%/packages/patches/libretranslate-use-flasgger.patch	\
  %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch       \
-  %D%/packages/patches/librewolf-compare-paths.patch		\
  %D%/packages/patches/librewolf-neuter-locale-download.patch	\
  %D%/packages/patches/librewolf-use-system-wide-dir.patch	\
-  %D%/packages/patches/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		\
@@ -1721,10 +1694,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/lightdm-vnc-ipv6.patch			\
  %D%/packages/patches/lightdm-vnc-color-depth.patch		\
  %D%/packages/patches/lightdm-vncserver-check.patch		\
-  %D%/packages/patches/linphone-desktop-cmake-belcard.patch	\
-  %D%/packages/patches/linphone-desktop-cmake-find-modules.patch	\
  %D%/packages/patches/localed-xorg-keyboard.patch		\
-  %D%/packages/patches/lufa-fix-incompatible-cast.patch		\
  %D%/packages/patches/kaldi-ignore-failing-test.patch		\
  %D%/packages/patches/kaldi-openblas-0.3.29-compatibility.patch	\
  %D%/packages/patches/kcontacts-incorrect-country-name.patch	\
@@ -1807,14 +1777,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	\
@@ -1834,7 +1799,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			\
@@ -1848,6 +1812,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	\
@@ -1865,26 +1830,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	\
@@ -1892,8 +1847,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		\
@@ -1925,9 +1878,7 @@ 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		\
  %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
  %D%/packages/patches/mpg321-gcc-10.patch			\
@@ -1976,6 +1927,8 @@ 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-gtest.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	\
@@ -2005,22 +1958,20 @@ 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-nanosleep.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		\
@@ -2055,13 +2006,13 @@ 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			\
  %D%/packages/patches/opentaxsolver-file-browser-fix.patch     \
  %D%/packages/patches/open-zwave-hidapi.patch			\
  %D%/packages/patches/opusfile-CVE-2022-47021.patch		\
+  %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch	\
  %D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
  %D%/packages/patches/orpheus-cast-errors-and-includes.patch	\
  %D%/packages/patches/ots-no-include-missing-file.patch	\
@@ -2071,6 +2022,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			\
@@ -2086,27 +2038,28 @@ 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	\
  %D%/packages/patches/pthreadpool-system-libraries.patch	\
  %D%/packages/patches/python-3.11-fix-tests.patch		\
  %D%/packages/patches/python-3.12-fix-tests.patch		\
-  %D%/packages/patches/python-anyio-unuse-exceptiongroup-in-test.patch	\
+  %D%/packages/patches/python-accupy-use-matplotx.patch		\
+  %D%/packages/patches/python-accupy-fix-use-of-perfplot.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		\
-  %D%/packages/patches/python-daemon-relax-lockfile.patch	\
  %D%/packages/patches/python-docrepr-fix-tests.patch		\
+  %D%/packages/patches/python-feedparser-missing-import.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-matplotlib-fix-legend-loc-best-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	\
@@ -2120,6 +2073,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	\
@@ -2137,14 +2091,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	\
@@ -2232,7 +2185,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	\
@@ -2246,16 +2198,19 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-pytorch-system-libraries.patch	\
  %D%/packages/patches/python-pytorch-without-kineto.patch	\
  %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \
+  %D%/packages/patches/python-scipy-i686.patch 			\
  %D%/packages/patches/python-vaex-core-fix-tsl-use.patch	\
  %D%/packages/patches/python-vega-datasets-remove-la-riots-code.patch	\
  %D%/packages/patches/python-versioneer-guix-support.patch	\
  %D%/packages/patches/python-werkzeug-tests.patch		\
+  %D%/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch	\
  %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	\
  %D%/packages/patches/qrcodegen-cpp-cmake.patch		\
  %D%/packages/patches/qtbase-absolute-runpath.patch		\
  %D%/packages/patches/qtbase-qmake-fix-includedir.patch 	\
@@ -2266,67 +2221,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
  %D%/packages/patches/qtscript-disable-tests.patch		\
  %D%/packages/patches/quagga-reproducible-build.patch          \
-  %D%/packages/patches/quickjs-ng-64-bits-precision-on-i686.patch	\
-  %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/qtwayland-5.15.18-0056-redraw-hidpi.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,12 +2260,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/rlwrap-no-rbgen.patch	\
  %D%/packages/patches/rng-tools-revert-build-randstat.patch	\
  %D%/packages/patches/rocclr-5.6.0-enable-gfx800.patch		\
-  %D%/packages/patches/rochpl-supported-distros.patch		\
  %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch 	\
-  %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	\
@@ -2385,10 +2279,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-core-remove-self-dep.patch	\
-  %D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch	\
-  %D%/packages/patches/rust-codex-0.98.0-test-timeout.patch	\
-  %D%/packages/patches/rust-codex-0.98.0-windows-sandbox-protocol-version.patch	\
  %D%/packages/patches/rust-ring-0.17-ring-core.patch		\
  %D%/packages/patches/rw-igraph-0.10.patch			\
  %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch	\
@@ -2404,8 +2294,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		\
  %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch	\
@@ -2424,6 +2312,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/seq24-rename-mutex.patch			\
  %D%/packages/patches/libsequoia-fix-ffi-Makefile.patch	\
  %D%/packages/patches/libsequoia-remove-store.patch		\
+  %D%/packages/patches/shaderc-for-pcsx2-changes.patch		\
  %D%/packages/patches/shakespeare-spl-fix-grammar.patch		\
  %D%/packages/patches/shared-mime-info-xdgmime-path.patch	\
  %D%/packages/patches/sharutils-CVE-2018-1000097.patch		\
@@ -2442,6 +2331,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/snappy-add-inline-for-GCC.patch		\
  %D%/packages/patches/source-highlight-gcc-compat.patch	\
  %D%/packages/patches/sourcetrail-fix-cmakelists-and-paths.patch		\
+  %D%/packages/patches/softhsm-fix-openssl3-tests.patch		\
  %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \
  %D%/packages/patches/sphinxbase-fix-doxygen.patch		\
  %D%/packages/patches/spice-vdagent-monitor-size-calculation.patch     \
@@ -2471,12 +2361,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		\
@@ -2486,7 +2374,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	\
@@ -2505,18 +2393,22 @@ 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		\
-  %D%/packages/patches/unity-test-set-subdir-correctly.patch		\
-  %D%/packages/patches/unity-test-support-int64.patch		\
  %D%/packages/patches/ungoogled-chromium-extension-search-path.patch	\
  %D%/packages/patches/ungoogled-chromium-RUNPATH.patch		\
  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\
@@ -2563,10 +2455,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			\
@@ -2595,6 +2490,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		\
@@ -2611,14 +2509,13 @@ dist_patch_DATA =						\
  %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch	\
  %D%/packages/patches/xpra-5.0-install_libs.patch              \
  %D%/packages/patches/xpra-5.0-systemd-run.patch              \
-  %D%/packages/patches/xpra-6.4-systemd-run.patch		\
-  %D%/packages/patches/xpra-6.4-install_libs.patch		\
+  %D%/packages/patches/xpra-6.0-systemd-run.patch		\
+  %D%/packages/patches/xpra-6.1-install_libs.patch		\
  %D%/packages/patches/xterm-370-explicit-xcursor.patch		\
  %D%/packages/patches/xygrib-fix-finding-data.patch		\
  %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		\
@@ -152,7 +152,7 @@
      (operating-system
        (inherit os)
        (services
-         (modify-services services
+         (modify-services (operating-system-user-services os)
           (guix-service-type
            config => (guix-configuration
                       (inherit config)
@@ -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
@@ -236,6 +235,50 @@ incorporated.")
    (home-page "https://brltty.app/")
    (license license:lgpl2.1+)))

+(define-public florence
+  (package
+    (name "florence")
+    (version "0.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/florence/florence/" version
+                           "/florence-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "07h9qm22krlwayhzvc391lr23vicw81s48g7rirvx1fj0zyr4aa2"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     `(#:configure-flags (list "--with-xtst"
+                               "--without-docs"
+                               "--with-notification")))
+    (inputs
+     (list libxml2
+           libglade
+           (librsvg-for-system)
+           gstreamer
+           cairo
+           gtk+
+           libxtst
+           libxcomposite
+           libnotify))
+    (native-inputs
+     (list gettext-minimal intltool pkg-config))
+    (home-page "https://florence.sourceforge.net/")
+    (synopsis "Extensible, scalable virtual keyboard for X11")
+    (description
+     "Florence is an extensible scalable virtual keyboard for X11.
+It is useful for people who can't use a real hardware keyboard (for
+example for people with disabilities), but you must be able to use
+a pointing device (as a mouse, a trackball, a touchscreen or opengazer).
+
+Florence stays out of your way when you don't need it: it appears on the
+screen only when you need it.  A timer-based auto-click input method is
+available to help to click.")
+    ;; The documentation is under FDL1.2, but we do not install the
+    ;; documentation.
+    (license license:gpl2+)))
+
 (define-public footswitch
  (let ((commit "e455d6752221b9e9c3818cc304c873b9c2792490")
        (revision "0"))
@@ -48,7 +48,7 @@
 ;;; Copyright © 2021, 2025 muradm <mail@muradm.net>
 ;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
 ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2021-2026 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2021-2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
 ;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@@ -72,17 +72,13 @@
 ;;; Copyright © 2024 nathan <nathan_mail@nborghese.com>
 ;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
 ;;; Copyright © 2024 Roman Scherer <roman@burningswell.com>
-;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;; Copyright © 2025 Dariqq <dariqq@posteo.net>
 ;;; Copyright © 2024 nik gaffney <nik@fo.am>
 ;;; Copyright © 2025 Simon Streit <simon@netpanic.org>
 ;;; 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 +98,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,12 +134,10 @@
  #: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)
  #:use-module (gnu packages file)
-  #:use-module (gnu packages file-systems)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
@@ -227,14 +220,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 +329,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 +364,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
@@ -1085,7 +1074,7 @@ console.")
 (define-public btop
  (package
    (name "btop")
-    (version "1.4.6")
+    (version "1.4.5")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1094,7 +1083,7 @@ console.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1nj58dbv3c0rj8fngldkyrmdmacmjnbg8ch1c07ik97kqnnzd3l7"))))
+                "03dchclmbjphirzqii4m0vyqfd0vw1k8mgpchmr13g3brlfzxd34"))))
    (build-system gnu-build-system)
    (native-inputs (list lowdown))
    (arguments
@@ -2536,7 +2525,7 @@ system administrator.")
    (inputs
     (append (list coreutils zlib)
             (if (target-hurd?)
-                 (list libxcrypt)
+                 '()
                 (list linux-pam))))
    (home-page "https://www.sudo.ws/")
    (synopsis "Run commands as root")
@@ -2608,7 +2597,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 +2605,7 @@ features of sudo with a fraction of the codebase.")
                    version ".tar.gz"))
              (sha256
               (base32
-                "02pwqwdcirnyfmfzrc0xb66qs8gzrpb6905nzcv8w2p3fips0bli"))
+                "0bvvw7bx149a57llzrwzlpggyym84f8jdd4abwsk0f2b2pjpmpr0"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -2711,14 +2700,14 @@ command.")
 (define-public wpa-supplicant
  (package (inherit wpa-supplicant-minimal)
    (name "wpa-supplicant")
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs wpa-supplicant-minimal)
              (prepend dbus)))
    (source (origin
              (inherit (package-source wpa-supplicant-minimal))
              (patches (search-patches
                        "wpa-supplicant-dbus-group-policy.patch"))))
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal)
       ((#:phases phases)
        `(modify-phases ,phases
           (add-after 'configure 'set-config-options
@@ -2750,11 +2739,11 @@ command.")
  (package
    (inherit wpa-supplicant)
    (name "wpa-supplicant-gui")
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs wpa-supplicant)
              (prepend qtbase-5 qtsvg-5 qtwayland-5)))
    (native-inputs
     ;; For icons.
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs wpa-supplicant)
       (prepend imagemagick/stable
                inkscape/pinned)))
    (build-system qt-build-system)
@@ -2930,7 +2919,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 +2928,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))
@@ -3156,25 +3146,20 @@ track changes in important system configuration files.")
 (define-public libcap-ng
  (package
    (name "libcap-ng")
-    (version "0.9")
+    (version "0.8.5")
    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/stevegrubb/libcap-ng")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append
+                    "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-"
+                    version ".tar.gz"))
              (sha256
               (base32
-                "0izrrh2kmhi6dcy5iqcccmx90nwlaqcglhc60sl8n5ds8il14pi8"))))
+                "1zy6ga6cqi6qvy2p3091i8zbillymyv01g6gmapriymx3i6jk99v"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
       (list "--disable-static"
             "--without-python")))
-    (inputs
-     (list libbpf))
-    (native-inputs
-     (list autoconf automake libtool pkg-config))
    (home-page "https://people.redhat.com/sgrubb/libcap-ng/")
    (synopsis "Library for more easily working with POSIX capabilities")
    (description
@@ -3294,10 +3279,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 +3310,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 +3322,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
@@ -3430,7 +3413,7 @@ modules and plugins that extend Ansible.")
 (define-public debops
  (package
    (name "debops")
-    (version "3.2.5")
+    (version "3.2.4")
    (source
     (origin
       (method git-fetch)
@@ -3439,14 +3422,13 @@ modules and plugins that extend Ansible.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "15wfhha2b315i15l40j3sylyvs3mdrfw5awzq4cix51l5jppx8z5"))
+        (base32 "0y7bmrnynbw0hz88shfv301a9fsank2cx86fvb7jx6g6kkbsa9pz"))
       (patches
        (search-patches "debops-setup-py-avoid-git.patch"))))
    (build-system pyproject-build-system)
    (native-inputs (list python-setuptools))
    (inputs
     (list ansible
-           bash-minimal
           encfs
           fuse-2
           util-linux ;; for umount
@@ -3835,15 +3817,8 @@ platform-specific methods.")
                "0y5w8pl91xapi49ih1pw7h48lac201cj7fm89hkklmzi9m2715gx"))))
    (build-system gnu-build-system)
    (arguments
-     (list #:configure-flags
-           #~(list #$@(cond ((target-aarch64?)
-                             '("--with-aarch64"))
-                            ((target-arm32?)
-                             '("--with-arm"))
-                            (else
-                             '()))
-                   "--with-python=no"
-                   "--disable-static")))
+     `(#:configure-flags (list "--with-python=no"
+                               "--disable-static")))
    (inputs
     (list openldap gnutls cyrus-sasl))
    (synopsis "User-space component to the Linux auditing system")
@@ -4083,7 +4058,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))
@@ -4166,6 +4141,39 @@ the status of your battery in the system tray.")
    (home-page "https://github.com/valr/cbatticon")
    (license license:gpl2+)))

+(define-public interrobang
+  (let ((revision "1")
+        (commit "896543735e1c99144765fdbd7b6e6b5afbd8b881"))
+    (package
+      (name "interrobang")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/TrilbyWhite/interrobang")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1n13m70p1hfba5dy3i8hfclbr6k9q3d9dai3dg4jvhdhmxcpjzdf"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f                    ; no tests
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure))         ; no configure script
+         #:make-flags (list (string-append "PREFIX="
+                                           (assoc-ref %outputs "out")))))
+      (inputs
+       (list libx11))
+      (native-inputs
+       (list pkg-config))
+      (synopsis "Scriptable launcher menu")
+      (description "Interrobang is a scriptable launcher menu with a customizable
+shortcut syntax and completion options.")
+      (home-page "https://github.com/TrilbyWhite/interrobang")
+      (license license:gpl3+))))
+
 (define-public pam-hooks
  (package
    (name "pam-hooks")
@@ -4412,7 +4420,7 @@ buffers.")
 (define-public igt-gpu-tools
  (package
    (name "igt-gpu-tools")
-    (version "2.3")
+    (version "1.28")
    (source
     (origin
       (method git-fetch)
@@ -4421,7 +4429,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
@@ -4489,7 +4497,7 @@ you are running, what theme or icon set you are using, etc.")
 (define-public hyfetch
  (package
    (name "hyfetch")
-    (version "2.0.5")
+    (version "2.0.2")
    (source
     (origin
       (method git-fetch)
@@ -4498,11 +4506,12 @@ you are running, what theme or icon set you are using, etc.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1xb0m7mna6mm3gc823c40rfdhnw39afdr3g7kb4cqrc21s7fdd5y"))))
+        (base32 "1h3s8m6csmxj815cpzh30m59132n8drxya0s2lh5ngjkpazgdnv3"))))
    (build-system pyproject-build-system)
    (native-inputs
-     (list python-hatchling
-           python-pytest))
+     (list python-pytest
+           python-setuptools
+           python-wheel))
    (inputs
     (list python-typing-extensions))
    (home-page "https://github.com/hykilpikonna/HyFetch")
@@ -4708,7 +4717,7 @@ information tool.")
 (define-public fastfetch-minimal
  (package
    (name "fastfetch-minimal")
-    (version "2.60.0")
+    (version "2.55.1")
    (source
     (origin
       (method git-fetch)
@@ -4717,13 +4726,10 @@ information tool.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "089577qgxd63zqzd00fz381bfpmj6pwlmy2zfan9r6gbm1jvj4i8"))
+        (base32 "0a2a8rp75nx16gvq0918999hifr2lph8dagpfipmyflaa5awlw54"))
       (modules '((guix build utils)))
       (snippet '(begin
-                   (delete-file-recursively "src/3rdparty")
-                   (substitute* "src/modules/logo/logo.c"
-                     (("\"3rdparty/yyjson/yyjson.h\"")
-                      "<yyjson.h>"))))))
+                   (delete-file-recursively "src/3rdparty")))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -4746,7 +4752,7 @@ system distribution, akin to many similar tools.")
    (inherit fastfetch-minimal)
    (name "fastfetch")
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments fastfetch-minimal)
       ((#:configure-flags flags #~'())
        #~(append #$flags
                  (list  "-DBINARY_LINK_TYPE=dynamic"
@@ -4758,7 +4764,7 @@ system distribution, akin to many similar tools.")
                                        #$(this-package-input "libdrm")
                                        "/share/libdrm/amdgpu.ids"))))))
    (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs fastfetch-minimal)
       (append dbus
               glib
               hwdata
@@ -4767,20 +4773,19 @@ system distribution, akin to many similar tools.")
               libxcb
               mesa
               wayland
-               zlib ;for imagemagick and an #ifdef
-               zfs)))))
+               zlib))))) ;for imagemagick and an #ifdef

 (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))
@@ -4974,7 +4979,7 @@ launch daemons into the relevant nodes.")
                                     ;; Fails to build as c++17.
                                     "CXXFLAGS=-std=c++14 -O2 -g")))
    (inputs
-     (list openmpi munge launchmon libgcrypt zlib))
+     (list openmpi munge launchmon libgcrypt))
    (synopsis "Scalable library loading in HPC environments")
    (description
     "Spindle is a tool for improving the performance of dynamic library and
@@ -5126,135 +5131,41 @@ support forum.  It runs with the @code{/exec} command in most IRC clients.")
 (define-public python-pyudev
  (package
    (name "python-pyudev")
-    (version "0.24.4")
+    (version "0.22.0")
    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/pyudev/pyudev")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1m7xrsazbij5dcmnirn9hq6cwrfmzam5mr3kmvvcgnh24nhm401x"))))
-    (build-system pyproject-build-system)
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pyudev" version))
+        (sha256
+          (base32
+            "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      ;; tests: 46 passed, 36 skipped, 79 deselected, 2 warnings
-      #:test-flags
-      ;; These tests actually try to read /sys/devices:
-      #~(list "-k" (string-join
-                    (list "not  test_action"
-                          "test_action_mock"
-                          "test_ancestors"
-                          "test_anything"
-                          "test_asbool"
-                          "test_asint"
-                          "test_asstring"
-                          "test_attributes"
-                          "test_contains_mock"
-                          "test_deprecated_handler"
-                          "test_device_node"
-                          "test_device_number"
-                          "test_device_ordering"
-                          "test_device_path"
-                          "test_device_sys_name"
-                          "test_driver"
-                          "test_equality"
-                          "test_fake"
-                          "test_fake_monitor"
-                          "test_find_parent_no_devtype_mock"
-                          "test_find_parent_with_devtype_mock"
-                          "test_from_device_file"
-                          "test_from_device_number"
-                          "test_from_device_number_wrong_type"
-                          "test_from_name"
-                          "test_from_name_no_device_in_existing_subsystem"
-                          "test_from_path"
-                          "test_from_path_strips_leading_slash"
-                          "test_from_sys_path"
-                          "test_getitem"
-                          "test_getitem"
-                          "test_getitem_nonexisting"
-                          "test_hash"
-                          "test_inequality"
-                          "test_is_initialized"
-                          "test_is_initialized_mock"
-                          "test_iteration"
-                          "test_iteration_mock"
-                          "test_key_subset"
-                          "test_length"
-                          "test_links"
-                          "test_match"
-                          "test_match_parent"
-                          "test_match_property_bool"
-                          "test_match_subsystem"
-                          "test_match_subsystem_nomatch_complete"
-                          "test_match_subsystem_nomatch_unfulfillable"
-                          "test_name"
-                          "test_non_iterable"
-                          "test_parent"
-                          "test_path"
-                          "test_sequence_number"
-                          "test_subsystem"
-                          "test_sys_number"
-                          "test_sys_path"
-                          "test_tags"
-                          "test_time_since_initialized"
-                          "test_time_since_initialized_mock"
-                          "test_traverse"
-                          "test_type"
-                          "test_unsetitem")
-                    " and not "))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-ctypes-udev
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "src/pyudev/core.py"
-                (("\"udev\"")
-                 (format #f "~s"
-                         (search-input-file inputs "/lib/libudev.so"))))
-              (substitute* "src/pyudev/_ctypeslib/utils.py"
+     `(#:tests? #f ; Tests require /sys
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-ctypes-udev
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((eudev (assoc-ref inputs "eudev")))
+               (substitute* "src/pyudev/core.py"
+                (("'udev'")
+                 (string-append "'" eudev "/lib/libudev.so'")))
+               (substitute* "src/pyudev/_ctypeslib/utils.py"
                ;; Use absolute paths instead of keys.
-                (("= find_library") "= ")))))))
-    (native-inputs
-     (list python-pytest
-           python-setuptools))
+                (("= find_library") "= "))
+               #t))))))
    (inputs
     (list eudev))
+    (propagated-inputs
+     (list python-six))
+    (native-inputs
+     (list python-docutils python-hypothesis python-mock python-pytest
+           python-sphinx))
    (home-page "https://pyudev.readthedocs.io/")
    (synopsis "Python udev binding")
    (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")
@@ -5290,7 +5201,7 @@ cache of unix and unix-like systems.")
 (define-public solaar
  (package
    (name "solaar")
-    (version "1.1.19")
+    (version "1.1.16")
    (source
     (origin
       (method git-fetch)
@@ -5299,11 +5210,10 @@ cache of unix and unix-like systems.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0pq1wy2m84ma0pg5k200f0fhywvx4qa873v8n5pz56ahc4ddcyk7"))))
+        (base32 "1q05pcrl1pr6ls92m5k690qrwqb4nz1lganxvbj9b40w3c6nh5iy"))))
    (build-system pyproject-build-system)
    (native-inputs
-     (list gobject-introspection
-           python-pytest
+     (list python-pytest
           python-pytest-mock
           python-setuptools
           python-typing-extensions
@@ -5311,7 +5221,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
@@ -5677,7 +5587,7 @@ entries, providing commands to add, remove, comment, and search.")
 (define-public nmrpflash
  (package
    (name "nmrpflash")
-    (version "0.9.27")
+    (version "0.9.25")
    (source
     (origin
       (method git-fetch)
@@ -5686,7 +5596,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 "0xqvj52m6rk0gma8saqvp8b4jms9hca8i1v2kb5hcd6miaqgx276"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -5935,11 +5845,6 @@ This program allows you to view and manipulate this EEPROM list.")
         (replace 'configure
           (lambda* (#:key outputs #:allow-other-keys)
             (setenv "CONFIG_SHELL" (which "bash"))
-             (setenv "CFLAGS"
-               (string-append "-g -O2 "
-                              "-Wno-error=implicit-int "
-                              "-Wno-error=implicit-function-declaration "
-                              "-Wno-error=incompatible-pointer-types"))
             (invoke "./configure"
              (string-append "--prefix="
                             (assoc-ref outputs "out"))))))))
@@ -6166,7 +6071,7 @@ then it can be a greeter.")
    (inherit pam-mount)
    (name "greetd-pam-mount")
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments pam-mount)
       ((#:configure-flags flags ''())
        #~(cons* "--with-rundir=/run/greetd" #$flags))
       ((#:phases phases)
@@ -6292,7 +6197,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
@@ -6301,7 +6206,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"
@@ -6738,39 +6643,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")
@@ -6863,14 +6765,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))
@@ -7052,7 +6954,7 @@ network, which causes enabled computers to power on.")
 (define-public witr
  (package
    (name "witr")
-    (version "0.1.7")
+    (version "0.1.1")
    (source
     (origin
       (method git-fetch)
@@ -7061,7 +6963,7 @@ network, which causes enabled computers to power on.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "18xx01lxd5j019gy9jmpms3awv4snlr028w01bfkyfid6hlwxbq2"))))
+        (base32 "016yiwn0b00ynllka6h2w6gk2yjzj5nx2xf26shb0cz4crdwww0d"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -7084,65 +6986,10 @@ 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")
-    (version "1.3.5")
+    (version "1.3.3")
    (source
     (origin
       (method git-fetch)
@@ -7150,7 +6997,7 @@ stored in an SQL database.")
              (url "https://github.com/xboot/xfel")
              (commit (string-append "v" version))))
       (sha256
-        (base32 "1vmb3dr3vplxdxn9i8i4chdnfihb429rakvkqsfccb885ivkkn3b"))
+        (base32 "15xlqkj7lf3xszgfyci32lrwdjhqmmm9clmwlp1qn6hywal3d2p4"))
       (file-name (git-file-name name version))))
    (native-inputs
     (list pkg-config))
@@ -7178,37 +7025,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
@@ -9,7 +9,6 @@
 ;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -73,30 +72,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/")
@@ -140,24 +131,29 @@ read all zbar supported codes.")
 (define-public zint
  (package
    (name "zint")
-    (version "2.16.0")
+    (version "2.15.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                     (url "https://github.com/zint/zint")
-                     (commit version)))
+                    (url "https://github.com/zint/zint")
+                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1zpv9ar1kfjl3bb27jc8hd8601zcda9yv4dz1jhxfhdsg6v4cdg7"))))
-    (build-system cmake-build-system)
+                "0arnpdqspyy3bxafm3lqc020bhwq3vazfnja2fk2s8c7mr9wimgr"))))
+    (build-system qt-build-system)
    (arguments
-     (list #:disallowed-references (list qtbase)
-           #:parallel-tests? #f         ;test suite fails otherwise
-           #:configure-flags #~(list "-DZINT_TEST=ON"
-                                     "-DZINT_UNINSTALL=OFF")))
-    (native-inputs (list pkg-config))
-    (inputs (list libpng))
+     (list #:qtbase qtbase
+           #:parallel-tests? #f
+           #:configure-flags
+           #~(list "-DZINT_QT6=ON"
+                   "-DZINT_TEST=ON"
+                   "-DZINT_UNINSTALL=OFF")))
+    (native-inputs
+     (list pkg-config qttools))
+    (inputs
+     (list libpng
+           qtsvg))
    (synopsis "Barcode encoding library")
    (description "Zint is a suite of programs to allow easy encoding of data in
 any of the wide range of public domain barcode standards and to allow
@@ -165,23 +161,6 @@ integration of this capability into your own programs.")
    (home-page "https://www.zint.org.uk/")
    (license (list license:bsd-3 license:gpl3+))))

-(define-public zint-with-qt
-  (package/inherit zint
-    (name "zint-with-qt")
-    (build-system qt-build-system)
-    (arguments (substitute-keyword-arguments arguments
-                 ((#:disallowed-references references)
-                  (delete qtbase references))
-                 ((#:qtbase _ #f)
-                  qtbase)
-                 ((#:configure-flags flags ''())
-                  #~(cons "-DZINT_QT6=ON" #$flags))))
-    (inputs (modify-inputs inputs
-              ;; The UI library of qttools is linked to; hence it must be used
-              ;; as an input rather than a native input.
-              (append qtsvg qttools)))
-    (synopsis "Barcode encoding library (with graphical user interface)")))
-
 (define-public zxing-cpp
  (package
    (name "zxing-cpp")
@@ -219,6 +198,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 +350,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 +367,8 @@ This package includes the following programs:
           pkg-config
           python-wrapper))
    (inputs
-     (list imagemagick
+     (list dbus
+           imagemagick
           libjpeg-turbo
           perl
           python
@@ -391,13 +393,13 @@ Python as well as GUI widgets for GTK and Qt.")
    (name "zbar-minimal")
    (build-system gnu-build-system)
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments zbar)
       ((#:configure-flags flags)
        #~(cons* "--with-gtk=no" (delete "--with-gtk=auto" #$flags)))
       ((#:disallowed-references _ '())
        (list qtbase gtk+))))
    (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs zbar)
       (delete "gtk+")))))

 (define-public qrcodegen-cpp
@@ -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>
@@ -94,7 +94,6 @@
  #:use-module (guix gexp)
  #:use-module (guix git-download)
  #:use-module (guix hg-download)
-  #:use-module (guix svn-download)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix utils)
@@ -314,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
@@ -322,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))
@@ -558,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
@@ -806,7 +805,7 @@ a C program.")
    (native-inputs
     (list googletest
           pkg-config
-           python-numpy
+           python-numpy-2
           python-wrapper))
    (inputs
     (list fftw
@@ -954,7 +953,7 @@ gnu build version."))))
  (package/inherit fftw
    (name "fftwf")
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments fftw)
       ((#:configure-flags fftw-configure-flags)
        `(cons* "--enable-single"
                ,@(if (string-prefix? "arm" (or (%current-target-system)
@@ -975,7 +974,7 @@ gnu build version."))))
     `(("openmpi" ,openmpi)
       ,@(package-inputs fftw)))
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments fftw)
       ((#:configure-flags cf)
        `(cons "--enable-mpi" ,cf))
       ((#:phases phases '%standard-phases)
@@ -986,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")
@@ -1434,7 +1395,7 @@ features, and more.")
        ;; XXX: Some tests fail, but onnxruntime will move on to the next
        ;; release soon enough.
        (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments eigen)
           ((#:tests? tests? #t)
            #f)))))))

@@ -1462,7 +1423,7 @@ features, and more.")
       ;; XXX: Tests stable_norm_5 and stable_norm_6 are failing due to
       ;; EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE.
       (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments eigen)
          ((#:tests? flag #f) #false)))))))

 (define-public xtensor
@@ -2192,7 +2153,7 @@ and not by the available RAM.")
    (inherit form)
    (name "parform")
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments form)
       ((#:configure-flags flags)
        #~(cons* "--enable-parform=yes" #$flags))
       ((#:phases phases)
@@ -2205,120 +2166,94 @@ and not by the available RAM.")
@code{parform}, a version of FORM parallelized using OpenMPI."))))

 (define-public reduce
-  (let ((revision 7333))
-    (package
-      (name "reduce")
-      (version "2026-03-11")
-      (source (origin
-                (method svn-fetch)
-                (uri (svn-reference
-                       (url "https://svn.code.sf.net/p/reduce-algebra/code/trunk")
-                       (revision revision)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "04n7z6abfpqxgmdc1vpv2yy4qccvyxdp6klld94wr740dv8r49l2"))
-                (modules '((guix build utils)))
-                (patches (search-patches "reduce-unbundle-libffi.patch"))
-                (snippet '(map delete-file-recursively
-                               (append (find-files "csl/generated-c" "\\.img$")
-                                       '("common-lisp"
-                                         "contrib"
-                                         "csl/embedded"
-                                         "csl/new-embedded"
-                                         "csl/support-packages"
-                                         "csl/winbuild"
-                                         "generic/breduce"
-                                         "generic/casefold"
-                                         "generic/emacs"
-                                         "generic/qreduce"
-                                         "generic/rbench"
-                                         "generic/rlsmt"
-                                         "generic/texmacs"
-                                         "jlisp"
-                                         "jslisp"
-                                         "libedit"
-                                         "libraries/asmjit"
-                                         "libraries/C-Quadratic-Sieve"
-                                         "libraries/core-math"
-                                         ;; "libraries/crlibm"
-                                         ;; "libraries/libedit-20140620-3.1"
-                                         "libraries/libedit-20210216-3.1"
-                                         "libraries/libffi"
-                                         "libraries/original"
-                                         ;; "libraries/SoftFloat-3a"
-                                         "libraries/SoftFloat-3e"
-                                         "libraries/webview"
-                                         "libraries/wineditline"
-                                         "macbuild"
-                                         "MacPorts"
-                                         "mac-universal"
-                                         "psl"
-                                         "reduce2"
-                                         "reduce2-2025"
-                                         "vsl"
-                                         "web"
-                                         "winbuild64"
-                                         "windows-config-cache"))))))
-      (build-system gnu-build-system)
-      (arguments
-       (list #:parallel-build? #f
-             #:configure-flags
-             #~(list "--without-autogen"
-                     ;; fix conflict with internal build name determination
-                     "--build="
-                     "--with-csl"
-                     (string-append "CPPFLAGS=-I"
-                                    #$freetype
-                                    "/include/freetype2"))
-             #:make-flags #~(list "csl")
-             #:phases
-             #~(modify-phases %standard-phases
-                 (replace 'check
-                   (lambda* (#:key tests? #:allow-other-keys)
-                     (when tests?
-                       (invoke "scripts/testall.sh" "--csl" "--noregressions"))))
-                 (add-before 'patch-source-shebangs 'autogen
-                   (lambda _
-                     (invoke "sh" "autogen.sh")))
-                 (add-after 'autogen 'fix-version
-                   (lambda _
-                     (substitute* "csl/cslbase/version.h"
-                       (("(#define VERSION_ID )\"\\$Id\\$\"" all def)
-                        (format #f
-                                "~a \"$Id: version.h ~a ~a 00:00:00Z somebody $\""
-                                def #$revision #$version)))))
-                 (add-after 'install 'fix-install
-                   (lambda _
-                     (copy-file "bin/rfcsl"
-                                (string-append #$output "/bin/rfcsl"))
-                     (copy-file "generic/newfront/redfront.1"
-                                (string-append #$output
-                                               "/share/man/man1/rfcsl.1"))
-                     (let ((.desktop-file
-                            "debianbuild/reduce/debian/redcsl.desktop")
-                           (icon "debianbuild/reduce/debian/reduce.png"))
-                       (install-file .desktop-file
-                                     (string-append #$output
-                                                    "/share/applications"))
-                       (install-file icon
-                                     (string-append
-                                      #$output
-                                      "/share/icons/hicolor/32x32/apps")))
-                     (with-directory-excursion #$output
-                       (map (lambda (dir)
-                              (map (lambda (file)
-                                     (chmod file #o444))
-                                   (find-files dir)))
-                            '("share/man/man1" "share/reduce/fonts"))))))))
-      (native-inputs (list autoconf automake libtool which))
-      (inputs
-       ;; bundled libraries: fox (adjusted) editline (adjusted)
-       ;; crlibm softfloat
-       (list freetype libffi libx11 libxext libxft ncurses))
-      (synopsis "Portable general-purpose computer algebra system")
-      (description
-       "REDUCE is a portable general-purpose computer algebra system.  It is a
+  (package
+    (name "reduce")
+    (version "2024-08-12")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/reduce-algebra/snapshot_"
+                    version "/Reduce-svn6860-src.tar.gz"))
+              (sha256
+               (base32
+                "13bij9d4dj96vd5di59skz77s2fihj7awmkx403fvh9rd04ly25z"))
+              (modules '((guix build utils)))
+              (patches (search-patches "reduce-unbundle-libffi.patch"))
+              ;; remove binaries and unnecessary parts
+              ;; to ensure we build from source files only
+              (snippet '(map delete-file-recursively
+                         (append (find-files "csl/generated-c" "\\.img$")
+                          '("psl" "vsl"
+                            "jlisp"
+                            "jslisp"
+                            "libedit"
+                            "macbuild"
+                            "MacPorts"
+                            "mac-universal"
+                            "reduce2"
+                            "winbuild64"
+                            "common-lisp"
+                            "contrib"
+                            "generic/qreduce"
+                            "web/htdocs/images/Thumbs.db")
+                          (find-files "csl"
+                           "^(embedded|new-embedded|winbuild|support-packages)$"
+                           #:directories? #t)
+                          (find-files "libraries"
+                           "^(original|wineditline|libffi|libffi-for-mac)$"
+                           #:directories? #t))))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:parallel-build? #f
+           #:configure-flags
+           #~(list "--without-autogen"
+                   ;; fix conflict with internal build name determination
+                   "--build="
+                   "--with-csl"
+                   (string-append "CPPFLAGS=-I"
+                                  #$freetype
+                                  "/include/freetype2"))
+           #:make-flags #~(list "csl")
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "scripts/testall.sh" "--csl" "--noregressions"))))
+               (add-before 'patch-source-shebangs 'autogen
+                 (lambda _
+                   (invoke "sh" "autogen.sh")))
+               (add-after 'install 'fix-install
+                 (lambda _
+                   (copy-file "bin/rfcsl"
+                              (string-append #$output "/bin/rfcsl"))
+                   (copy-file "generic/newfront/redfront.1"
+                              (string-append #$output
+                                             "/share/man/man1/rfcsl.1"))
+                   (let ((.desktop-file
+                          "debianbuild/reduce/debian/redcsl.desktop")
+                         (icon "debianbuild/reduce/debian/reduce.png"))
+                     (install-file .desktop-file
+                                   (string-append #$output
+                                                  "/share/applications"))
+                     (install-file icon
+                                   (string-append
+                                    #$output
+                                    "/share/icons/hicolor/32x32/apps")))
+                   (with-directory-excursion #$output
+                     (map (lambda (dir)
+                            (map (lambda (file)
+                                   (chmod file #o444))
+                                 (find-files dir)))
+                          '("share/man/man1" "share/reduce/fonts"))))))))
+    (native-inputs (list autoconf automake libtool which))
+    (inputs
+     ;; bundled libraries: fox (adjusted) editline (adjusted)
+     ;; crlibm softfloat
+     (list freetype libffi libx11 libxext libxft ncurses))
+    (synopsis "Portable general-purpose computer algebra system")
+    (description
+     "REDUCE is a portable general-purpose computer algebra system.  It is a
 system for doing scalar, vector and matrix algebra by computer, which also
 supports arbitrary precision numerical approximation and interfaces to
 gnuplot to provide graphics.  It can be used interactively for simple
@@ -2327,9 +2262,9 @@ similar to other modern programming languages.  REDUCE supports alternative
 user interfaces including Run-REDUCE, TeXmacs and GNU Emacs.  This package
 provides the Codemist Standard Lisp (CSL) version of REDUCE.  It uses the
 gnuplot program, if installed, to draw figures.")
-      (home-page "https://reduce-algebra.sourceforge.io/")
-      (license (license:non-copyleft "file://README"
-                                     "See README in the distribution.")))))
+    (home-page "https://reduce-algebra.sourceforge.io/")
+    (license (license:non-copyleft "file://README"
+                                   "See README in the distribution."))))

 (define-public msolve
  (package
@@ -37,7 +37,6 @@
  #:use-module (guix git-download)
  #:use-module (guix build-system android-ndk)
  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
  #:use-module (guix build-system emacs)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
@@ -426,7 +425,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")
@@ -468,17 +467,29 @@ the corresponding @command{rsync} flags.")
  (package
    (name "mkbootimg")
    (version (android-platform-version))
-    (source (android-platform-system-core version))
-    (build-system copy-build-system)
+    (source (origin
+              (inherit (android-platform-system-core version))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:install-plan
-      ''(("mkbootimg/mkbootimg" "bin/")
-         ("mkbootimg/bootimg.h" "include/"))))
-    (inputs (list python-wrapper))
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'enter-source
+           (lambda _ (chdir "mkbootimg") #t))
+         (delete 'configure)
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (include (string-append out "/include")))
+               (install-file "mkbootimg" bin)
+               (install-file "bootimg.h" include)
+               #t))))))
    (home-page "https://developer.android.com/studio/command-line/adb.html")
    (synopsis "Tool to create Android boot images")
-    (description "This package provides a tool to create Android Boot Images.")
+    (description "This package provides a tool to create Android Boot
+Images.")
    (license license:asl2.0)))

 (define-public android-safe-iop
@@ -972,7 +983,7 @@ The standard for the ETC1 texture format can be found at
 (define-public git-repo
  (package
    (name "git-repo")
-    (version "2.60.1")
+    (version "2.4.1")
    (source
     (origin
       (method git-fetch)
@@ -981,90 +992,88 @@ The standard for the ETC1 texture format can be found at
             (commit (string-append "v" version))))
       (file-name (string-append "git-repo-" version "-checkout"))
       (sha256
-        (base32 "1cx1b0zmvnmglyn6kbdifcy6w3gm89z2icw4pykxm0wyasy7sc1c"))))
-    (build-system pyproject-build-system)
+        (base32 "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-flags
-      #~(list
-         ;; XXX: Requires GnuPG.
-         "--deselect=tests/test_wrapper.py::SetupGnuPG::test_full"
-         ;; This is expected, as the package is patched for this.
-         "-k" "not test_fetches_when_stale")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-executable-paths
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (substitute* '("repo" "git_command.py")
-                (("^GIT = 'git'")
-                 (format #f "GIT = '~a'"
-                         (search-input-file inputs "/bin/git"))))
-              (substitute* "git_config.py"
-                ((" command_base = \\['ssh',")
-                 (format #f " command_base = ['~a',"
-                         (search-input-file inputs "/bin/ssh"))))))
-          (add-before 'build 'do-not-self-update
-            (lambda* (#:key outputs #:allow-other-keys)
-              ;; Setting the REPO_MAIN variable to an absolute file name is
-              ;; enough to have _FindRepo return the store main.py file.  The
-              ;; self update mechanism is activated with the call to _Init() in
-              ;; main(), so we bypass it.
-              
-              ;; Ticket requesting upstream to provide a mean to disable the
-              ;; self update mechanism:
-              ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=12407.
-              (let ((repo-main (string-append #$output
-                                              "/share/git-repo/main.py")))
-                (substitute* "repo"
-                  (("^REPO_MAIN = .*")
-                   (format #f "REPO_MAIN = ~s~%" repo-main))
-                  ((" _Init\\(args, gitc_init=\\(cmd ==.*" all)
-                   (string-append "True #" all)))
-                ;; Prevent repo from trying to git describe its version from
-                ;; the (disabled) self updated copy.
-                (substitute* "git_command.py"
-                  (("ver = getattr\\(RepoSourceVersion.*")
-                   (format #f "ver = ~s~%" #$version)))
-                (substitute* "subcmds/version.py"
-                  (("rp_ver = .*")
-                   (format #f "rp_ver = ~s~%" #$version)))
-                ;; Prevent repo from adding its (disabled) self update copy to
-                ;; the list of projects to fetch when using 'repo sync'.
-                (substitute* "subcmds/sync.py"
-                  (("to_fetch\\.extend\\(all_projects\\).*" all)
-                   (string-append "#" all))
-                  (("self\\._Fetch\\(to_fetch")
-                   "self._Fetch(all_projects")
-                  (("_PostRepoFetch\\(rp, opt\\.repo_verify).*" all)
-                   (string-append "pass #" all))))))
-          (delete 'build) ;nothing to build
-          (add-before 'check 'configure-git
-            (lambda _
-              (setenv "HOME" (getcwd))
-              ;; XXX: pytest needs this for conftest to import local modules.
-              (setenv "PYTHONPATH" (getcwd))
-              (invoke "git" "config" "--global" "user.email" "you@example.com")
-              (invoke "git" "config" "--global" "user.name" "Your Name")))
-          (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let* ((bin-dir (string-append #$output "/bin"))
-                     (repo-dir (string-append #$output "/share/"
-                                              #$name)))
-                (mkdir-p bin-dir)
-                (mkdir-p repo-dir)
-                (copy-recursively "." repo-dir)
-                (delete-file-recursively (string-append repo-dir "/tests"))
-                (symlink (string-append repo-dir "/repo")
-                         (string-append bin-dir "/repo"))))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'set-executable-paths
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (git (assoc-ref inputs "git"))
+                    (ssh (assoc-ref inputs "ssh")))
+               (substitute* '("repo" "git_command.py")
+                 (("^GIT = 'git'")
+                  (string-append "GIT = '" git "/bin/git'")))
+               (substitute* "git_config.py"
+                 ((" command_base = \\['ssh',")
+                  (string-append " command_base = ['" ssh "/bin/ssh',")))
+               #t)))
+         (add-before 'build 'do-not-self-update
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Setting the REPO_MAIN variable to an absolute file name is
+             ;; enough to have _FindRepo return the store main.py file.  The
+             ;; self update mechanism is activated with the call to _Init() in
+             ;; main(), so we bypass it.
+
+             ;; Ticket requesting upstream to provide a mean to disable the
+             ;; self update mechanism:
+             ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=12407.
+             (let* ((out (assoc-ref outputs "out"))
+                    (repo-main (string-append out "/share/git-repo/main.py")))
+               (substitute* "repo"
+                 (("^REPO_MAIN = .*")
+                  (format #f "REPO_MAIN = ~s~%" repo-main))
+                 ((" _Init\\(args, gitc_init=\\(cmd ==.*" all)
+                  (string-append "True #" all)))
+               ;; Prevent repo from trying to git describe its version from
+               ;; the (disabled) self updated copy.
+               (substitute* "git_command.py"
+                 (("ver = getattr\\(RepoSourceVersion.*")
+                  (format #f "ver = ~s~%" ,version)))
+               (substitute* "subcmds/version.py"
+                 (("rp_ver = .*")
+                  (format #f "rp_ver = ~s~%" ,version)))
+               ;; Prevent repo from adding its (disabled) self update copy to
+               ;; the list of projects to fetch when using 'repo sync'.
+               (substitute* "subcmds/sync.py"
+                 (("to_fetch\\.extend\\(all_projects\\).*" all)
+                  (string-append "#" all))
+                 (("self\\._Fetch\\(to_fetch")
+                  "self._Fetch(all_projects")
+                 (("_PostRepoFetch\\(rp, opt\\.repo_verify).*" all)
+                  (string-append "#" all))))))
+         (delete 'build) ; nothing to build
+         (add-before 'check 'configure-git
+           (lambda _
+             (setenv "HOME" (getcwd))
+             (invoke "git" "config" "--global" "user.email" "you@example.com")
+             (invoke "git" "config" "--global" "user.name" "Your Name")))
+         (replace 'check
+           (lambda _
+             (invoke "./run_tests")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin-dir (string-append out "/bin"))
+                    (repo-dir (string-append out "/share/" ,name)))
+               (mkdir-p bin-dir)
+               (mkdir-p repo-dir)
+               (copy-recursively "." repo-dir)
+               (delete-file-recursively (string-append repo-dir "/tests"))
+               (symlink (string-append repo-dir "/repo")
+                        (string-append bin-dir "/repo"))
+               #t))))))
    (inputs
     ;; TODO: Add git-remote-persistent-https once it is available in guix
-     (list git openssh))
-    (native-inputs (list python-pytest python-setuptools))
+     `(("git" ,git)
+       ("ssh" ,openssh)))
+    (native-inputs
+     `(("pytest" ,python-pytest)))
    (home-page "https://code.google.com/p/git-repo/")
    (synopsis "Helps to manage many Git repositories")
-    (description
-     "Repo is a tool built on top of Git.  Repo helps manage many Git
-repositories, does the uploads to revision control systems, and automates
+    (description "Repo is a tool built on top of Git.  Repo helps manage many
+Git repositories, does the uploads to revision control systems, and automates
 parts of the development workflow.  Repo is not meant to replace Git, only to
 make it easier to work with Git.  The repo command is an executable Python
 script that you can put anywhere in your path.")
@@ -1077,7 +1086,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 +1177,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
@@ -41,7 +41,7 @@
 (define-public libapparmor
  (package
    (name "libapparmor")
-    (version "4.1.2")
+    (version "3.1.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -50,7 +50,7 @@
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0p3vq0awvn4ar6sblmhcs0i9m7zc9kbwm3f3zcggx4lqgmy8s18b"))))
+                "1h77a7ww0rxfv5nsi1iy4fffklxdr2vq6r7kdsqm15yysglhbjyi"))))
    (build-system gnu-build-system)
    (arguments
     (list #:configure-flags
@@ -84,7 +84,6 @@
                   (chdir "libraries/libapparmor"))))))
    (native-inputs
     (list autoconf
-           autoconf-archive
           automake
           bison
           dejagnu
@@ -93,7 +92,7 @@
           perl
           python-minimal
           ruby
-           swig-4.0
+           swig
           which))
    (home-page "https://apparmor.net")
    (synopsis "Linux kernel security module")
@@ -128,7 +127,7 @@ supported by Canonical since 2009.")
                      "USE_SYSTEM=1"
                      ;; No need to run the linter
                      "PYFLAKES=true"))
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (delete 'configure)
@@ -189,7 +188,7 @@ supported by Canonical since 2009.")
      (arguments
       (append
        (list #:tests? #f)              ;no tests
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (delete 'chdir-parser)
@@ -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.
@@ -172,7 +172,7 @@ engine with a Lua scripting interface.")
    (inherit arcan)
    (name "arcan-sdl")
    (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs arcan)
       (delete "libdrm")
       (prepend glu libglvnd mesa sdl2)))
    (arguments
@@ -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
@@ -464,7 +466,7 @@ European languages.")
                (patches (search-patches "ispell-for-linphone-cmake.patch"))))
      (build-system cmake-build-system)
      (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments ispell)
         ((#:modules _ ''())
          '((guix build cmake-build-system)
            (guix build utils)
@@ -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)
@@ -136,7 +132,6 @@
  #:use-module (gnu packages networking)
  #:use-module (gnu packages ninja)
  #:use-module (gnu packages onc-rpc)
-  #:use-module (gnu packages oneapi)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages pulseaudio)  ;libsndfile, libsamplerate
@@ -156,10 +151,10 @@
  #:use-module (gnu packages serialization)
  #:use-module (gnu packages sphinx)
  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages tbb)
  #:use-module (gnu packages telephony)
  #:use-module (gnu packages tex)
  #:use-module (gnu packages tls)
-  #:use-module (gnu packages toolkits)
  #:use-module (gnu packages valgrind)
  #:use-module (gnu packages version-control)
  #:use-module (gnu packages video)
@@ -816,147 +811,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 +1063,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 +1080,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 +1088,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 +1682,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))
@@ -3083,7 +2938,7 @@ auto-wah.")
  (package (inherit guitarix)
    (name "guitarix-lv2")
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments guitarix)
       ((#:configure-flags flags)
        `(cons "--no-standalone" ,flags))))))

@@ -3286,7 +3141,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 +3281,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 +3373,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/"
@@ -3815,31 +3635,27 @@ cross-platform audio input/output stream library.")
 (define-public python-pulsectl
  (package
    (name "python-pulsectl")
-    (version "24.12.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/mk-fg/python-pulse-control")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1f15w2312j2yc9bs689dvdgq891sjrp5x3q1vf08743px70gxc1m"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f ;tests try to communicate with PulseAudio
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "pulsectl/_pulsectl.py"
-                (("libpulse.so.0")
-                 (search-input-file inputs "/lib/libpulse.so.0"))))))))
-    (native-inputs (list python-setuptools))
+    (version "24.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pulsectl" version))
+              (sha256
+               (base32
+                "0r9igs365cqgrn1m55a8qjz0hc446nwjm3p3i9kphbj5gl7dazk9"))))
+    (build-system python-build-system)
    (inputs (list pulseaudio))
+    (arguments
+     `(#:tests? #f                      ; tests try to communicate with PulseAudio
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "pulsectl/_pulsectl.py"
+               (("libpulse.so.0")
+                (string-append (search-input-file inputs "/lib/libpulse.so.0")))))))))
    (home-page "https://github.com/mk-fg/python-pulse-control")
-    (synopsis "Python bindings for mixer-like controls in PulseAudio")
+    (synopsis
+     "Python bindings for mixer-like controls in PulseAudio")
    (description
     "This package provides a Python high-level interface and ctypes-based
 bindings for PulseAudio (libpulse), to use in simple synchronous code.
@@ -4004,21 +3820,16 @@ one-dimensional sample-rate conversion library.")
    (version "0.2.5")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/NFJones/python3-midi")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "python3_midi" version))
       (sha256
-        (base32 "1zihn7n9dr9jjgkjlpad515hhwh22k94irb21ji793sr5crh5s15"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:tests? #f))         ; XXX: midi module has not been packaged yet.
-    (native-inputs (list python-setuptools))
+        (base32
+         "1z9j1w7mpn3xhkcpxmqm5rvmj6nffb5rf14bv7n3sdh07nf6n7sf"))))
+    (build-system python-build-system)
    (home-page "https://github.com/NFJones/python3-midi")
    (synopsis "Python MIDI API")
-    (description
-     "This package provides a python API to read and write MIDI files.")
+    (description "This package provides a python API to read and write MIDI
+files.")
    (license license:expat)))

 (define-public python-wavefile
@@ -4467,7 +4278,6 @@ the current volume level of PulseAudio or PipeWire using libnotify.")
    (inputs
     (list alsa-lib
           jack-2
-           fmt-9
           ganv
           glibmm
           gtkmm-2
@@ -4509,126 +4319,6 @@ different audio devices such as ALSA or PulseAudio.")
                   (license:non-copyleft
                    "file://src/TPCircularBuffer/README.markdown")))))

-(define-public projectm-eval
-  (package
-    (name "projectm-eval")
-    (version "1.0.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/projectM-visualizer/projectm-eval")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "04m5k6azji0fk3japzd8v4k04affbfpangfw4fgvk3ac5w75872a"))))
-    (build-system cmake-build-system)
-    (native-inputs (list googletest))
-    (home-page "https://github.com/projectM-visualizer/projectm-eval")
-    (synopsis "Re-implementation of the NullSoft Expression Evaluation Library")
-    (description "This is an open-source re-implementation of the NullSoft
-Expression Evaluation Library 2, as used in the Milkdrop music visualizer.")
-    (license license:expat)))
-
-(define-public projectm
-  (package
-    (name "projectm")
-    (version "4.1.6")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/projectM-visualizer/projectm")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0yw1q6zmx2683immxfxn2kxjwwv6xk9m6yja701m4z2brhdx1iw1"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:configure-flags
-      #~(list
-         "-DBUILD_TESTING=ON" "-DENABLE_SDL_UI=OFF" "-DENABLE_SYSTEM_GLM=ON")))
-    (inputs (list mesa projectm-eval))
-    (native-inputs (list googletest glm))
-    (home-page "https://github.com/projectM-visualizer/projectm")
-    (synopsis "Milkdrop-like music visualizer")
-    (description "projectM is an open-source re-implementation of the MilkDrop
-visualizer.  This package contains only the libprojectm library.")
-    (license license:lgpl2.1+)))
-
-(define-public projectm-presets
-  (let ((commit "0180df21f5e0bd39b9060cc5de420ed2f1f9e509")
-        (revision "0"))
-    (package
-      (name "projectm-presets")
-      (version (git-version "0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-            (url "https://github.com/projectM-visualizer/presets-cream-of-the-crop")
-            (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1g64s6v4xbmx0skiy3ag9889adl8rvwahzd7rmrchiwbd1gap771"))))
-      (build-system copy-build-system)
-      (home-page "https://github.com/projectM-visualizer/presets-cream-of-the-crop")
-      (synopsis "Curated selection of ProjectM/Milkdrop presets")
-      (description "A curated selection of 9,795 ProjectM/Milkdrop presets,
-meant to be included in any projectM-based application.")
-      (license license:public-domain))))
-
-(define-public projectm-sdl
-  (let ((source-commit "72e5632897c9d9bef452c679d3cbe8c7b4bb4157")
-        (revision "0"))
-    (package
-      (name "projectm-sdl")
-      (version (git-version "0" revision source-commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-            (url "https://github.com/projectM-visualizer/frontend-sdl-cpp")
-            (commit source-commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "14vsjn589lrcwkz0d4528i33aslqsgh7m17kxj0fyd21pwj5n54l"))
-         (modules '((guix build utils)))
-         ;;There are no icon files to install.
-         (snippet #~(substitute* "install.cmake" (("install_icon.+") "")))))
-      (build-system cmake-build-system)
-      (arguments
-       (list #:tests? #f                ;There are no tests.
-             #:phases
-             #~(modify-phases %standard-phases
-                 (add-after 'unpack 'link-imgui
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     (begin (delete-file-recursively "vendor/imgui")
-                            (symlink (assoc-ref %build-inputs "imgui-source")
-                                     "vendor/imgui")))))
-             #:configure-flags
-             #~(list
-                ;; There are texture repositories from both ProjectM and
-                ;; Milkdrop, but their licensing is unclear, so they are not
-                ;; packaged.  ProjectM functions fine with only presets.
-                (string-append "-DDEFAULT_PRESETS_PATH="
-                               (assoc-ref %build-inputs "projectm-presets"))
-                ;; The config location search path can be changed, but the
-                ;; install path stays the same, so only this value works.
-                ;; And without it, only the binary's path is checked.
-                (string-append "-DDEFAULT_CONFIG_PATH="
-                               #$output "/share/projectMSDL/"))))
-      (inputs (list freetype poco projectm projectm-presets sdl2))
-      (native-inputs (list `("imgui-source" ,(package-source imgui))))
-      (home-page "https://github.com/projectM-visualizer/frontend-sdl-cpp")
-      (synopsis "Reference frontend for the libprojectm music visualizer")
-      (description "This is a simple Milkdrop-like music visualizer that uses
-the projectM library to visualize audio input.")
-      (license license:gpl3+)))) ;presets
-
 (define-public qjackctl
  (package
    (name "qjackctl")
@@ -4916,18 +4606,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))
@@ -5258,7 +4937,7 @@ stretching and pitch scaling of audio.  This package contains the library.")
          (base32
           "11srnzgpavcj6n70zjdm7488jzrprk71mg9dgr1sa6vwp575hf2m"))))
      (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments libsbsms)
         ((#:phases phases)
          #~(modify-phases #$phases
              (delete 'fix-ar-lib-path)
@@ -6203,56 +5882,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"))
@@ -6869,7 +6498,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
@@ -6878,7 +6507,7 @@ bluetooth profile.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "16nn5bnl27s4hr7vmhmjvh6i6abz6484hwypib49j4vadgdayyhn"))))
+                "0m6a0g6y464ypcza1wfaik77x26lfdmkb5k735f7v8463r7qhd0m"))))
    (build-system cmake-build-system)
    (inputs
     (list alsa-lib
@@ -7283,7 +6912,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
@@ -7561,7 +7190,7 @@ minimum.")
    (arguments
     (list #:configure-flags '(list "-Denable_rsvg=true")))
    (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs ztoolkit)
       (prepend (librsvg-for-system))))
    (synopsis "ZToolkit with SVG support")))

@@ -7663,20 +7292,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")
@@ -7688,8 +7303,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"))))
@@ -8120,7 +7735,7 @@ and DSD streams.")
 (define-public qpwgraph
  (package
    (name "qpwgraph")
-    (version "0.9.9")
+    (version "0.9.7")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -8129,7 +7744,7 @@ and DSD streams.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "03001pvcbvr206k00751232gm50x1icf086z8c5hiakl2ym79gwl"))))
+                "1j3na9svy0rvz84rl9g2szl3rqxfyi5rqk1i12hdiwnyi6q7ppxi"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f))                ; no tests
@@ -8209,6 +7824,33 @@ but it also helps for other programs.  It offers a patchbay for visualizing
 and editing connections.")
    (license license:gpl2+)))

+(define-public streamripper
+  (package
+    (name "streamripper")
+    (version "1.64.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://sourceforge.net/projects/streamripper"
+                           "/files/streamripper%20(current)/"
+                           version "/streamripper-" version ".tar.gz"))
+       (sha256
+        (base32 "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Delete bundled copy of libmad.
+        '(delete-file-recursively "libmad-0.15.1b"))))
+    (build-system gnu-build-system)
+    (native-inputs (list pkg-config))
+    (inputs (list faad2 glib libmad libvorbis))
+    (home-page "https://streamripper.sourceforge.net")
+    (synopsis "Record audio streams to your hard drive")
+    (description "Streamripper records shoutcast-compatible
+streams.  For shoutcast style streams it finds the “meta data” or track
+separation data, and uses that as a marker for where the track should
+be separated.")
+    (license license:gpl2+)))
+
 (define-public cubeb
  (let ((commit "9e29d728b0025c674904f83f5a13a88d1a6a5edc")
        (revision "1"))
@@ -8311,7 +7953,7 @@ verifies checksums.")
           pipewire
           rnnoise
           speexdsp
-           onetbb
+           tbb
           zita-convolver
           soundtouch))
    ;; Propagating these allows EasyEffects to find the plugins via their
@@ -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
@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'ert)

 (eval-when-compile
@@ -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)
@@ -4,7 +4,6 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,7 +40,6 @@
  #:use-module (gnu packages elf)
  #:use-module (gnu packages gl)
  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages libusb)
  #:use-module (gnu packages llvm)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages version-control)
@@ -125,8 +123,7 @@ multipart HEX files.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0ylr7qsiikcy827k18zj1vdzf0kb8hb0gjmifd75y8krkhhar49g"))
-              (patches (search-patches "lufa-fix-incompatible-cast.patch"))))
+                "0ylr7qsiikcy827k18zj1vdzf0kb8hb0gjmifd75y8krkhhar49g"))))
    (outputs '("bootloaders" "demos" "projects" "doc"))
    (build-system gnu-build-system)
    (arguments
@@ -196,31 +193,6 @@ compatible microcontroller models, as well as the demos and the
 documentation.")
    (license license:expat)))           ;see LUFA/License.txt

-(define-public lufa-hid-bootloader-cli
-  (package
-    (inherit lufa)
-    (name "lufa-hid-bootloader-cli")
-    (build-system gnu-build-system)
-    (outputs '("out"))
-    (arguments
-     (list #:tests? #f ;; no tests
-           #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
-                                "-C" "Bootloaders/HID/HostLoaderApp")
-           #:phases
-           #~(modify-phases %standard-phases
-               (delete 'configure)
-               (replace 'install
-                 (lambda _
-                   (install-file "Bootloaders/HID/HostLoaderApp/hid_bootloader_cli"
-                                 (string-append #$output "/bin")))))))
-    (inputs
-     (list libusb-compat))
-    (synopsis "Firmware uploader for the LUFA HID bootloader")
-    (description
-     "The LUFA HID loader program communicates with the LUFA HID bootloader to
-upload new firmware.")
-    (license license:gpl3)))
-
 (define-public microscheme
  (package
    (name "microscheme")
@@ -60,7 +60,7 @@
      (inherit xgcc)
      (name "avr-gcc")
      (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments xgcc)
         ((#:phases phases)
          #~(modify-phases #$phases
              (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH
@@ -21,7 +21,7 @@
 ;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
-;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2022 Feng Shu <tumashu@163.com>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
@@ -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)
@@ -140,7 +140,7 @@
           tzdata-for-tests
           python-mock))
    (propagated-inputs
-     (list python-pygobject python-urllib3))
+     (list python-lockfile python-pygobject python-urllib3))
    (inputs
     (list bash-minimal ; to run the wrapped program
           dbus ; dbus-launch (Gio backend)
@@ -357,62 +357,6 @@ random access nor for in-place modification.  This package provides the
@command{bsdcat}, @command{bsdcpio} and @command{bsdtar} commands.")
    (license license:bsd-2)))

-;;; TODO: core update (20k rebuilds).
-(define-public libarchive-next
-  (package
-    (inherit libarchive)
-    (name "libarchive")
-    (version "3.8.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append "https://libarchive.org/downloads/libarchive-"
-                                 version ".tar.xz")
-                  (string-append "https://github.com/libarchive/libarchive"
-                                 "/releases/download/v" version "/libarchive-"
-                                 version ".tar.xz")))
-       (sha256
-        (base32
-         "0wxdr7qws1z1b1gp5jsm7n2ccnjlmrnds52d5wc5xkzagyslgf67"))))
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (delete 'patch-pwd)
-            (add-before 'build 'patch-commands
-              (lambda _
-                (substitute* "Makefile"
-                  (("/bin/pwd") (which "pwd")))
-                (substitute* "test_utils/test_main.c"
-                  (("/bin/sh") (which "sh")))))
-            (replace 'check
-              (lambda* (#:key parallel-build? tests? #:allow-other-keys)
-                (if tests?
-                    (begin
-                      ;; These environment variables are taken from
-                      ;; <https://raw.githubusercontent.com/libarchive/libarchive/refs/heads/master/.github/workflows/ci.yml>
-                      (setenv "SKIP_OPEN_FD_ERR_TEST" "1")
-                      (setenv "IGNORE_TRAVERSALS_TEST4" "1")
-
-		      ;; XXX: The test_owner_parse, test_read_disk, and
-		      ;; test_write_disk_lookup tests expect user 'root' to
-		      ;; exist, but the chroot's /etc/passwd doesn't have it
-		      ;; (see:
-		      ;; <https://github.com/libarchive/libarchive/issues/2794>).
-		      (invoke "make" "-j" (number->string
-                                           (if parallel-build?
-                                               (parallel-job-count)
-                                               1))
-			      "libarchive_test"
-			      "bsdcpio_test"
-			      "bsdtar_test")
-		      ;; XXX: This glob disables too much.
-		      (invoke "./libarchive_test" "^test_*_disk*")
-		      (invoke "./bsdcpio_test" "^test_owner_parse")
-		      (invoke "./bsdtar_test"))
-                    ;; Tests may be disabled if cross-compiling.
-                    (format #t "Test suite not run.~%"))))))))))
-
 (define-public rdup
  (package
    (name "rdup")
@@ -1190,7 +1134,7 @@ additional snapshots).")
 (define-public burp
  (package
    (name "burp")
-    (version "3.2.0")
+    (version "2.3.38")
    (source
     (origin
       (method git-fetch)
@@ -1198,23 +1142,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 +1209,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 +1220,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 +1269,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 +1279,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 +1304,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 +1316,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>
 ;;;
@@ -99,14 +99,14 @@
 (define-public hello
  (package
    (name "hello")
-    (version "2.12.3")
+    (version "2.12.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/hello/hello-" version
                                  ".tar.gz"))
              (sha256
               (base32
-                "183a6rxnhixiyykd7qis0y9g9cfqhpkk872a245y3zl28can0pqd"))))
+                "1aqq1379syjckf0wdn9vs6wfbapnj9zfikhiykf29k4jq9nrk6js"))))
    (build-system gnu-build-system)
    (synopsis "Example GNU package")
    (description
@@ -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"
@@ -602,7 +619,7 @@ standard.")
                (base32
                 "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"))))
     (arguments
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments coreutils-minimal)
        ((#:phases phases '%standard-phases)
         `(modify-phases ,phases
            (add-before 'check 'disable-broken-test
@@ -756,7 +773,7 @@ included.")
               "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"))
             (patches '())))
   (arguments
-    (substitute-keyword-arguments arguments
+    (substitute-keyword-arguments (package-arguments binutils)
      ((#:make-flags _ #~'()) #~'())))
   (native-inputs '())
   (properties '())))
@@ -774,7 +791,7 @@ included.")
       (sha256
        (base32 "1j64m2czn9ygd5g1cjjcw7q43b18xh6qkrdl1pkm03ncjnj3wwrl"))))
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments binutils)
       ((#:configure-flags flags)
        #~(cons* "--enable-gold=default"
                 (delete "LDFLAGS=-static-libgcc" #$flags)))
@@ -792,7 +809,7 @@ included.")
                         (substitute* "gold/Makefile.in"
                           ((" testsuite") " ")))))
                  #~())))))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs binutils)
                     (append bc)))))

 (define-public libbfd
@@ -802,7 +819,7 @@ included.")
     (modify-inputs (package-native-inputs binutils)
       (append texinfo))) ; because makeinfo is needed when building bfd alone
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments binutils)
       ;; Only build as a shared library
       ((#:configure-flags flags)
        #~(append #$flags '("--enable-shared" "--disable-static")))
@@ -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
@@ -1295,7 +1300,7 @@ with the Linux kernel.")
                                       "glibc-hurd-mach-print.patch"
                                       "glibc-hurd-gettyent.patch"))))
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments glibc)
       ((#:configure-flags flags #~'())
        #~(cons* "CFLAGS=-g -O2 -Wno-error=builtin-declaration-mismatch"
                 "--enable-crypt"
@@ -1315,7 +1320,7 @@ with the Linux kernel.")

 (define-public glibc-2.33
  (package
-    (inherit glibc)
+    (inherit glibc-2.35)
    (name "glibc")
    (version "2.33")
    (source (origin
@@ -1335,7 +1340,7 @@ with the Linux kernel.")
                                  "glibc-hurd-clock_gettime_monotonic.patch")))
                             (origin-patches (package-source glibc-2.35)))))))
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments glibc)
       ((#:configure-flags flags #~'())
        #~(cons* #$(string-append
                    "CFLAGS=-g -O2"
@@ -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)))
@@ -1747,7 +1748,7 @@ and daylight-saving rules.")
  (hidden-package
    (package/inherit tzdata
      (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments tzdata)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'post-install 'install-leap-seconds
@@ -287,7 +287,7 @@ without modification.")
    (outputs (delete "include" (package-outputs bash)))

    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments bash)
       ((#:modules _ '())
        '((guix build gnu-build-system)
          (guix build utils)
@@ -351,7 +351,7 @@ without modification.")
  (package/inherit bash
    (name "bash-with-syslog")
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments bash)
       ((#:phases phases '%standard-phases)
        `(modify-phases ,phases
           (add-after 'unpack 'enable-syslogging
@@ -117,7 +117,7 @@ C or C++ programs, though that is not its primary goal.")
  (package/inherit
   libgc
   (arguments
-    (substitute-keyword-arguments arguments
+    (substitute-keyword-arguments (package-arguments libgc)
      ((#:configure-flags flags #~'())
       #~(cons "--enable-static" #$flags))))

@@ -141,7 +141,7 @@ C or C++ programs, though that is not its primary goal.")
    libgc
    (name "libgc-back-pointers")
    (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments libgc)
       ((#:make-flags _ #~'())
        #~(list "CPPFLAGS=-DKEEP_BACK_PTRS=1"))))
    (synopsis "The BDW garbage collector, with back-pointer tracking")))
@@ -5,7 +5,7 @@
 ;;; Copyright © 2018, 2019, 2025 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
-;;; Copyright © 2019, 2021, 2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com>
 ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
@@ -14,7 +14,6 @@
 ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
-;;; Copyright © 2023 Advanced Micro Devices, Inc.
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,7 +37,6 @@
  #:use-module (guix gexp)
  #:use-module (guix utils)
  #:use-module (guix git-download)
-  #:use-module (guix amd-gpu)
  #:use-module (guix search-paths)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
@@ -50,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)
@@ -64,7 +61,6 @@
  #:use-module (gnu packages kde-frameworks)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages lua)
-  #:use-module (gnu packages llvm)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages mpi)
  #:use-module (gnu packages opencl)
@@ -79,9 +75,7 @@
  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages qt)
-  #:use-module (gnu packages rocm)
  #: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))
@@ -282,22 +276,8 @@ tests.")
                "03lg8rz2a9wgwn9axd6gkjiswgxmp62fbxjvrrcvazmwh6ykplx8"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list perl))
-    (arguments
-     (list
-       #:make-flags #~(list "MORECFLAGS=-std=c++11")
-       #:phases
-       #~(modify-phases %standard-phases
-           (replace 'check
-             (lambda* (#:key tests? #:allow-other-keys)
-               (when tests?
-                 (begin
-                   ;; As seen in ./debian/tests/smoke
-                   (mkdir "test-dir")
-                   (invoke "./bonnie++" "-q"
-                           "-d" "test-dir"
-                           "-s" "-0"
-                           "-n" "1"))))))))
+     (list gcc-10 perl))
+    (arguments '(#:tests? #f)) ; there are no tests
    (home-page "https://doc.coker.com.au/projects/bonnie/")
    (synopsis "Hard drive and file system benchmark suite")
    (description
@@ -882,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
@@ -951,52 +931,3 @@ configurable through a set of options.")
     "Microbenchmarks suite to evaluate MPI and PGAS (OpenSHMEM, UPC, and
 UPC++) libraries for CPUs and GPUs.")
    (license license:bsd-3)))
-
-(define-public babelstream-hip
-  (package
-    (name "babelstream-hip")
-    (version "5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/UoB-HPC/BabelStream.git")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0xkkxkmyi99qly427gkdijm9vwvmhwkgfm283ay6f83r66f712g4"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:build-type "Release"                ;"RelWithDebInfo" is not supported
-      #:tests? #f                           ;no tests
-      #:configure-flags
-      #~(list (string-append "-DMODEL=hip")
-              (string-append "-DCMAKE_CXX_COMPILER="
-                             #$(this-package-input "rocm-hip-runtime")
-                             "/bin/hipcc")
-              (string-append "-DCXX_EXTRA_FLAGS=--offload-arch="
-                             #$(string-join (current-amd-gpu-targets) ",")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'avoid-native-optimizations
-            (lambda _
-              (substitute* "CMakeLists.txt"
-                (("-march=native")
-                 "-g")))))))
-    (inputs (list rocm-hip-runtime lld-rocm llvm-rocm))
-    (properties
-     `((amd-gpu-targets . ,%default-amd-gpu-targets)
-       (tunable? . #t)))
-    (synopsis "Memory bandwidth benchmark for AMD GPUs")
-    (description
-     "The BabelStream benchmark measures memory transfer rates between main
-memory and GPUs.  This benchmark is similar in spirit, and based on, John
-D. McCalpin's STREAM benchmark for CPUs.  The version of BabelStream is built
-targeting AMD GPUs using HIP.")
-    (home-page "https://github.com/UoB-HPC/BabelStream.git")
-    (license (license:fsf-free
-              "https://github.com/UoB-HPC/BabelStream/blob/main/LICENSE"
-              "Custom permissive license based on John D. McCalpin's \
-original STREAM benchmark."))))
--- a/Show More
+++ b/Show More