gnu: linux-libre: Extract common kernel modules into variables.

Deduplicate common default modules in an attempt to clean the module up.

* gnu/packages/linux.scm (pinebook-extra-modules,
arm64-generic-extra-modules): New variables.
(linux-libre-arm64-generic, linux-libre-lts-arm64-generic,
linux-libre-arm64-generic-5.10): Use new variables.

Change-Id: Ia48d6942332e71cadd43decb59d633180b0d3264
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>

NEWS

@@ -18,7 +18,6 @@ Please send Guix bug reports to bug-guix@gnu.org.
 ** Distribution
 *** GNOME updated to version 48
 *** New service for Fossil SCM
-*** TeX Live updated to 2026.1
 
 * Changes in 1.5.0 (since 1.4.0)
 ** Package management

doc/guix.texi

@@ -51663,63 +51663,6 @@ phone-number = 0
 is-married = true
 @end example
 
-@subsubsection Serializing to environment variables
-@cindex environment variables, serialization of configuration records
-
-There are services which expect their configuration as environment variables.
-The @code{(gnu services configuration environment-variables)} module provides
-facilities to serialize configuration records from
-@code{(gnu services configuration)} to list of pairs representing environment
-variables.
-
-For example this configuration record:
-
-@lisp
-(define-configuration/no-serialization server
-  (ssh-port
-   (number 22)
-   "The public SSH port of the server.")
-  (fqdn
-   (maybe-string)
-   "The fully qualified domain name of the server.")
-  (active?
-   (boolean #f)
-   "Whether or not the server should be activated."))
-
-(define my-server
- (server
-  (ssh-port 20022)
-  (active? #t)))
-@end lisp
-
-with this call:
-
-@lisp
-(serialize-environment-variables my-server server-fields
-                                 #:true-value "1"
-                                 #:false-value "0")
-@end lisp
-
-would yield:
-
-@lisp
-'(("SSH_PORT" . "20022")
-  ("ACTIVE" . "1"))
-@end lisp
-
-@anchor{serialize-environment-variables-procedure}
-@deffn {Procedure} serialize-environment-variables @var{config} @var{fields} @
-         [@var{selection} #f] [@var{negate?} #f] [#:prefix #f] @
-         [#:true-value "true"] [#:false-value "false"]
-Serializes the fields whose name is included in SELECTION from CONFIG, a
-configuration from @code{(gnu services configuration)}, and FIELDS, the
-list of its field records, to a list of pairs.  When NEGATE? is #t all services
-not included in SELECTION will be serialized.  Each  pair represents an
-environment variable.  The first element of each pair is the variable name, the
-second is the value.  When PREFIX is a string it is prepended to the variable
-name.  TRUE-VALUE and FALSE-VALUE will be used as a representation for
-respectfully @code{#t} and @code{#f}.
-@end deffn
 
 @c *********************************************************************
 @cindex troubleshooting, Guix System

etc/teams/tex/tex-manifest.scm

@@ -26,6 +26,7 @@
 
 (define %sundry-texlive-packages
   (list bibtool
+        dvisvgm
         rubber
         texmaker
         texstudio

gnu/local.mk

@@ -56,7 +56,6 @@
 # Copyright © 2022 Alex Griffin <a@ajgrf.com>
 # Copyright © 2022 ( <paren@disroot.org>
 # Copyright © 2022, 2026 jgart <jgart@dismail.de>
-# Copyright © 2022-2023, 2025-2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 # Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
 # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
 # Copyright © 2023 Andy Tai <atai@atai.org>
@@ -217,7 +216,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/convmv.scm			\
   %D%/packages/codex.scm				\
   %D%/packages/coq.scm				\
-  %D%/packages/coreboot.scm			\
   %D%/packages/cpio.scm				\
   %D%/packages/cpp.scm 				\
   %D%/packages/cppi.scm				\
@@ -740,8 +738,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/services/cgit.scm			\
   %D%/services/ci.scm				\
   %D%/services/configuration.scm		\
-  %D%/services/configuration/environment-variables.scm		\
-  %D%/services/configuration/utils.scm		\
   %D%/services/containers.scm   		\
   %D%/services/cuirass.scm			\
   %D%/services/cups.scm				\
@@ -1039,7 +1035,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/azr3.patch				\
   %D%/packages/patches/azr3-remove-lash.patch			\
   %D%/packages/patches/barony-fix-textures.patch		\
-  %D%/packages/patches/bam-python3-compat.patch		\
   %D%/packages/patches/bash-completion-directories.patch	\
   %D%/packages/patches/bash-linux-pgrp-pipe.patch		\
   %D%/packages/patches/basis-universal-unbundle-libs.patch	\
@@ -1983,7 +1978,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch	\
   %D%/packages/patches/nix-dont-build-html-doc.diff		\
   %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch	\
-  %D%/packages/patches/neovim-tree-sitter-grammar-path.patch	\
   %D%/packages/patches/network-manager-plugin-ownership.patch	\
   %D%/packages/patches/network-manager-plugin-path.patch	\
   %D%/packages/patches/newlib-getentropy.patch			\
@@ -2386,7 +2380,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-candle-0.9.1-add-candle-onnx-to-workspace.patch	\
   %D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch	\
   %D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch	\
   %D%/packages/patches/rust-codex-0.98.0-test-timeout.patch	\
@@ -2625,17 +2618,6 @@ dist_patch_DATA =						\
   %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/zed-0.225.10-add-message-notification-action.patch \
-  %D%/packages/patches/zed-0.225.10-add-guix-container-support.patch	\
-  %D%/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch	\
-  %D%/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch		\
-  %D%/packages/patches/zed-0.225.10-disable-dlopen.patch	\
-  %D%/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch	\
-  %D%/packages/patches/zed-0.225.10-fix-test-db-isolation.patch	\
-  %D%/packages/patches/zed-0.225.10-fix-workspace-race.patch	\
-  %D%/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch	\
-  %D%/packages/patches/zed-0.225.10-remove-patch-crates-io.patch	\
-  %D%/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch	\
   %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch	\
   %D%/packages/patches/zig-0.9-fix-runpath.patch		\
   %D%/packages/patches/zig-0.9-riscv-support.patch		\

gnu/packages/adns.scm

@@ -1,4 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -17,20 +22,163 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages adns)
-  #:use-module (gnu packages dns)
-  #:use-module (guix deprecation))
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
 
-(define-deprecated/public-alias adns
-  (@ (gnu packages dns) adns))
+(define-public adns
+  (package
+    (name "adns")
+    (version "1.6.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
+              (commit (string-append "adns-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      ;; INFO: Tests expect real name resolution to work.
+      #:tests? #f
+      #:configure-flags
+      #~(list
+         ;; Make sure the programs under bin/ find libadns.so.
+         (string-append "LDFLAGS=-Wl,-rpath -Wl,"
+                        #$output:out
+                        "/lib"))))
+    (native-inputs
+     (list m4))
+    (home-page "https://www.gnu.org/software/adns/")
+    (synopsis "Asynchronous DNS client library and utilities")
+    (description
+     "GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
+Name System} resolution functionality.  The library is asynchronous, allowing
+several concurrent calls.  The package also includes several command-line
+utilities for use in scripts.")
+    (license license:gpl3+)))
 
-(define-deprecated/public-alias c-ares
-  (@ (gnu packages dns) c-ares))
+(define-public c-ares
+  (package
+    (name "c-ares")
+    (version "1.34.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/c-ares/c-ares/releases/download/v"
+                    version "/" name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'filter-live-tests
+            (lambda _
+              ;; Filter tests that require internet access.
+              (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
+          #$@(if (system-hurd?)
+                 #~((add-after 'unpack 'skip-tests
+                      (lambda _
+                        (substitute* "test/ares-test-main.cc"
+                          (("(^| )main *\\(.*" all)
+                           (string-append all "  exit (77);\n")))))
+                    (add-after 'filter-live-tests 'filter-hurd-tests
+                      (lambda _
+                        (setenv "GTEST_FILTER"
+                                (string-append
+                                 (getenv "GTEST_FILTER")
+                                 ":.*Basic/2"
+                                 ":.*CancelImmediate/2"
+                                 ":.*CancelImmediateGetHostByAddr/2"
+                                 ":.*CancelLater/1"
+                                 ":.*FamilyUnspecified/2"
+                                 ":.*FamilyV6/2"
+                                 ":.*GetAddrInfoParallelLookups/1"
+                                 ":.*GetHostByAddrDestroy/2"
+                                 ":.*GetHostByNameCNAMENoData/2"
+                                 ":.*GetHostByNameDestroyAbsolute/2"
+                                 ":.*GetHostByNameDestroyRelative/2"
+                                 ":.*GetHostByNameParallelLookups/1"
+                                 ":.*HostAlias/2"
+                                 ":.*HostAliasMissing/2"
+                                 ":.*HostAliasMissingFile/2"
+                                 ":.*NotImplResponse/2"
+                                 ":.*RefusedResponse/2"
+                                 ":.*Resend/1"
+                                 ":.*RetryWithoutEDNS/2"
+                                 ":.*SearchDomains/2"
+                                 ":.*SearchDomainsBare/2"
+                                 ":.*SearchDomainsServFailOnAAAA/2"
+                                 ":.*SearchDomainsWithResentReply/1"
+                                 ":.*SearchHighNdots/2"
+                                 ":.*SearchNoDataThenFail/2"
+                                 ":.*SearchNoDataThenNoDataBare/2"
+                                 ":.*SearchNoDataThenSuccess/2"
+                                 ":.*ServFailResponse/2"
+                                 ":.*SimpleQuery/2"
+                                 ":.*SockCallback/2"
+                                 ":.*SockConfigureCallback/2"
+                                 ":.*SortListV4/2"
+                                 ":.*SortListV6/2"
+                                 ":.*ThirdServer/2"
+                                 ":.*TruncationRetry/1"
+                                 ":.*UnspecifiedFamilyCname6A4/2"
+                                 ":.*UnspecifiedFamilyV4/2"
+                                 ":.*UnspecifiedFamilyV6/2")))))
+                 #~()))))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://c-ares.haxx.se/")
+    (synopsis "C library for asynchronous DNS requests")
+    (description
+     "C-ares is a C library that performs DNS requests and name resolution
+asynchronously.  It is intended for applications which need to perform DNS
+queries without blocking, or need to perform multiple DNS queries in parallel.
+The primary examples of such applications are servers which communicate with
+multiple clients and programs with graphical user interfaces.")
+    (license (license:x11-style "https://c-ares.haxx.se/license.html"))))
 
-(define-deprecated/public-alias c-ares-for-node-lts
-  (@ (gnu packages dns) c-ares-for-node-lts))
+(define-public c-ares-for-node-lts
+  (hidden-package c-ares))
 
-(define-deprecated/public-alias c-ares-for-node-bootstrap
-  (@ (gnu packages dns) c-ares-for-node-bootstrap))
+(define-public c-ares-for-node-bootstrap
+  (hidden-package
+   (package
+     (inherit c-ares)
+     (version "1.18.1")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append
+                     "https://c-ares.haxx.se/download/c-ares-" version
+                     ".tar.gz"))
+               (sha256
+                (base32
+                 "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
 
-(define-deprecated/public-alias c-ares/cmake
-  (@ (gnu packages dns) c-ares/cmake))
+;; gRPC requires a c-ares built with CMake in order to get the .cmake modules.
+;; We can not build c-ares itself with CMake because that would introduce a
+;; circular dependency through nghttp2.
+;; XXX: It would be nice if we could extract the modules somehow and make them
+;; work with the "normal" c-ares package instead of building a whole new library.
+(define-public c-ares/cmake
+  (hidden-package
+   (package
+     (inherit c-ares)
+     (build-system cmake-build-system)
+     (arguments
+      `(;; XXX: Tests require name resolution (the normal variant runs no tests).
+        #:tests? #f)))))

gnu/packages/aidc.scm

@@ -370,7 +370,7 @@ This package includes the following programs:
            libjpeg-turbo
            perl
            python
-           v4l-utils))
+           v4l-utils-minimal))
     (propagated-inputs
      ;; These are in 'requires' field of .pc files.
      (list glib gtk+))

gnu/packages/anthy.scm

@@ -33,8 +33,9 @@
        ;; The URI does not appear to be easily guessable.  For
        ;; example, you cannot download version "9100g" simply
        ;; by replacing "9100h" in the URI.
-       (uri (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
-                           "distfiles/31/anthy-9100h.tar.gz"))
+       (uri (list (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
+                                 "distfiles/31/anthy-9100h.tar.gz")
+                  "https://osdn.dl.osdn.net/anthy/37536/anthy-9100h.tar.gz"))
        (sha256
         (base32 "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
     (build-system gnu-build-system)

gnu/packages/audio.scm

@@ -3438,7 +3438,7 @@ from being able to mix multiple JACK audio streams.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "0fvnvr74q5khxlj5sylfnkblydmwgdbvj04mhdqw0zzmfqwignhd"))))
+       (base32 "08ji4lg24flzi6g3yaavfq8hz3kr98q2ripk5m4qk9z172qxbbc9"))))
     (build-system meson-build-system)
     (arguments
      (list

gnu/packages/benchmark.scm

@@ -944,20 +944,7 @@ configurable through a set of options.")
       #~(list (string-append
                "CC=" #$(this-package-input "openmpi") "/bin/mpicc")
               (string-append
-               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; OSU installs its binaries to /libexec. Have a symlink in /bin to
-          ;; improve user experience.
-          (add-after 'install 'symlink-binaries-in-bin
-            (lambda _
-              (mkdir-p (string-append #$output "/bin"))
-              (for-each (lambda (file)
-                          (symlink file
-                                   (string-append #$output "/bin/"
-                                                  (basename file))))
-                        (find-files (string-append #$output
-                                                   "/libexec"))))))))
+               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))))
     (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
     (synopsis "Benchmarking suite from the MVAPICH project")
     (description

gnu/packages/bioinformatics.scm

@@ -18335,6 +18335,44 @@ following the assay and produces a file detailing peaks of significant
 enrichment.")
     (license license:expat)))
 
+(define-public mantis
+  ;; This is an arbitrary commit as a year has passed since 0.1 was tagged.
+  (let ((commit "b6979a269172a45201c8366680d8b889f889432b")
+        (revision "2"))
+    (package
+      (name "mantis")
+      (version (git-version "0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/splatlab/mantis")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0dq8a785hnaxx5kq757m5czs8xpcjpcph1inq2nm8h6zfvqyj8xs"))))
+      (build-system cmake-build-system)
+      (arguments
+       '(#:tests? #f ; there are none
+         #:configure-flags (list "-DNH=ON"))) ; do not use SSE4.2 instructions
+      (inputs
+       (list sdsl-lite openssl zlib))
+      (native-inputs
+       (list gcc-7))
+      (home-page "https://github.com/splatlab/mantis")
+      (synopsis "Large-scale sequence-search index data structure")
+      (description "Mantis is a space-efficient data structure that can be
+used to index thousands of raw-read genomics experiments and facilitate
+large-scale sequence searches on those experiments.  Mantis uses counting
+quotient filters instead of Bloom filters, enabling rapid index builds and
+queries, small indexes, and exact results, i.e., no false positives or
+negatives.  Furthermore, Mantis is also a colored de Bruijn graph
+representation, so it supports fast graph traversal and other topological
+analyses in addition to large-scale sequence-level searches.")
+      ;; uses __uint128_t and inline assembly
+      (supported-systems '("x86_64-linux"))
+      (license license:bsd-3))))
+
 (define-public sjcount
   ;; There is no tag for version 3.2, nor is there a release archive.
   (let ((commit "292d3917cadb3f6834c81e509c30e61cd7ead6e5")

gnu/packages/bittorrent.scm

@@ -41,16 +41,32 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages bittorrent)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module ((guix licenses) #:prefix l:)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
+  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
+  #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
@@ -60,9 +76,8 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages nettle)
-  #:use-module (gnu packages nss)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -71,30 +86,15 @@
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages qt)
   #:use-module (gnu packages serialization)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system qt)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
-  #:use-module (guix utils))
+  #:use-module (gnu packages xorg))
 
 (define-public transmission
   (package
@@ -194,7 +194,7 @@ DHT, µTP, PEX and Magnet Links.")
     ;; or any future license endorsed by Mnemosyne LLC.
     ;;
     ;; A few files files carry an MIT/X11 license header.
-    (license (list license:gpl2 license:gpl3))))
+    (license (list l:gpl2 l:gpl3))))
 
 (define-public transmission-remote-gtk
   (package
@@ -224,7 +224,7 @@ DHT, µTP, PEX and Magnet Links.")
     (description "transmission-remote-gtk is a GTK client for remote management
 of the Transmission BitTorrent client, using its HTTP RPC protocol.")
     (home-page "https://github.com/transmission-remote-gtk/transmission-remote-gtk")
-    (license license:gpl2+)))
+    (license l:gpl2+)))
 
 (define-public stig
   (package
@@ -267,7 +267,7 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
      "Stig is a @acronym{TUI, Text User Interface} and @acronym{CLI, Command
 Line Interface} client for the BitTorrent client Transmission.")
     (home-page "https://github.com/rndusr/stig")
-    (license license:gpl3)))
+    (license l:gpl3)))
 
 (define-public libtorrent
   (package
@@ -291,7 +291,7 @@ Line Interface} client for the BitTorrent client Transmission.")
 with the BitTorrent client rtorrent.  It is written in C++ with emphasis on
 speed and efficiency.")
     (home-page "https://github.com/rakshasa/libtorrent")
-    (license license:gpl2+)))
+    (license l:gpl2+)))
 
 (define-public rtorrent
   (package
@@ -320,7 +320,7 @@ speed and efficiency.")
 full encryption, DHT, PEX, and Magnet Links.  It can also be controlled via
 XML-RPC over SCGI.")
     (home-page "https://github.com/rakshasa/rtorrent")
-    (license license:gpl2+)))
+    (license l:gpl2+)))
 
 (define-public tremc
   (let ((commit "d8deaa5ac25bb45a2ca3a930309d6ecc74836a54")
@@ -354,7 +354,7 @@ XML-RPC over SCGI.")
     (description "Tremc is a console client, with a curses interface, for the
 Transmission BitTorrent daemon.")
     (home-page "https://github.com/tremc/tremc")
-    (license license:gpl3+))))
+    (license l:gpl3+))))
 
 (define-public aria2
   (package
@@ -419,7 +419,7 @@ download utility.  It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.
 Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
     (properties
      '((release-monitoring-url . "https://github.com/aria2/aria2/releases")))
-    (license license:gpl2+)))
+    (license l:gpl2+)))
 
 (define-public uget
   (package
@@ -453,7 +453,7 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
      "uGet is portable download manager with GTK+ interface supporting
 HTTP, HTTPS, BitTorrent and Metalink, supporting multi-connection
 downloads, download scheduling, download rate limiting.")
-    (license license:lgpl2.1+)))
+    (license l:lgpl2.1+)))
 
 (define-public mktorrent
   (package
@@ -488,8 +488,8 @@ files and whole directories.  It can add multiple trackers and web seed URLs,
 and set the @code{private} flag to disallow advertisement through the
 distributed hash table (@dfn{DHT}) and Peer Exchange.  Hashing is multi-threaded
 and will take advantage of multiple processor cores where possible.")
-    (license (list license:public-domain ; sha1.*, used to build without OpenSSL
-                   license:gpl2+))))     ; with permission to link with OpenSSL
+    (license (list l:public-domain      ; sha1.*, used to build without OpenSSL
+                   l:gpl2+))))          ; with permission to link with OpenSSL
 
 (define-public libtorrent-rasterbar
   (package
@@ -541,7 +541,7 @@ and will take advantage of multiple processor cores where possible.")
      "libtorrent-rasterbar is a feature-complete C++ BitTorrent implementation
 focusing on efficiency and scalability.  It runs on embedded devices as well as
 desktops.")
-    (license license:bsd-2)))
+    (license l:bsd-2)))
 
 (define-public qbittorrent
   (package
@@ -585,7 +585,7 @@ libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 It aims to be a good alternative to all other BitTorrent clients out there.
 qBittorrent is fast, stable and provides unicode support as well as many
 features.")
-    (license license:gpl2+)))
+    (license l:gpl2+)))
 
 (define-public qbittorrent-no-x
   (let ((base qbittorrent))
@@ -727,4 +727,4 @@ Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange
 speed limits.  Deluge heavily utilises the ​libtorrent library.  It is
 designed to run as both a normal standalone desktop application and as a
 ​client-server.")
-    (license license:gpl3+)))
+    (license l:gpl3+)))

gnu/packages/browser-extensions.scm

@@ -95,8 +95,8 @@ supported content to the Kodi media center.")
   ;; Arbitrary commit of branch master,
   ;; Update when updating uBlockOrigin.
   (let* ((name "ublock-main-assets")
-         (commit "004af606e6a0efc22bc65ab1016b553441cacb71")
-         (revision "6")
+         (commit "011eef4a5b36a7ebf4adedc486d96b77cfa25c54")
+         (revision "5")
          (version (git-version "0" revision commit)))
     (origin
       (method git-fetch)
@@ -105,14 +105,14 @@ supported content to the Kodi media center.")
             (commit commit)))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "1bfd2d53flrkgvjcr1kj9nbxj4y9a4pcr7m3dycccdhd21x6k0ln")))))
+       (base32 "0ng8a88zdvrxg30fz83gswjy27b3hfx9q11n2i715id7az7kqf9x")))))
 
 (define ublock-prod-assets
   ;; Arbitrary commit of branch gh-pages,
   ;; Update when updating uBlockOrigin.
   (let* ((name "ublock-prod-assets")
-         (commit "6c15e4ef91888c610caf73829dc78ae9549ed24a")
-         (revision "6")
+         (commit "6844322800de647da0c4fe06dd6a0b212a3942e4")
+         (revision "5")
          (version (git-version "0" revision commit)))
     (origin
       (method git-fetch)
@@ -121,12 +121,12 @@ supported content to the Kodi media center.")
             (commit commit)))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "0n2h6drqh44b1zgl729bfr70n08mkm536a2vqgivw7dm5dmi8zd3")))))
+       (base32 "13vxq4z1wxivz5xklncxd2sj5aqkyhq919vzbbfp0fgh0imhikib")))))
 
 (define ublock-origin
   (package
     (name "ublock-origin")
-    (version "1.70.0")
+    (version "1.66.2")
     (home-page "https://github.com/gorhill/uBlock")
     (source (origin
               (method git-fetch)
@@ -136,7 +136,7 @@ supported content to the Kodi media center.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0j1m80nz86yc69c42hv5di5zza0vkycqmjaydb9jgx0abcvi19x5"))))
+                "16ph031hb8bf4rxyxvm6jr0bxmy0snza11jfrbjgfb390gax9r63"))))
     (build-system gnu-build-system)
     (outputs '("xpi" "firefox" "chromium"))
     (properties '((addon-id . "uBlock0@raymondhill.net")))

gnu/packages/build-tools.scm

@@ -44,17 +44,37 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages build-tools)
+  #:use-module (ice-9 optargs)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages c)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system guile)
+  #:use-module (guix build-system hare)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix deprecation)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix modules)
+  #:use-module (guix packages)
+  #:use-module (guix search-paths)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
-  #:use-module (gnu packages c)
   #:use-module (gnu packages check)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages cppi)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages guile)
@@ -85,27 +105,7 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages unicode)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system guile)
-  #:use-module (guix build-system hare)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix deprecation)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix modules)
-  #:use-module (guix packages)
-  #:use-module (guix search-paths)
-  #:use-module (guix utils)
-  #:use-module (ice-9 optargs))
+  #:use-module (gnu packages xml))
 
 (define-public acr
   (package
@@ -196,8 +196,7 @@ according to the system capabilities and the user-selected options.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))
-              (patches (search-patches "bam-python3-compat.patch"))))
+                "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags `(,(string-append "CC=" ,(cc-for-target))
@@ -208,7 +207,7 @@ according to the system capabilities and the user-selected options.")
        (modify-phases %standard-phases
          (delete 'configure))))
     (native-inputs
-     (list python-minimal-wrapper))
+     `(("python" ,python-2)))
     (inputs
      (list lua))
     (home-page "https://matricks.github.io/bam/")

gnu/packages/cdrom.scm

@@ -595,11 +595,7 @@ capacity is user-selectable.")
                             version "/DVDStyler-" version ".tar.bz2"))
        (sha256
         (base32
-         "0n3mfjsazvlzk9hl23q3iz7bmxjq7b5lx0ab8nbk1jgl763k9cqb"))
-       (snippet
-        #~(begin (delete-file "src/dvdvml.c")
-                 (delete-file "src/dvdvmy.c")
-                 (delete-file "src/dvdvmy.h")))))
+         "0n3mfjsazvlzk9hl23q3iz7bmxjq7b5lx0ab8nbk1jgl763k9cqb"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
@@ -629,28 +625,27 @@ capacity is user-selectable.")
              #t)))
        #:tests? #f)) ; No tests.
     (inputs ; TODO package bundled wxvillalib
-     (list bash-minimal ; for wrap-program
-           cdrtools
-           dbus
-           dvd+rw-tools
-           dvdauthor
-           eudev
-           ffmpeg-4
-           fontconfig
-           libexif
-           libjpeg-turbo
-           wxsvg
-           wxwidgets))
+     `(("wxwidgets" ,wxwidgets)
+       ("wssvg" ,wxsvg)
+       ("bash" ,bash-minimal) ; for wrap-program
+       ("dbus" ,dbus)
+       ("cdrtools" ,cdrtools)
+       ("dvd+rw-tools" ,dvd+rw-tools)
+       ("dvdauthor" ,dvdauthor)
+       ("eudev" ,eudev)
+       ("fontconfig" ,fontconfig)
+       ("libexif" ,libexif)
+       ("libjpeg" ,libjpeg-turbo)
+       ("ffmpeg" ,ffmpeg-4)))
     (native-inputs
-     (list bison
-           docbook-xml
-           docbook-xsl
-           flex
-           gettext-minimal
-           pkg-config
-           python-minimal-wrapper
-           xmlto
-           zip))
+     `(("pkg-config" ,pkg-config)
+       ("flex" ,flex)
+       ("python" ,python-2)
+       ("xmlto" ,xmlto)
+       ("gettext" ,gettext-minimal)
+       ("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("zip" ,zip)))
     (synopsis "DVD authoring application")
     (description "DVDStyler is a DVD authoring application which allows users
 to burn video files in many formats to DVD discs, complete with individually

gnu/packages/check.scm

@@ -1140,7 +1140,8 @@ Anything Protocol} compliant programs can also be executed through Kyua.")
     (arguments
      `(#:tests? #f
        #:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
-    (native-inputs (list python-wrapper))
+    (native-inputs
+     `(("python" ,python-wrapper)))
     (home-page "https://github.com/google/googletest/")
     (synopsis "Test discovery and XUnit test framework")
     (description "Google Test features an XUnit test framework, automated test

gnu/packages/containers.scm

@@ -714,7 +714,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
 (define-public podman
   (package
     (name "podman")
-    (version "5.8.2")
+    (version "5.8.1")
     (outputs '("out" "docker"))
     (properties
      `((output-synopsis "docker" "docker alias for podman")
@@ -727,7 +727,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
              (url "https://github.com/containers/podman")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "12bmzbfyjsf0mwnam38cw9ib54wj1znh5b7lxzdyll9cvvkhqisr"))
+        (base32 "1wdsdc0nj4m1v8mn95dhavi87ad0adqmld70da59gvp2abff5f0f"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments

gnu/packages/coreboot.scm

@@ -1,248 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
-;;; Copyright © 2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.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 packages coreboot)
-  #:use-module (gnu packages bison)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages flex)
-  #:use-module (gnu packages pciutils)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix build-system cargo)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system go)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system qt)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (srfi srfi-26))
-
-(define-public bincfg
-  (package
-    (name "bincfg")
-    (version "25.09")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://review.coreboot.org/coreboot")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; no test suite
-      #:make-flags
-      #~(list
-         (string-append "CC=" #$(cc-for-target)))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure) ; no configure script
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/bincfg")))
-          (add-after 'build 'build-binaries
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (for-each
-               (lambda (target result)
-                 (apply invoke "make" (string-append "gen-" target) make-flags)
-                 (rename-file result
-                              (string-append target ".bin")))
-               (list
-                ;; generate GbE for X200
-                "gbe-ich9m"
-                ;; generate GbE for X220/x230
-                "gbe-82579LM"
-                ;; generate IFD for X200
-                "ifd-x200")
-               (list
-                "flashregion_3_gbe.bin"
-                "flashregion_3_gbe.bin"
-                "flashregion_0_fd.bin"))))
-          ;; The Makefile has no install target.
-          (replace 'install
-            (lambda _
-              (let ((bin (string-append #$output "/bin"))
-                    (lib (string-append #$output "/lib/bincfg"))
-                    (data (string-append #$output "/share/bincfg")))
-                ;; Install the program
-                (install-file "bincfg" bin)
-                ;; And its data
-                (for-each
-                 (lambda (path)
-                   (install-file path data))
-                 (append (find-files "." ".*\\.set")
-                         (find-files "." ".*\\.spec")))
-                ;; And the files generated with the data
-                (for-each
-                 (lambda (path)
-                   (install-file path lib))
-                 (find-files "." ".*\\.bin"))))))))
-    (native-inputs (list bison flex))
-    (home-page "https://coreboot.org")
-    (synopsis "Encoder/decoder for binary formats described in text files")
-    (description "
-The bincfg program comes with specifications files for the following binary
-formats:
-@itemize
-@item Various DDR3 and DDR4 SPD
-@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
-@item Configuration data for the Intel Gigabit Ethernet controller present in
-      the Intel ICH9-M chipset.
-@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
-@item Configuration data for the ITE IT8718F SuperIO
-@end itemize
-It also comes with example files generated by bincfg.")
-    (license license:gpl3+)))
-
-(define-public ifdtool
-  (package
-    (name "ifdtool")
-    (version "25.09")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://review.coreboot.org/coreboot")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/ifdtool")))
-          (delete 'configure))           ; no configure script
-      #:tests? #f))                    ; no test suite
-    (home-page "https://doc.coreboot.org/util/ifdtool/")
-    (synopsis "Intel Firmware Descriptor dumper")
-    (description "This package provides @command{ifdtool}, a program to
-dump Intel Firmware Descriptor data of an image file.")
-    (license license:gpl2)))
-
-(define-public intelmetool
-  (package
-    (name "intelmetool")
-    (version "25.09")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://review.coreboot.org/coreboot")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f                       ;no test suite
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/intelmetool")))
-          (delete 'configure) ;no configure script
-          (delete 'check))))
-    (inputs (list pciutils zlib))
-    (home-page
-     "https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
-    (synopsis "Intel Management Engine tools")
-    (description "This package provides tools for working with Intel
-Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
-@code{sudo rmmod mei} before using this tool.  Also pass
-@code{iomem=relaxed} to the Linux kernel command line.")
-    (license license:gpl2)
-
-    ;; This is obviously an Intel thing, plus it requires <cpuid.h>.
-    (supported-systems '("x86_64-linux" "i686-linux"))))
-
-(define-public nvramtool
-  (package
-    (name "nvramtool")
-    (version "25.09")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://review.coreboot.org/coreboot")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ; no test suite
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "INSTALL=install"
-              (string-append "PREFIX=" #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "util/nvramtool")))
-          (delete 'configure)))) ; no configure script
-    (home-page "https://coreboot.org")
-    (synopsis "Command line tool that can edit Coreboot settings")
-    (description "@command{nvramtool} can see and/or modify Coreboot settings
-like the serial port speed, log level, etc.  It requires Coreboot to be compiled
-with CONFIG_USE_OPTION_TABLE and some options require the iomem=relaxed kernel
-command line to work.  Features:
-@itemize
-@item If Coreboot was compiled without CONFIG_STATIC_OPTION_TABLE, it can change
-      its settings, which are applied after a reboot.
-@item It can modify Coreboot images  default settings with
-      @command{nvramtool -C coreboot.rom [...]}.
-@item It has various options related to the file format used to store these
-      settings.
-@item It can also read/write the CMOS memory where the Coreboot settings can be
-      located.
-@end itemize")
-    ;; Some files are "GPL-2.0-only or BSD-3-Clause", other are GPL-2.0-only
-    ;; and anyway there is. There is also a license declaration in
-    ;; cli/nvramtool.8 that applies to "This program" which uses the GPLv2.
-    (license license:gpl2)))

gnu/packages/debian.scm

@@ -20,6 +20,18 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages debian)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
+  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
@@ -28,7 +40,6 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages guile)
@@ -42,17 +53,6 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
   #:use-module (gnu packages wget)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system perl)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26))
 

gnu/packages/dlang.scm

@@ -108,7 +108,9 @@
            (lambda _
              (invoke "cmake" "--install" "."))))))
     (inputs
-     `(("zlib" ,zlib)))
+     `(("libconfig" ,libconfig)
+       ("libedit" ,libedit)
+       ("zlib" ,zlib)))
     (native-inputs
      `(("lld-wrapper" ,(make-lld-wrapper lld-17 #:lld-as-ld? #t))
        ("llvm" ,llvm-17)

gnu/packages/dns.scm

@@ -1,13 +1,12 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2015-2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2016 Nikita <nikita@n0.is>
 ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2016, 2019-2021 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
 ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
@@ -22,11 +21,9 @@
 ;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
-;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
-;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -49,12 +46,12 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
-  #:use-module (gnu packages datastructures)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages datastructures)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
@@ -68,7 +65,6 @@
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
-  #:use-module (gnu packages m4)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages networking)
@@ -88,173 +84,17 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system meson)
-  #:use-module (guix download)
   #:use-module (guix gexp)
-  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
-  #:use-module (guix utils))
-
-(define-public adns
-  (package
-    (name "adns")
-    (version "1.6.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
-              (commit (string-append "adns-" version))))
-       (sha256
-        (base32
-         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      ;; INFO: Tests expect real name resolution to work.
-      #:tests? #f
-      #:configure-flags
-      #~(list
-         ;; Make sure the programs under bin/ find libadns.so.
-         (string-append "LDFLAGS=-Wl,-rpath -Wl,"
-                        #$output:out
-                        "/lib"))))
-    (native-inputs
-     (list m4))
-    (home-page "https://www.gnu.org/software/adns/")
-    (synopsis "Asynchronous DNS client library and utilities")
-    (description
-     "GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
-Name System} resolution functionality.  The library is asynchronous, allowing
-several concurrent calls.  The package also includes several command-line
-utilities for use in scripts.")
-    (license license:gpl3+)))
-
-(define-public c-ares
-  (package
-    (name "c-ares")
-    (version "1.34.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/c-ares/c-ares/releases/download/v"
-             version "/" name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'filter-live-tests
-            (lambda _
-              ;; Filter tests that require internet access.
-              (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
-          #$@(if (system-hurd?)
-                 #~((add-after 'unpack 'skip-tests
-                      (lambda _
-                        (substitute* "test/ares-test-main.cc"
-                          (("(^| )main *\\(.*" all)
-                           (string-append all "  exit (77);\n")))))
-                    (add-after 'filter-live-tests 'filter-hurd-tests
-                      (lambda _
-                        (setenv "GTEST_FILTER"
-                                (string-append
-                                 (getenv "GTEST_FILTER")
-                                 ":.*Basic/2"
-                                 ":.*CancelImmediate/2"
-                                 ":.*CancelImmediateGetHostByAddr/2"
-                                 ":.*CancelLater/1"
-                                 ":.*FamilyUnspecified/2"
-                                 ":.*FamilyV6/2"
-                                 ":.*GetAddrInfoParallelLookups/1"
-                                 ":.*GetHostByAddrDestroy/2"
-                                 ":.*GetHostByNameCNAMENoData/2"
-                                 ":.*GetHostByNameDestroyAbsolute/2"
-                                 ":.*GetHostByNameDestroyRelative/2"
-                                 ":.*GetHostByNameParallelLookups/1"
-                                 ":.*HostAlias/2"
-                                 ":.*HostAliasMissing/2"
-                                 ":.*HostAliasMissingFile/2"
-                                 ":.*NotImplResponse/2"
-                                 ":.*RefusedResponse/2"
-                                 ":.*Resend/1"
-                                 ":.*RetryWithoutEDNS/2"
-                                 ":.*SearchDomains/2"
-                                 ":.*SearchDomainsBare/2"
-                                 ":.*SearchDomainsServFailOnAAAA/2"
-                                 ":.*SearchDomainsWithResentReply/1"
-                                 ":.*SearchHighNdots/2"
-                                 ":.*SearchNoDataThenFail/2"
-                                 ":.*SearchNoDataThenNoDataBare/2"
-                                 ":.*SearchNoDataThenSuccess/2"
-                                 ":.*ServFailResponse/2"
-                                 ":.*SimpleQuery/2"
-                                 ":.*SockCallback/2"
-                                 ":.*SockConfigureCallback/2"
-                                 ":.*SortListV4/2"
-                                 ":.*SortListV6/2"
-                                 ":.*ThirdServer/2"
-                                 ":.*TruncationRetry/1"
-                                 ":.*UnspecifiedFamilyCname6A4/2"
-                                 ":.*UnspecifiedFamilyV4/2"
-                                 ":.*UnspecifiedFamilyV6/2")))))
-                 #~()))))
-    (native-inputs
-     (list pkg-config))
-    (home-page "https://c-ares.haxx.se/")
-    (synopsis "C library for asynchronous DNS requests")
-    (description
-     "C-ares is a C library that performs DNS requests and name resolution
-asynchronously.  It is intended for applications which need to perform DNS
-queries without blocking, or need to perform multiple DNS queries in parallel.
-The primary examples of such applications are servers which communicate with
-multiple clients and programs with graphical user interfaces.")
-    (license (license:x11-style "https://c-ares.haxx.se/license.html"))))
-
-(define-public c-ares-for-node-lts
-  (hidden-package c-ares))
-
-(define-public c-ares-for-node-bootstrap
-  (hidden-package
-   (package
-     (inherit c-ares)
-     (version "1.18.1")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-              "https://c-ares.haxx.se/download/c-ares-" version
-              ".tar.gz"))
-        (sha256
-         (base32
-          "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
-
-;; INFO: gRPC requires a c-ares built with CMake in order to get the .cmake
-;; modules.  We can not build c-ares itself with CMake because that would
-;; introduce a circular dependency through nghttp2.
-;;
-;; TODO: It would be nice if we could extract the modules somehow and make
-;; them work with the "normal" c-ares package instead of building a whole new
-;; library.
-(define-public c-ares/cmake
-  (hidden-package
-   (package
-     (inherit c-ares)
-     (build-system cmake-build-system)
-     (arguments
-      (list
-       ;; INFO: Tests require name resolution (the normal variant runs no
-       ;; tests).
-       #:tests? #f)))))
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson))
 
 (define-public cloudflare-cli
   (let ((commit "2d986d3ec1b0e3158c4bd40e8918947cb74aa392")

gnu/packages/electronics.scm

@@ -3792,7 +3792,7 @@ to enforce it.")
 (define-public python-vunit
   (package
     (name "python-vunit")
-    (version "5.0.0-dev.10") ;v4.7.0 dates back from 2 years ago.
+    (version "5.0.0-dev.9") ;v4.7.0 dates back from 2 years ago.
     (source
      (origin
        (method git-fetch)
@@ -3801,7 +3801,7 @@ to enforce it.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1gr9ghwgqly9zf0sf15ai20sac520rs84b9i5qjxdqpj26ayyl1q"))))
+        (base32 "1j9rvlshzi4mdy7wah1j8ri63drkjb47xly22q40wvl2xp2ghqgs"))))
     (build-system pyproject-build-system)
     (arguments
      (list

gnu/packages/emacs-xyz.scm

@@ -2809,56 +2809,6 @@ versions of a topic branch.")
 diffs.")
       (license license:expat))))
 
-(define-public emacs-majutsu
-  (package
-    (name "emacs-majutsu")
-    (version "0.6.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/0WD0/majutsu")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1b840z3p10jyh8d6kmj7syad7308qr9p09gsci4gmha0iw3adnx5"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      ;; XXX: Test fails with `void-function transient--set-layout' when using
-      ;; wrapped ert-runner.
-      #:test-command
-      #~'(".ert-runner-real")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-references
-            (lambda* (#:key inputs #:allow-other-keys)
-              (emacs-substitute-variables "majutsu-jj.el"
-                ("majutsu-jj-executable"
-                 (search-input-file inputs "bin/jj")))))
-          (add-after 'install 'install-docs
-            (lambda _
-              (with-directory-excursion "docs"
-                (invoke "make" "majutsu.info")
-                (install-file "majutsu.info"
-                              (in-vicinity #$output "share/info"))))))))
-    (native-inputs
-     ;; Use unwrapped ert-runner in test, adding its inputs here.
-     (modify-inputs (package-inputs emacs-ert-runner)
-       (delete "bash-minimal")
-       (prepend emacs-ert-runner texinfo)))
-    (inputs (list jujutsu))
-    (propagated-inputs (list emacs-magit))
-    (home-page "https://github.com/0WD0/majutsu")
-    (synopsis "Emacs interface for Jujutsu version control system")
-    (description
-     "Majutsu provides a @code{emacs-magit}-style interface for
-@code{jujutsu}, offering an efficient way to interact with Jujutsu repositories
-from within Emacs.")
-    (license
-     (list license:gpl3+
-           license:expat))))
-
 (define-public emacs-conflict-buttons
   ;; No releases
   (let ((commit "22af851d6a0cdd226ef7ba0db54fa096c8ddf235")
@@ -22429,7 +22379,7 @@ are common in Chromium-derived projects.")
 (define-public emacs-gnosis
   (package
     (name "emacs-gnosis")
-    (version "0.10.3")
+    (version "0.8.0")
     (source
      (origin
        (method git-fetch)
@@ -22438,7 +22388,7 @@ are common in Chromium-derived projects.")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0kpzc2jw51sklz15v0d0vzm5ck05n3d90l02la4nxn8r85jb1f53"))))
+        (base32 "003pmd0ahpcss5ydk3wbx5j45225ypa85zrgljz5qajijiybvxpi"))))
     (build-system emacs-build-system)
     (arguments
      (list
@@ -22451,21 +22401,20 @@ are common in Chromium-derived projects.")
             (lambda _
               (setenv "HOME"
                       (getenv "TMPDIR"))
-              (mkdir-p (string-append
-                        (getenv "HOME")
-                        "/.emacs.d"))))
+              (mkdir-p (string-append (getenv "HOME") "/.emacs.d"))))
           (add-before 'install 'make-info
             (lambda _
               (invoke "make" "doc" "GUIX_SHELL="))))))
     (native-inputs (list texinfo))
-    (propagated-inputs (list emacs-transient))
+    (propagated-inputs (list emacs-compat emacs-emacsql emacs-org-gnosis
+                             emacs-transient))
     (home-page "https://thanosapollo.org/projects/gnosis/")
-    (synopsis "Personal knowledge system for GNU Emacs")
+    (synopsis "Spaced repetition system for GNU Emacs")
     (description
-     "Gnosis is a personal knowledge system for GNU Emacs that
-integrates note-taking with spaced repetition.  It combines
-Zettelkasten-style linked notes with self-testing review,
-all stored in a single SQLite database.")
+     "Gnosis is a spaced repetition system for note-taking and self-testing
+where notes are formatted as Question/Answer/Explanation.  Notes are reviewed
+at spaced intervals based on the success or failure in recalling the answer to
+each question.")
     (license license:gpl3+)))
 
 (define-public emacs-drag-stuff

gnu/packages/embedded.scm

@@ -1902,7 +1902,7 @@ PicoBlaze; and Zilog Z80 families, plus many of their variants.")
     (inputs
      (list readline ucsim))
     (native-inputs
-     (list bison boost flex python-minimal-wrapper texinfo zlib))
+     (list bison boost flex python-2 texinfo zlib))
     (home-page "https://sdcc.sourceforge.net/")
     (synopsis "C compiler suite for 8-bit microcontrollers")
     (description "SDCC is a retargetable, optimizing Standard C compiler suite

gnu/packages/flashing-tools.scm

@@ -2,7 +2,7 @@
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2016, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
@@ -84,6 +84,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages mtools)
   #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages pciutils)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -523,6 +524,162 @@ Loke and Heimdall communicate via the custom Samsung-developed protocol typicall
 referred to as the \"Odin 3 protocol\".")
     (license license:expat)))
 
+(define-public ifdtool
+  (package
+    (name "ifdtool")
+    (version "25.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://review.coreboot.org/coreboot")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              "INSTALL=install"
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/ifdtool")))
+          (delete 'configure))           ; no configure script
+      #:tests? #f))                    ; no test suite
+    (home-page "https://doc.coreboot.org/util/ifdtool/")
+    (synopsis "Intel Firmware Descriptor dumper")
+    (description "This package provides @command{ifdtool}, a program to
+dump Intel Firmware Descriptor data of an image file.")
+    (license license:gpl2)))
+
+(define-public bincfg
+  (package
+    (name "bincfg")
+    (version "25.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://review.coreboot.org/coreboot")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ; no test suite
+      #:make-flags
+      #~(list
+         (string-append "CC=" #$(cc-for-target)))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure) ; no configure script
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/bincfg")))
+          (add-after 'build 'build-binaries
+            (lambda* (#:key make-flags #:allow-other-keys)
+              (for-each
+               (lambda (target result)
+                 (apply invoke "make" (string-append "gen-" target) make-flags)
+                 (rename-file result
+                              (string-append target ".bin")))
+               (list
+                ;; generate GbE for X200
+                "gbe-ich9m"
+                ;; generate GbE for X220/x230
+                "gbe-82579LM"
+                ;; generate IFD for X200
+                "ifd-x200")
+               (list
+                "flashregion_3_gbe.bin"
+                "flashregion_3_gbe.bin"
+                "flashregion_0_fd.bin"))))
+          ;; The Makefile has no install target.
+          (replace 'install
+            (lambda _
+              (let ((bin (string-append #$output "/bin"))
+                    (lib (string-append #$output "/lib/bincfg"))
+                    (data (string-append #$output "/share/bincfg")))
+                ;; Install the program
+                (install-file "bincfg" bin)
+                ;; And its data
+                (for-each
+                 (lambda (path)
+                   (install-file path data))
+                 (append (find-files "." ".*\\.set")
+                         (find-files "." ".*\\.spec")))
+                ;; And the files generated with the data
+                (for-each
+                 (lambda (path)
+                   (install-file path lib))
+                 (find-files "." ".*\\.bin"))))))))
+    (native-inputs (list bison flex))
+    (home-page "https://coreboot.org")
+    (synopsis "Encoder/decoder for binary formats described in text files")
+    (description "
+The bincfg program comes with specifications files for the following binary
+formats:
+@itemize
+@item Various DDR3 and DDR4 SPD
+@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
+@item Configuration data for the Intel Gigabit Ethernet controller present in
+      the Intel ICH9-M chipset.
+@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
+@item Configuration data for the ITE IT8718F SuperIO
+@end itemize
+It also comes with example files generated by bincfg.")
+    (license license:gpl3+)))
+
+(define-public intelmetool
+  (package
+    (name "intelmetool")
+    (version "25.09")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://review.coreboot.org/coreboot")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f                       ;no test suite
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              "INSTALL=install"
+              (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/intelmetool")))
+          (delete 'configure) ;no configure script
+          (delete 'check))))
+    (inputs (list pciutils zlib))
+    (home-page
+     "https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
+    (synopsis "Intel Management Engine tools")
+    (description "This package provides tools for working with Intel
+Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
+@code{sudo rmmod mei} before using this tool.  Also pass
+@code{iomem=relaxed} to the Linux kernel command line.")
+    (license license:gpl2)
+
+    ;; This is obviously an Intel thing, plus it requires <cpuid.h>.
+    (supported-systems '("x86_64-linux" "i686-linux"))))
+
 (define-public me-cleaner
   (package
     (name "me-cleaner")

gnu/packages/games.scm

@@ -97,7 +97,6 @@
 ;;; Copyright © 2025 Aiden Isik <aidenisik+git@member.fsf.org>
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
-;;; Copyright © 2026 Nikita Alkhovik <forgoty13@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -115,32 +114,40 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages games)
-  #:autoload (gnu packages pascal) (fpc)
+  #:use-module (ice-9 match)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix svn-download)
+  #:use-module (guix gexp)
+  #:use-module (gnu packages)
   #:use-module (gnu packages acl)
-  #:use-module (gnu packages admin)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages algebra)
-  #:use-module (gnu packages assembly)
-  #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages avahi)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages build-tools)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages audio)
+  #:use-module (gnu packages avahi)
+  #:use-module (gnu packages assembly)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
-  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages c)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
-  #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages code)
   #:use-module (gnu packages cpp)
-  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages cyrus-sasl)
-  #:use-module (gnu packages dns)
-  #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages emulators)
   #:use-module (gnu packages flex)
@@ -195,8 +202,8 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages messaging)
   #:use-module (gnu packages mp3)
-  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages music)
+  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages netpbm)
   #:use-module (gnu packages networking)
@@ -205,6 +212,7 @@
   #:use-module (gnu packages oneapi)
   #:use-module (gnu packages opencl)
   #:use-module (gnu packages pcre)
+  #:autoload (gnu packages pascal) (fpc)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages perl-compression)
@@ -222,9 +230,9 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages regex)
   #:use-module (gnu packages ruby-xyz)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages serialization)
-  #:use-module (gnu packages shells)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages squirrel)
   #:use-module (gnu packages swig)
@@ -241,31 +249,22 @@
   #:use-module (gnu packages wget)
   #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xorg)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system haskell)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
-  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system qt)
   #:use-module (guix build-system scons)
   #:use-module (guix build-system trivial)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix svn-download)
-  #:use-module (guix utils)
-  #:use-module (ice-9 match)
   #:use-module ((srfi srfi-1) #:hide (zip))
   #:use-module (srfi srfi-26))
 
@@ -484,7 +483,7 @@ mouse and joystick control, and original music.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://gitlab.com/drummyfish/anarch")
+                      (url "https://git.sr.ht/~drummyfish/Anarch")
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -4277,11 +4276,11 @@ interface or via an external visual interface such as GNU XBoard.")
                (("TestIOTouchDragAnywhere (test_integration)" all _) _))))
          (add-before 'bootstrap 'autoreconf
            (lambda _
-             ;; automake is out of date in the source
-             ;; autoreconf updates the automake scripts
-             (invoke "autoreconf")
-             ;; Build fails when autom4te.cache exists.
-             (delete-file-recursively "autom4te.cache")
+	     ;; automake is out of date in the source
+	     ;; autoreconf updates the automake scripts
+	     (invoke "autoreconf")
+	     ;; Build fails when autom4te.cache exists.
+	     (delete-file-recursively "autom4te.cache")
              #t))
          (add-after 'install 'delete-freedinkedit-desktop
            (lambda* (#:key outputs #:allow-other-keys)
@@ -4611,105 +4610,6 @@ for common mesh file formats, and collision detection.")
     (home-page "https://irrlicht.sourceforge.io/")
     (license license:zlib)))
 
-(define-public pegasus-frontend
-  (let ((commit "c3462e68bf3a178420b44f356998255f8d82a113")
-        (revision "weekly_2024w38"))
-    (package
-      (name "pegasus-frontend")
-      (version (git-version "0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/mmatyas/pegasus-frontend")
-               (commit commit)))
-         (sha256
-          (base32 "1p350nlbif33mw5cbqxwli5yf47dxpransxlj2wp8xvh4w1rb3jx"))
-         (file-name (git-file-name name version))))
-      (build-system qt-build-system)
-      (arguments
-       (list
-        #:qtbase qtbase-5
-        #:make-flags
-        #~(list (string-append "INSTALL_DESKTOPDIR="
-                               #$output "/share/applications")
-                (string-append "INSTALL_ICONDIR="
-                               #$output "/share/icons/hicolor"))
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'copy-modules
-              (lambda* (#:key inputs #:allow-other-keys)
-                (copy-recursively #$(this-package-native-input
-                                     "SortFilterProxyModel")
-                                  "./thirdparty/SortFilterProxyModel")
-                (copy-recursively #$(this-package-native-input
-                                     "pegasus-theme-grid")
-                                  "./src/themes/pegasus-theme-grid")
-                (copy-recursively #$(this-package-native-input
-                                     "pegasus-frontend-translations") "./lang")))
-            (add-before 'check 'prepare-test-env
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  (setenv "QT_QPA_PLATFORM" "offscreen")
-                  (setenv "QT_QUICK_BACKEND" "software"))))
-            (add-after 'qt-wrap 'gst-wrap
-              (lambda* (#:key inputs #:allow-other-keys)
-                (wrap-program (string-append #$output "/bin/pegasus-fe")
-                  `("GST_PLUGIN_PATH" suffix
-                    ,(search-path-as-list '("lib/gstreamer-1.0")
-                                          (map cdr inputs)))))))))
-      (inputs (list sdl2
-                    bash-minimal
-                    qtbase-5
-                    qtsvg-5
-                    qtdeclarative-5
-                    qtgraphicaleffects
-                    qtmultimedia-5
-                    qtgamepad-5
-                    gst-plugins-base
-                    gst-plugins-bad
-                    gst-plugins-good))
-      (native-inputs (list qttools-5
-                           (origin
-                             (method git-fetch)
-                             (uri (git-reference
-                                   (url
-                                    "https://github.com/mmatyas/pegasus-frontend-translations")
-                                   (commit
-                                    "46c7cecec745bdd4c61bfc7ecb967156ad208642")))
-                             (file-name "pegasus-frontend-translations")
-                             (sha256 (base32
-                                      "0rvlx199wdrjxr8pgibga556zf4njq4w2n31fdirqgb631rgyqxd")))
-                           (origin
-                             (method git-fetch)
-                             (uri (git-reference
-                                   (url
-                                    "https://github.com/mmatyas/pegasus-theme-grid")
-                                   (commit
-                                    "5951db6f2a4fe0db6a4fd6f00da1f280cadfa536")))
-                             (file-name "pegasus-theme-grid")
-                             (sha256 (base32
-                                      "1nfnq6lppdm9ni6jk48l1i7hk90m8w2p13swl5nr4zwczln8dbz1")))
-                           (origin
-                             (method git-fetch)
-                             (uri (git-reference
-                                   (url
-                                    "https://github.com/mmatyas/SortFilterProxyModel")
-                                   (commit
-                                    "2061f8136ba372fd06c1928a610258b7d88cb144")))
-                             (file-name "SortFilterProxyModel")
-                             (sha256 (base32
-                                      "16va8fcf7v6kfm8r9zym0516qrk4vlsy5wmpd3r3002wpz8q39h2")))))
-      (synopsis
-       "Graphical frontend for launching and managing game collection")
-      (description
-       "Pegasus is a graphical frontend for browsing your game library and
-  launching all kinds of games from the same place. It's focusing on
-  customizability, cross platform support (including embedded)
-  and high performance.")
-      (home-page "https://pegasus-frontend.org")
-      (license license:gpl3+))))
-
 (define-public mars
   ;; No official release since 2013: use the latest commit.
   (let ((commit   "84664cda094efe6e49d9b1550e4f4f98c33eefa2")
@@ -6749,7 +6649,7 @@ in-window at 640x480 resolution or fullscreen.")
 (define-public warzone2100
   (package
     (name "warzone2100")
-    (version "4.6.3")
+    (version "4.6.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/warzone2100/releases/"
@@ -6765,7 +6665,7 @@ in-window at 640x480 resolution or fullscreen.")
                                  "inih" "re2" "utf8proc" "utfcpp")))))
               (sha256
                 (base32
-                  "0fmiy0pm56yy69c0nhynjdiaslwlfg8cdvfl5s78g5pzdi1y47s3"))))
+                  "02x5ihkpfkpjxwvh00d8yqzd796af7d684nk96hzhhq28qw5bb16"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~'("-GNinja"
                                            "-DWZ_DISTRIBUTOR=Guix"
@@ -6802,7 +6702,7 @@ in-window at 640x480 resolution or fullscreen.")
                   opusfile
                   physfs
                   re2
-                  sdl3
+                  sdl2
                   sqlite
                   utf8proc
                   utfcpp
@@ -9243,7 +9143,7 @@ elements to achieve a simple goal in the most complex way possible.")
 (define-public the-powder-toy
   (package
     (name "the-powder-toy")
-    (version "99.5.394")
+    (version "99.3.384")
     (source
      (origin
        (method git-fetch)
@@ -9252,7 +9152,7 @@ elements to achieve a simple goal in the most complex way possible.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wd0sg3lpl9xafyj76syvpdjh574cxjmxaf9kssfjjxs20y3hjn8"))
+        (base32 "0l067j0bbzvr0i2prxrgb0af4xdpl648x741jgnyp4bjzdbm61x7"))
        (snippet
         #~(begin (use-modules (guix build utils))
                  (substitute* "meson.build"
@@ -10243,7 +10143,7 @@ your score gets higher, you level up and the blocks fall faster.")
                                      "-DES_USE_SYSTEM_LIBRARIES=1")
            #:make-flags #~(list (string-append "PREFIX=" #$output))
            #:build-type "Release"
-           #:tests? (not (target-x86-32?))
+	   #:tests? (not (target-x86-32?))
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'fix-paths
@@ -11227,7 +11127,7 @@ levels to unlock.")
 (define-public simgear
   (package
     (name "simgear")
-    (version "2024.1.5")
+    (version "2024.1.4")
     (source
      (origin
        (method git-fetch)
@@ -11239,7 +11139,7 @@ levels to unlock.")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ygdc8xkrj7qzm9zklibb1v5w3jp718707zmiwl8fn63sxanbqsq"))
+        (base32 "1k855yxq06gv42f83c3k9hrsz05xxj6vi1c60227zm0dx3jkb4jq"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -11291,7 +11191,7 @@ and also provides the base for the FlightGear Flight Simulator.")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0hpfvacnba2kcyjwm01lkrqkz0gccvljjil8b0ai42l38hxn5r5h"))
+        (base32 "0xlpry1g5xci4qmj37rjk4sdhg9zada0vw6a047gsm7cq5p7pkxk"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -11375,12 +11275,12 @@ and also provides the base for the FlightGear Flight Simulator.")
        ("flightgear-data"
         ,(origin
            (method url-fetch)
-           (uri (string-append "https://mirrors.ibiblio.org/flightgear/ftp/release-"
+           (uri (string-append "mirror://sourceforge/flightgear/release-"
                                (version-major+minor version) "/"
                                "FlightGear-" version "-data.txz"))
            (sha256
             (base32
-             "0d81yz9jqmg2jzw5rm769pl1j18pvh2mjkx61l13kw76ja8p6159"))))))
+             "0pgwxpm5cdm0y6klrmpqspmhmqsfxshz4jljw2kd4wy18fqzd1s6"))))))
     (home-page "https://www.flightgear.org/")
     (synopsis "Flight simulator")
     (description "The goal of the FlightGear project is to create a
@@ -12284,7 +12184,7 @@ for using any UCI engine and also to connect UCI engines to Lichess and IRC.")
         (base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv"))))
     (build-system glib-or-gtk-build-system)
     (inputs (list automake autoconf pkg-config intltool
-                  gettext-minimal libtool glib gtk+-2 boost))
+		  gettext-minimal libtool glib gtk+-2 boost))
     (arguments (list #:tests? #f))  ; No tests in source.
     (home-page "http://nine-mens-morris.net/downloads.html")
     (synopsis "Implementation of the board game Nine Men's Morris")

gnu/packages/geo.scm

@@ -2936,7 +2936,7 @@ to the OSM opening hours specification.")
 (define-public josm
   (package
     (name "josm")
-    (version "19555")
+    (version "19539")
     (source (origin
               (method svn-fetch)
               (uri (svn-reference
@@ -2945,7 +2945,7 @@ to the OSM opening hours specification.")
                      (recursive? #f)))
               (sha256
                (base32
-                "0kpshdj8kf9ag7h1qqrh9jqc6c9iv8v369mk60a8g7cbzf0xpblw"))
+                "05kslpvdwl4fldjzl6m2kmqvbmjv5yvipfavg01l30ywhw2c7v7v"))
               (file-name (string-append name "-" version "-checkout"))
               (modules '((guix build utils)))
             (snippet

gnu/packages/gnome-circle.scm

@@ -39,7 +39,6 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
-  #:use-module (gnu packages ebook)
   #:use-module (gnu packages enchant)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages freedesktop)
@@ -682,7 +681,7 @@ and a high score table.")
 (define-public komikku
   (package
     (name "komikku")
-    (version "50.1.0")
+    (version "1.99.0")
     (source
      (origin
        (method git-fetch)
@@ -692,7 +691,7 @@ and a high score table.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
+         "1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -741,10 +740,8 @@ and a high score table.")
            python-cloudscraper
            python-colorthief
            python-dateparser
-           python-ebooklib
            python-emoji
            python-keyring
-           python-jxlpy
            python-lxml
            python-magic
            python-natsort
@@ -780,7 +777,7 @@ developed with the aim of being used with the Librem 5 phone.")
 (define-public komikku-servers
   (package
     (name "komikku-servers")
-    (version "50.1.0")
+    (version "1.99.0")
     (source
      (origin
        (method git-fetch)
@@ -790,7 +787,7 @@ developed with the aim of being used with the Librem 5 phone.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
+         "1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
     (build-system copy-build-system)
     (arguments
      (list

gnu/packages/gnome.scm

@@ -11258,20 +11258,20 @@ basically a text box in which notes can be written.")
 (define-public gucharmap
   (let ((unicode-files
          '(("Blocks.txt"
-            "05fbpc7miqpv7yic5xkm74ybzxkaf5r58ww21a1iwxqr3apyzvf0")
+            "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1")
            ("DerivedAge.txt"
-            "160r7wwidj3c2jl4cw3am0c5d0l7qndis9xx38h0y8fwidvdzv7q")
+            "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6")
            ("NamesList.txt"
-            "1x1smmn2kmy8clf6ny2njln75i888lidckc6ssyp2gdhgasdrkhd")
+            "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61")
            ("Scripts.txt"
-            "1grmn3bd4m0rcmz544h94kimlj3gf1f343s8177ddrxfmg9m0plz")
+            "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx")
            ("UnicodeData.txt"
-            "0327jqfw2hyq8x986cfhwrp717r2jl7ydjjwvzp7biarrcfzq7if")
+            "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap")
            ("Unihan.zip"
-            "0pjbyf77lbaxdhwidvpgp81cw13lfhlaw1ynn9vsmkssahmqp97p"))))
+            "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"))))
     (package
       (name "gucharmap")
-      (version "17.0.1")
+      (version "12.0.1")
       (source
        (origin
          (method url-fetch)
@@ -11280,19 +11280,16 @@ basically a text box in which notes can be written.")
                              name "-" version ".tar.xz"))
          (sha256
           (base32
-           "0sfixlmk7qajcvls6kv2hfczmjafjcr54aczwcdfmp5jjll4m17r"))))
-      (build-system meson-build-system)
+           "0m915hm2b2d6r3vs1l80rqpssvg78pv8j6nv54yg62kzknnqmpir"))))
+      (build-system glib-or-gtk-build-system)
       (arguments
        `(#:modules ((ice-9 match)
-                    (guix build meson-build-system)
+                    (guix build glib-or-gtk-build-system)
                     (guix build utils))
-         #:glib-or-gtk? #t
          #:configure-flags
          (list
-          "-Ducd_path=../unicode-data"
-          "-Dvapi=false"
-          ;; gtk-doc fails because it didn't generate a devhelp2 file
-          "-Ddocs=false")
+          "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
+          "--with-unicode-data=../unicode-data")
          #:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'prepare-unicode-data
@@ -11305,26 +11302,26 @@ basically a text box in which notes can be written.")
                            ',unicode-files))
                #t)))))
       (native-inputs
-        (cons* desktop-file-utils
-               (list glib "bin")
-               gobject-introspection
-               intltool
-               itstool
-               pkg-config
-               python
-               unzip
-               (map (match-lambda
-                      ((file hash)
-                       (origin
-                         (method url-fetch)
-                         (uri (string-append
-                                "https://www.unicode.org/Public/17.0.0/ucd/"
-                                file))
-                         (sha256 (base32 hash)))))
-                    unicode-files)))
+       `(("desktop-file-utils" ,desktop-file-utils)
+         ("glib:bin" ,glib "bin")       ; for glib-compile-resources.
+         ("gobject-introspection" ,gobject-introspection)
+         ("intltool" ,intltool)
+         ("itstool" ,itstool)
+         ("pkg-config" ,pkg-config)
+         ,@(map (match-lambda
+                  ((file hash)
+                   `(,file
+                     ,(origin
+                        (method url-fetch)
+                        (uri (string-append
+                              "http://www.unicode.org/Public/12.0.0/ucd/"
+                              file))
+                        (sha256 (base32 hash))))))
+                unicode-files)
+         ("unzip" ,unzip)))
       (inputs
-       (list gtk+
-             libxml2))
+       `(("gtk+" ,gtk+)
+         ("xmllint" ,libxml2)))
       (home-page "https://wiki.gnome.org/Apps/Gucharmap")
       (synopsis "Unicode character picker and font browser")
       (description

gnu/packages/gnupg.scm

@@ -43,33 +43,34 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gnupg)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages check)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
-  #:use-module (gnu packages dns)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages enlightenment)
   #:use-module (gnu packages gettext)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
-  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages popt)
   #:use-module (gnu packages pth)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages security-token)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages swig)
@@ -77,24 +78,23 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages tor)
   #:use-module (gnu packages web)
-  #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages popt)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix git-download)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
-  #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
-  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system qt)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (ice-9 match)
+  #:use-module (guix build-system meson)
   #:use-module (srfi srfi-1))
 
 (define-public libgpg-error

gnu/packages/gnuzilla.scm

@@ -605,9 +605,9 @@ in the case of Firefox, it is browser/locales/all-locales."
     "zh-TW"))
 
 ;;; Please keep these versions in sync with icedove.
-(define %icecat-base-version "140.9.1")
+(define %icecat-base-version "140.9.0")
 (define %icecat-version (string-append %icecat-base-version "-gnu1"))
-(define %icecat-build-id "20260414000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
 
 ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
 ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@@ -627,9 +627,9 @@ in the case of Firefox, it is browser/locales/all-locales."
                   "firefox-" upstream-firefox-version ".source.tar.xz"))
             (sha256
              (base32
-              "1hld2kbzvrmr7pqq0r5hw639xl8kw29lm2hsbn0m4kxang1fdlj5"))))
+              "0b79x61w51fjf12p5sr9pipg4b3fjdnbsg0j20fdai3jq6jb4wmr"))))
 
-         (gnuzilla-commit "f3595923458a5255f61a3853bd83bb5f004dc3bc")
+         (gnuzilla-commit "10a8be3fcf725ed01ffb7279ec27c2fba55dd2d2")
          (gnuzilla-source
           (origin
             (method git-fetch)
@@ -640,7 +640,7 @@ in the case of Firefox, it is browser/locales/all-locales."
                                       (string-take gnuzilla-commit 8)))
             (sha256
              (base32
-              "03kc08cvmdv3sxihf5hfhw2k91mg1y6f46b3x47p7q98phgk03cv"))))
+              "076s3zpq0cj24a2pjarb57k1xv9z45xazps8rgypzw8yc4pxi9rj"))))
 
          ;; 'search-patch' returns either a valid file name or #f, so wrap it
          ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.

gnu/packages/golang-web.scm

@@ -49,7 +49,6 @@
 ;;; Copyright © 2025 Jared Klingenberger <jkling@noreply.codeberg.org>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2026 Evgeny Pisemsky <mail@pisemsky.site>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -387,7 +386,6 @@ devices.")
             ;; - cloud.google.com/go/kms
             ;; - cloud.google.com/go/longrunning
             ;; - cloud.google.com/go/monitoring
-            ;; - cloud.google.com/go/security
             ;; - cloud.google.com/go/storage
             (for-each delete-file-recursively
                       (list "auth"
@@ -396,7 +394,6 @@ devices.")
                             "kms"
                             "longrunning"
                             "monitoring"
-                            "security"
                             "storage"))))))
     (build-system go-build-system)
     (arguments
@@ -786,51 +783,6 @@ its service definition.")
      "This package provides a Go Client Library for Cloud Monitoring API.")
     (license license:asl2.0)))
 
-(define-public go-cloud-google-com-go-security
-  (package
-    (name "go-cloud-google-com-go-security")
-    (version "1.21.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/googleapis/google-cloud-go")
-              (commit (go-version->git-ref version #:subdir "security"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1pn77lf1d22sqpkia9zccdhdihlqc48lls6y9npc2wrp4lman2kv"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet #~(begin
-                    (define (delete-all-but directory . preserve)
-                      (with-directory-excursion directory
-                        (let* ((pred (negate (cut member <>
-                                                  (cons* "." ".." preserve))))
-                               (items (scandir "." pred)))
-                          (for-each (cut delete-file-recursively <>) items))))
-                    (delete-all-but "." "security")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "cloud.google.com/go/security"
-      #:unpack-path "cloud.google.com/go"))
-    (propagated-inputs
-     (list go-cloud-google-com-go-iam
-           go-cloud-google-com-go-longrunning
-           go-github-com-googleapis-gax-go-v2
-           go-google-golang-org-api
-           go-google-golang-org-genproto
-           go-google-golang-org-genproto-googleapis-api
-           go-google-golang-org-grpc
-           go-google-golang-org-protobuf))
-    (home-page "https://cloud.google.com/go")
-    (synopsis "Google Cloud Certificate Authority API")
-    (description
-     "This package provides a Go Client Library for Certificate Authority API.")
-    (license license:asl2.0)))
-
 (define-public go-cloud-google-com-go-storage
   (package
     (name "go-cloud-google-com-go-storage")
@@ -10262,54 +10214,6 @@ Call}.")
     (propagated-inputs
      (list go-golang-org-x-net))))
 
-(define-public go-github-com-jellydator-ttlcache-v3
-  (package
-    (name "go-github-com-jellydator-ttlcache-v3")
-    (version "3.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/jellydator/ttlcache")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0c7k99d0km5vplfikb58j2wbriy3mzzrrfrc0d85x50km0y4g4ln"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/jellydator/ttlcache/v3"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-examples-and-benchmarks
-            (lambda* (#:key tests? import-path #:allow-other-keys)
-              (with-directory-excursion (string-append "src/" import-path)
-                (delete-file-recursively "bench")
-                (delete-file-recursively "examples")))))))
-    (native-inputs
-     (list go-github-com-stretchr-testify
-           go-go-uber-org-goleak))
-    (propagated-inputs
-     (list go-golang-org-x-sync))
-    (home-page "https://github.com/jellydator/ttlcache")
-    (synopsis "In-memory cache with item expiration and generics")
-    (description
-     "TTLCache is an in-memory cache with item expiration and generics which
-provides the following features:
-
-@itemize
-@item simple API
-@item type parameters
-@item item expiration and automatic deletion
-@item automatic expiration time extension on each Get call
-@item loader interface that may be used to load/lazily initialize missing
-citem items
-@item thread safety
-@item event handlers (insertion, update, and eviction)
-@item metrics
-@end itemize")
-    (license license:expat)))
-
 (define-public go-github-com-jeremija-gosubmit
   (package
     (name "go-github-com-jeremija-gosubmit")
@@ -10611,33 +10515,6 @@ jsoniter and variable type declarations (if any).  jsoniter interfaces gives
 https://github.com/flynn/noise crypto protocols.")
     (license license:expat)))
 
-(define-public go-github-com-juju-ratelimit
-  (package
-    (name "go-github-com-juju-ratelimit")
-    (version "1.0.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/juju/ratelimit")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1qbjcm4y53awkqmpxb1nm9c1xdylc44vph4mn30qjb5wrcqy7c1r"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/juju/ratelimit"))
-    (native-inputs
-     (list go-gopkg-in-check-v1))
-    (home-page "https://github.com/juju/ratelimit")
-    (synopsis "Efficient token bucket implementation")
-    (description
-     "The ratelimit package provides an efficient
-@url{http://en.wikipedia.org/wiki/Token_bucket, token bucket} implementation
-that can be used to limit the rate of arbitrary things.")
-    (license license:lgpl3)))
-
 (define-public go-github-com-julienschmidt-httprouter
   (package
     (name "go-github-com-julienschmidt-httprouter")
@@ -16098,512 +15975,6 @@ support.")
 kinds of referrer URLs (search, social, ...).")
     (license license:expat)))
 
-(define-public go-github-com-sigstore-rekor
-  (package
-    (name "go-github-com-sigstore-rekor")
-    (version "1.4.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sigstore/rekor")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1g2xma0fzy7a4nv7bj04pj9vqg4hbbz3j3jxkir0sxql5ragj36d"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/sigstore/rekor"
-      ;; XXX: Remove when all inputs are packaged.
-      #:test-subdirs
-      #~(list "pkg/events/newentry"
-              "pkg/indexstorage/mysql"
-              "pkg/pki/minisign"
-              "pkg/pki/pgp"
-              "pkg/pki/ssh"
-              "pkg/pki/tuf"
-              "pkg/pki/x509"
-              "pkg/pubsub/gcp"
-              "pkg/util")))
-    (native-inputs
-     (list go-github-com-asaskevich-govalidator
-           go-github-com-data-dog-go-sqlmock
-           go-github-com-golang-mock
-           go-github-com-google-go-cmp
-           go-github-com-spf13-cobra
-           go-github-com-spf13-pflag
-           go-github-com-spf13-viper
-           go-github-com-stretchr-testify
-           go-go-uber-org-goleak
-           go-sigs-k8s-io-release-utils))
-    (propagated-inputs
-     (list go-cloud-google-com-go-iam
-           go-github-com-asaskevich-govalidator
-           go-github-com-blang-semver
-           go-github-com-cyberphone-json-canonicalization
-           go-github-com-go-chi-chi-v5
-           go-github-com-go-openapi-errors
-           go-github-com-go-openapi-loads
-           go-github-com-go-openapi-runtime
-           go-github-com-go-openapi-spec
-           go-github-com-go-openapi-strfmt
-           go-github-com-go-openapi-swag
-           go-github-com-go-openapi-swag-conv
-           go-github-com-go-openapi-validate
-           go-github-com-go-sql-driver-mysql
-           go-github-com-go-viper-mapstructure-v2
-           go-github-com-google-trillian
-           go-github-com-grpc-ecosystem-go-grpc-middleware
-           go-github-com-hashicorp-go-cleanhttp
-           go-github-com-hashicorp-go-retryablehttp
-           go-github-com-in-toto-in-toto-golang
-           go-github-com-jedisct1-go-minisign
-           go-github-com-jmoiron-sqlx
-           go-github-com-prometheus-client-golang
-           go-github-com-redis-go-redis-v9
-           go-github-com-rs-cors
-           go-github-com-secure-systems-lab-go-securesystemslib
-           go-github-com-sigstore-protobuf-specs
-           go-github-com-sigstore-sigstore
-           go-github-com-sigstore-sigstore-pkg-signature-kms-aws
-           go-github-com-sigstore-sigstore-pkg-signature-kms-azure
-           go-github-com-sigstore-sigstore-pkg-signature-kms-gcp
-           go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault
-           go-github-com-theupdateframework-go-tuf
-           go-github-com-tink-crypto-tink-go-awskms-v2
-           go-github-com-tink-crypto-tink-go-gcpkms-v2
-           go-github-com-tink-crypto-tink-go-v2
-           go-github-com-transparency-dev-merkle
-           go-github-com-veraison-go-cose
-           go-go-uber-org-zap
-           go-golang-org-x-crypto
-           go-golang-org-x-mod
-           go-golang-org-x-net
-           go-golang-org-x-sync
-           go-google-golang-org-api
-           go-google-golang-org-genproto-googleapis-rpc
-           go-google-golang-org-grpc
-           go-google-golang-org-protobuf
-           go-gopkg-in-ini-v1
-           go-gopkg-in-yaml-v2
-           go-sigs-k8s-io-yaml
-
-           ;; TODO: Complete packaging.
-           ;; go-cloud-google-com-go-profiler
-           ;; go-cloud-google-com-go-pubsub
-           ;; go-cloud-google-com-go-pubsub-v2
-           ;; go-github-com-adamkorcz-go-fuzz-headers-1
-           ;; go-github-com-cavaliercoder-go-rpm
-           ;; go-github-com-go-redis-redismock-v9
-           ;; go-github-com-google-rpmpack
-           ;; go-github-com-sassoftware-relic
-           ;; go-github-com-sassoftware-relic-v7
-           ;; go-go-step-sm-crypto
-           #;go-gocloud-dev))
-    (home-page "https://github.com/sigstore/rekor")
-    (synopsis "Sigstore transparency log")
-    (description
-     "Rekor provides an immutable tamper-resistant ledger of metadata generated
-within a software project's supply chain.  It enables software maintainers
-and consumers to transparently record signed metadata to a ledger.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-sigstore-rekor-tiles-v2
-  (package
-    (name "go-github-com-sigstore-rekor-tiles-v2")
-    (version "2.0.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sigstore/rekor-tiles")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0z9is3mf31abzwappwp05z1pzci6f25z1ax27qgghmdisxmd3c6k"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/sigstore/rekor-tiles/v2"
-      ;; XXX: Remove when all inputs are packaged.
-      #:test-subdirs
-      #~(list "internal/algorithmregistry"
-              "internal/safeint"
-              "pkg/client/write"
-              "pkg/types/dsse"
-              "pkg/types/hashedrekord"
-              "pkg/types/verifier"
-              "pkg/verifier/certificate"
-              "pkg/verifier/publickey"
-              "pkg/verify")))
-    (native-inputs
-     (list go-github-com-go-test-deep
-           go-github-com-spf13-cobra
-           go-github-com-spf13-viper
-           go-github-com-stretchr-testify
-           go-sigs-k8s-io-release-utils))
-    (propagated-inputs
-     (list go-cloud-google-com-go-storage
-           go-github-com-aws-aws-sdk-go-v2
-           go-github-com-aws-aws-sdk-go-v2-config
-           go-github-com-aws-aws-sdk-go-v2-credentials
-           go-github-com-aws-aws-sdk-go-v2-service-s3
-           go-github-com-aws-smithy-go
-           go-github-com-cyberphone-json-canonicalization
-           go-github-com-grpc-ecosystem-go-grpc-middleware
-           go-github-com-grpc-ecosystem-go-grpc-middleware-providers-prometheus
-           go-github-com-grpc-ecosystem-go-grpc-middleware-v2
-           go-github-com-grpc-ecosystem-grpc-gateway-v2
-           go-github-com-prometheus-client-golang
-           go-github-com-secure-systems-lab-go-securesystemslib
-           go-github-com-sigstore-protobuf-specs
-           go-github-com-sigstore-sigstore
-           ;; go-github-com-sigstore-sigstore-go                 ;cycles
-           go-github-com-sigstore-sigstore-pkg-signature-kms-aws
-           go-github-com-sigstore-sigstore-pkg-signature-kms-gcp
-           go-github-com-tink-crypto-tink-go-awskms-v2
-           go-github-com-tink-crypto-tink-go-gcpkms-v2
-           go-github-com-tink-crypto-tink-go-v2
-           go-github-com-transparency-dev-formats
-           go-github-com-transparency-dev-merkle
-           go-go-opentelemetry-io-otel
-           go-go-opentelemetry-io-otel-exporters-prometheus
-           go-go-opentelemetry-io-otel-sdk-metric
-           go-golang-org-x-exp
-           go-golang-org-x-mod
-           go-golang-org-x-sync
-           go-google-golang-org-api
-           go-google-golang-org-genproto-googleapis-api
-           go-google-golang-org-grpc
-           go-google-golang-org-protobuf
-           go-k8s-io-klog-v2
-
-           ;; TODO: Complete packaging.
-           ;; go-cloud-google-com-go-spanner
-           ;; go-github-com-chainguard-dev-clog
-           ;; go-github-com-transparency-dev-tessera
-           #;go-go-step-sm-crypto))
-    (home-page "https://github.com/sigstore/rekor-tiles")
-    (synopsis "Tile-based transparency log for Sigstore")
-    (description
-     "This package provides a tile-based implementation of a transparency log
-for the Sigstore ecosystem, supporting efficient verification of log entries.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-sigstore-sigstore-go
-  (package
-    (name "go-github-com-sigstore-sigstore-go")
-    (version "1.1.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sigstore/sigstore-go")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0jr8jj4wibzxawn3dzv1j4cxmbh2b5g356mh2bqq9d0p78idf7k3"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/sigstore/sigstore-go"
-      #:embed-files #~(list ".*\\.json")
-      #:test-subdirs
-      #~(list "pkg/bundle"
-              "pkg/fulcio/certificate"
-              "pkg/tlog"
-              "pkg/tuf")))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (propagated-inputs
-     (list go-github-com-cyberphone-json-canonicalization
-           go-github-com-digitorus-timestamp
-           go-github-com-go-openapi-runtime
-           go-github-com-go-openapi-strfmt
-           go-github-com-go-openapi-swag-conv
-           go-github-com-google-certificate-transparency-go
-           go-github-com-in-toto-attestation
-           go-github-com-in-toto-in-toto-golang
-           go-github-com-secure-systems-lab-go-securesystemslib
-           go-github-com-sigstore-protobuf-specs
-           go-github-com-sigstore-rekor
-           go-github-com-sigstore-rekor-tiles-v2
-           go-github-com-sigstore-sigstore
-           go-github-com-sigstore-timestamp-authority-v2
-           go-github-com-theupdateframework-go-tuf-v2
-           go-golang-org-x-crypto
-           go-golang-org-x-mod
-           go-google-golang-org-protobuf))
-    (home-page "https://github.com/sigstore/sigstore-go")
-    (synopsis "Go client library for Sigstore")
-    (description
-     "This package provides a Go client library for Sigstore, enabling
-verification of signatures and attestations produced by Sigstore tools.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-sigstore-sigstore-pkg-signature-kms-aws
-  (package
-    (name "go-github-com-sigstore-sigstore-pkg-signature-kms-aws")
-    (version "1.10.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sigstore/sigstore")
-              (commit (go-version->git-ref version
-                                           #:subdir
-                                           "pkg/signature/kms/aws"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0shnvcgz4g7v65biwraahjrbsmr13qmb903al50giak2694qhyyk"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet
-        #~(begin
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but "." "pkg")
-            (delete-all-but "pkg" "signature")
-            (delete-all-but "pkg/signature" "kms")
-            (delete-all-but "pkg/signature/kms" "aws")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/sigstore/sigstore/pkg/signature/kms/aws"
-      #:unpack-path "github.com/sigstore/sigstore"))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (propagated-inputs
-     (list go-github-com-aws-aws-sdk-go-v2
-           go-github-com-aws-aws-sdk-go-v2-config
-           go-github-com-aws-aws-sdk-go-v2-service-kms
-           go-github-com-jellydator-ttlcache-v3
-           go-github-com-sigstore-sigstore))
-    (home-page "https://github.com/sigstore/sigstore")
-    (synopsis "Utilities related to AWS KMS")
-    (description
-     "Package aws implement the interface with Amazon AWS KMS service.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-sigstore-sigstore-pkg-signature-kms-azure
-  (package
-    (name "go-github-com-sigstore-sigstore-pkg-signature-kms-azure")
-    (version "1.10.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sigstore/sigstore")
-              (commit (go-version->git-ref version
-                                           #:subdir
-                                           "pkg/signature/kms/azure"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0shnvcgz4g7v65biwraahjrbsmr13qmb903al50giak2694qhyyk"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet
-        #~(begin
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but "." "pkg")
-            (delete-all-but "pkg" "signature")
-            (delete-all-but "pkg/signature" "kms")
-            (delete-all-but "pkg/signature/kms" "azure")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/sigstore/sigstore/pkg/signature/kms/azure"
-      #:unpack-path "github.com/sigstore/sigstore"))
-    (propagated-inputs
-     (list go-github-com-azure-azure-sdk-for-go-sdk-azcore
-           go-github-com-azure-azure-sdk-for-go-sdk-azidentity
-           go-github-com-azure-azure-sdk-for-go-sdk-security-keyvault-azkeys
-           go-github-com-go-jose-go-jose-v4
-           go-github-com-google-go-cmp
-           go-github-com-jellydator-ttlcache-v3
-           go-github-com-sigstore-sigstore
-           go-golang-org-x-crypto))
-    (home-page "https://github.com/sigstore/sigstore")
-    (synopsis "Utilities related to Microsoft Azure KMS")
-    (description
-     "Package azure implement the interface with Microsoft Azure KMS
-service.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-sigstore-sigstore-pkg-signature-kms-gcp
-  (package
-    (name "go-github-com-sigstore-sigstore-pkg-signature-kms-gcp")
-    (version "1.10.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sigstore/sigstore")
-              (commit (go-version->git-ref version
-                                           #:subdir
-                                           "pkg/signature/kms/gcp"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0shnvcgz4g7v65biwraahjrbsmr13qmb903al50giak2694qhyyk"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet
-        #~(begin
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but "." "pkg")
-            (delete-all-but "pkg" "signature")
-            (delete-all-but "pkg/signature" "kms")
-            (delete-all-but "pkg/signature/kms" "gcp")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/sigstore/sigstore/pkg/signature/kms/gcp"
-      #:unpack-path "github.com/sigstore/sigstore"))
-    (propagated-inputs
-     (list go-cloud-google-com-go-kms
-           go-github-com-jellydator-ttlcache-v3
-           go-github-com-sigstore-sigstore
-           go-golang-org-x-oauth2
-           go-google-golang-org-api
-           go-google-golang-org-protobuf))
-    (home-page "https://github.com/sigstore/sigstore")
-    (synopsis "Utilities related to Google Cloud Platform KMS")
-    (description
-     "Package gcp implement the interface with Google Cloud KMS service.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault
-  (package
-    (name "go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault")
-    (version "1.10.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sigstore/sigstore")
-              (commit (go-version->git-ref version
-                                           #:subdir
-                                           "pkg/signature/kms/hashivault"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0shnvcgz4g7v65biwraahjrbsmr13qmb903al50giak2694qhyyk"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet
-        #~(begin
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but "." "pkg")
-            (delete-all-but "pkg" "signature")
-            (delete-all-but "pkg/signature" "kms")
-            (delete-all-but "pkg/signature/kms" "hashivault")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/sigstore/sigstore/pkg/signature/kms/hashivault"
-      #:unpack-path "github.com/sigstore/sigstore"))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (propagated-inputs
-     (list go-github-com-hashicorp-vault-api
-           go-github-com-jellydator-ttlcache-v3
-           go-github-com-mitchellh-go-homedir
-           go-github-com-sigstore-sigstore))
-    (home-page "https://github.com/sigstore/sigstore")
-    (synopsis "Utilities related to Hashivault KMS")
-    (description
-     "Package hashivault implement the interface with
-@url{https://www.hashicorp.com/en/products/vault HashiCorp Vault} KMS
-service.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-sigstore-timestamp-authority-v2
-  (package
-    (name "go-github-com-sigstore-timestamp-authority-v2")
-    (version "2.0.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sigstore/timestamp-authority")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1pgdxwkyrl10ayhw02n72r02q362gxg7110l9h9isiyqwbrmw2lp"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/sigstore/timestamp-authority/v2"
-      #:embed-files #~(list ".*\\.json")
-      #:test-subdirs #~(list "pkg/client" "pkg/x509")))
-    (native-inputs
-     (list go-github-com-go-playground-validator-v10
-           go-github-com-google-go-cmp
-           go-github-com-prometheus-client-golang
-           go-github-com-sigstore-sigstore
-           go-github-com-spf13-cobra
-           go-github-com-spf13-pflag
-           go-github-com-spf13-viper
-           go-github-com-tink-crypto-tink-go-v2
-           go-sigs-k8s-io-release-utils))
-    (propagated-inputs
-     (list go-cloud-google-com-go-security
-           go-github-com-beevik-ntp
-           go-github-com-digitorus-pkcs7
-           go-github-com-digitorus-timestamp
-           go-github-com-go-chi-chi
-           go-github-com-go-openapi-errors
-           go-github-com-go-openapi-loads
-           go-github-com-go-openapi-runtime
-           go-github-com-go-openapi-spec
-           go-github-com-go-openapi-strfmt
-           go-github-com-go-openapi-swag
-           go-github-com-pkg-errors
-           go-github-com-rs-cors
-           go-github-com-sigstore-sigstore-pkg-signature-kms-aws
-           go-github-com-sigstore-sigstore-pkg-signature-kms-azure
-           go-github-com-sigstore-sigstore-pkg-signature-kms-gcp
-           go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault
-           go-github-com-tink-crypto-tink-go-awskms-v2
-           go-github-com-tink-crypto-tink-go-gcpkms-v2
-           go-github-com-tink-crypto-tink-go-hcvault-v2
-           go-github-com-urfave-negroni
-           ;; go-go-step-sm-crypto      ;not packaged yet in Guix
-           go-sigs-k8s-io-yaml))
-    (home-page "https://github.com/sigstore/timestamp-authority")
-    (synopsis "RFC 3161 timestamp verification for Sigstore")
-    (description
-     "This package provides timestamp verification functionality for the
-Sigstore ecosystem, implementing RFC 3161 timestamp response validation.")
-    (license license:asl2.0)))
-
 (define-public go-github-com-shurcool-githubv4
   (package
     (name "go-github-com-shurcool-githubv4")
@@ -17636,90 +17007,6 @@ Features:
 @end itemize")
     (license license:expat)))
 
-(define-public go-github-com-tink-crypto-tink-go-awskms-v2
-  (package
-    (name "go-github-com-tink-crypto-tink-go-awskms-v2")
-    (version "2.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tink-crypto/tink-go-awskms")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0crsky461yyvl04g0gbsz9gh2zmlmgd5li5qk4k7zvmj103gmwlr"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/tink-crypto/tink-go-awskms/v2"))
-    (propagated-inputs
-     (list go-github-com-aws-aws-sdk-go
-           go-github-com-tink-crypto-tink-go-v2))
-    (home-page "https://github.com/tink-crypto/tink-go-awskms")
-    (synopsis "Tink Go AWS KMS extension")
-    (description
-     "This is an extension to the @url{https://github.com/tink-crypto/tink-go,
-Tink Go} library that provides support for AWS KMS.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-tink-crypto-tink-go-gcpkms-v2
-  (package
-    (name "go-github-com-tink-crypto-tink-go-gcpkms-v2")
-    (version "2.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tink-crypto/tink-go-gcpkms")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0hf31f26lmpg81k64flsvcx83ngkhazkkf792i5qkq14q4ndsdhw"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/tink-crypto/tink-go-gcpkms/v2"))
-    (propagated-inputs
-     (list go-github-com-tink-crypto-tink-go-v2
-           go-google-golang-org-api))
-    (home-page "https://github.com/tink-crypto/tink-go-gcpkms")
-    (synopsis "Tink Go Google Cloud KMS extension")
-    (description
-     "This is an extension to the @url{https://github.com/tink-crypto/tink-go,
-Tink Go} library that provides support for Google Cloud KMS.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-tink-crypto-tink-go-hcvault-v2
-  (package
-    (name "go-github-com-tink-crypto-tink-go-hcvault-v2")
-    (version "2.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tink-crypto/tink-go-hcvault")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ifwxrsyynkss652wnn2ivhfj8n84m8rz7fjpi8gcx2cppmx9zrv"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/tink-crypto/tink-go-hcvault/v2"))
-    (propagated-inputs
-     (list go-github-com-hashicorp-vault-api
-           go-github-com-tink-crypto-tink-go-v2))
-    (home-page "https://github.com/tink-crypto/tink-go-hcvault")
-    (synopsis "Tink Go HashiCorp Vault extension")
-    (description
-     "This is an extension to the @url{https://github.com/tink-crypto/tink-go,
-Tink Go} library that provides support for HashiCorp Vault.")
-    (license license:asl2.0)))
-
 (define-public go-github-com-tj-go-elastic
   (package
     (name "go-github-com-tj-go-elastic")
@@ -22482,7 +21769,6 @@ feature set and features are added on as the need arises.")
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.25
       #:build-flags #~(list (string-append "-ldflags="
                                            "-X main.lyrebirdVersion="
                                            #$version " -s -w"))

gnu/packages/golang-xyz.scm

@@ -74,7 +74,6 @@
 ;;; Copyright © 2025 Aleksandr Lebedev <alex.lebedev2003@icloud.com>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
-;;; Copyright © 2026 Evgeny Pisemsky <mail@pisemsky.site>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;

gnu/packages/golang.scm

@@ -1022,6 +1022,56 @@ in the style of communicating sequential processes (@dfn{CSP}).")
           (map (lambda (suffix) (string-append "armv9" suffix "-a"))
                '("" ".1" ".2" ".3" ".4" ".5"))))
 
+(define-public go-1.23
+  (package
+    (inherit go-1.22)
+    (name "go")
+    (version "1.23.12")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/golang/go")
+             (commit (string-append "go" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0nxcp8wikn93zxipm829dyyagwys13yhf452ai357wzbdzqihm7x"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments go-1.22)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (replace 'disable-more-tests
+              (lambda _
+                #$@(cond
+                     ((target-aarch64?)
+                      ;; https://go-review.googlesource.com/c/go/+/151303
+                      ;; This test is known buggy on aarch64 and is enabled and
+                      ;; disabled upstream with some regularity.
+                      #~((substitute* "src/plugin/plugin_test.go"
+                           (("package plugin_test")
+                            (string-append "// +build !linux linux,!arm64\n\n"
+                                           "package plugin_test")))))
+                     ((target-arm32?)
+                      ;; This test fails when run on aarch64-linux.
+                      #~((substitute* "src/cmd/link/internal/ld/elf_test.go"
+                           (("TestElfBindNow.*" all)
+                            (string-append
+                              all
+                              "        if runtime.GOARCH == \"arm\" {\n"
+                              "                t.Skipf(\"skipping; flaky on armhf\")\n"
+                              "        }\n")))))
+                     (else (list #t)))))))))
+    (properties
+     `((compiler-cpu-architectures
+         ("aarch64" ,@%go-1.23-arm64-micro-architectures)
+         ("armhf" ,@%go-1.17-arm-micro-architectures)
+         ("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)
+         ("x86_64" ,@%go-1.18-x86_64-micro-architectures))))
+    (native-inputs
+     ;; setarch was added to the tsan test suite in 1.23.12
+     `(("go" ,util-linux)
+       ,@(package-native-inputs go-1.22)))))
+
 (define-public go-1.24
   (package
     (inherit go-1.22)
@@ -1189,6 +1239,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
 (define-public go-std-1.20 (make-go-std go-1.20))
 (define-public go-std-1.21 (make-go-std go-1.21))
 (define-public go-std-1.22 (make-go-std go-1.22))
+(define-public go-std-1.23 (make-go-std go-1.23))
 (define-public go-std-1.24 (make-go-std go-1.24))
 (define-public go-std-1.25 (make-go-std go-1.25))
 (define-public go-std-1.26 (make-go-std go-1.26))

gnu/packages/gstreamer.scm

@@ -129,7 +129,7 @@
            libxv
            mesa
            sdl
-           v4l-utils))
+           v4l-utils-minimal))
     (synopsis "1394-Based Digital Camera Control Library")
     (description "LibDC1394 is a library that provides functionality to control
 any camera that conforms to the 1394-Based Digital Camera Specification written
@@ -721,7 +721,7 @@ for the GStreamer multimedia library.")
            speex
            taglib
            twolame
-           v4l-utils
+           v4l-utils-minimal
            wavpack
            zlib))
     (propagated-inputs
@@ -942,7 +942,7 @@ model to base your own plug-in on, here it is.")
             tinyalsa
             transcode
             usrsctp
-            v4l-utils
+            v4l-utils-minimal
             vo-aacenc
             vo-amrwbenc
             vulkan-headers

gnu/packages/guile-xyz.scm

@@ -5787,43 +5787,6 @@ reading and writing PNG data, as well as some graphic primitives and basic image
 processing filters.")
     (license license:gpl3+)))
 
-(define-public guile-pnm
-  (package
-    (name "guile-pnm")
-    (version "0.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/artyom-poptsov/guile-pnm")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1yvsni4hll20g99zq4wl734f9i8gpjr1sqsnk3a93k2dd7b6ymac"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~(list "GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
-    (native-inputs (list autoconf
-                         automake
-                         pkg-config
-                         texinfo
-                         ;; needed when cross-compiling.
-                         guile-3.0
-                         guile-lib
-                         guile-smc))
-    (inputs (list guile-3.0 guile-lib))
-    (propagated-inputs (list guile-smc))
-    (home-page "https://github.com/artyom-poptsov/guile-pnm")
-    (synopsis "NetBPM (PNM) library for GNU Guile")
-    (description
-     "@code{guile-pnm} is a GNU Guile library for working with the
-@url{https://en.wikipedia.org/wiki/Netpbm, NetPBM} format (also known as PNM),
-including portable bitmap (PBM), portable graymap (PGM) and portable
-pixel (PPM) variants.")
-    (license license:gpl3+)))
-
 (define-public guile-cv
   (package
     (name "guile-cv")

gnu/packages/image-viewers.scm

@@ -669,7 +669,7 @@ and WebP.")
 (define-public mcomix
   (package
     (name "mcomix")
-    (version "3.1.1")
+    (version "3.1.0")
     (source
      (origin
        (method url-fetch)
@@ -677,7 +677,7 @@ and WebP.")
                            "mcomix-" version ".tar.gz"))
        (sha256
         (base32
-         "1y6fps1fbzjc4sdm381432zvrq97iadbz4yyxxsfnzf0ggnsl2m1"))))
+         "09y4nhlcqvvhz0wscx4zpqxmyhiwh8wrjnhk52awxhzvgyx6wa7r"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -720,14 +720,8 @@ and WebP.")
                (wrap-program prog
                  `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
     (native-inputs (list python-setuptools))
-    (inputs (list bash-minimal
-                  gobject-introspection
-                  gtk+
-                  p7zip
-                  python
-                  python-pillow
-                  python-pycairo
-                  python-pygobject))
+    (inputs
+     (list bash-minimal p7zip python python-pillow python-pygobject python-pycairo gtk+))
     (home-page "https://sourceforge.net/p/mcomix/wiki/Home/")
     (synopsis "Image viewer for comics")
     (description "MComix is a customizable image viewer that specializes as

gnu/packages/librewolf.scm

@@ -125,14 +125,14 @@
   ;; ex:
   ;; tar xf /gnu/store/...-firefox-123.4.source.tar.xz -O \
   ;;     firefox-123.4/browser/locales/l10n-changesets.json | grep revision
-  (let ((commit "0245ffb160688061f0e0c67ea488bcdfdacbeca4"))
+  (let ((commit "d1394212aed0ce0063c0f818aa236e7d4f955ac9"))
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/mozilla-l10n/firefox-l10n.git")
             (commit commit)))
       (file-name (git-file-name "firefox-l10n" commit))
-      (sha256 (base32 "0y8xdxql04yys0wj685v4yp3kmx1ivnndg6z11vam8vszh0j7ak6")))))
+      (sha256 (base32 "16s515xf0i7a7acv0m1bbgflbdx9a87b1dcg7q3yswym8x1bhvaj")))))
 
 (define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n)
   (let* ((ff-src (firefox-source-origin
@@ -244,17 +244,17 @@
 ;; It's used for cache validation and therefore can lead to strange bugs.
 ;; ex: date '+%Y%m%d%H%M%S'
 ;; or: (format-time-string "%Y%m%d%H%M%S")
-(define %librewolf-build-id "20260409162101")
+(define %librewolf-build-id "20260326135749")
 
 (define-public librewolf
   (package
     (name "librewolf")
-    (version "149.0.2-2")
+    (version "149.0-1")
     (source
      (make-librewolf-source
       #:version version
-      #:firefox-hash "1kkhg3lgyakinn5ankxrlxbf39wi61mqbhwrj1l4q5l7y0n1m4va"
-      #:librewolf-hash "1bai8g2kc9snck2f724al29q6r57vkj3d7v58rf0mgzpqzvwnw5f"
+      #:firefox-hash "12jb930qhqhpzjpn5smms7g4n6y40zvxcrg8w42696wxk7pgsqdq"
+      #:librewolf-hash "0igv0fr0vl2nf5rlgnidfz2a3gh55bsqwcray0jg7x2kl6qnkzwm"
       #:l10n firefox-l10n))
     (build-system gnu-build-system)
     (arguments

gnu/packages/linux.scm

@@ -104,7 +104,9 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages linux)
+  #:use-module (gnu packages)
   #:use-module (gnu packages acl)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages apparmor)
@@ -118,20 +120,19 @@
   #:use-module (gnu packages boost)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages check)
-  #:use-module (gnu packages compression)
   #:use-module (gnu packages cpio)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages cryptsetup)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages disk)
-  #:use-module (gnu packages dlang)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages dlang)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
@@ -146,7 +147,6 @@
   #:use-module (gnu packages golang)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
-  #:use-module (gnu packages groff)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
@@ -154,8 +154,8 @@
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages kde-frameworks)
-  #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages libedit)
+  #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages libusb)
@@ -172,8 +172,8 @@
   #:use-module (gnu packages nss)
   #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages oneapi)
-  #:use-module (gnu packages pciutils)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pciutils)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages polkit)
   #:use-module (gnu packages popt)
@@ -192,12 +192,9 @@
   #:use-module (gnu packages rust-sources)
   #:use-module (gnu packages samba)
   #:use-module (gnu packages sdl)
-  #:use-module (gnu packages selinux)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages slang)
-  #:use-module (gnu packages sphinx)
   #:use-module (gnu packages sqlite)
-  #:use-module (gnu packages swig)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
@@ -206,36 +203,39 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages vulkan)
   #:use-module (gnu packages web)
-  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages)
+  #:use-module (gnu packages groff)
+  #:use-module (gnu packages selinux)
+  #:use-module (gnu packages sphinx)
+  #:use-module (gnu packages swig)
+  #:use-module (guix platform)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
-  #:use-module (guix build-system linux-module)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix build-system qt)
   #:use-module (guix build-system trivial)
-  #:use-module (guix deprecation)    ;for libcap/next
+  #:use-module (guix build-system linux-module)
   #:use-module (guix download)
-  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix monads)
   #:use-module (guix packages)
-  #:use-module (guix platform)
+  #:use-module (guix gexp)
   #:use-module (guix store)
+  #:use-module (guix monads)
   #:use-module (guix utils)
-  #:use-module (ice-9 match)
-  #:use-module (ice-9 regex)
+  #:use-module (guix deprecation)    ;for libcap/next
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-2)
   #:use-module (srfi srfi-26)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 regex)
   #:export (customize-linux
             make-defconfig))
 
@@ -5000,6 +5000,7 @@ configuration and monitoring interfaces.")
                (with-directory-excursion "./python" (python-inst ,python))
                #t))))))))
 
+(define-public libnl-python2 (libnl-python-package "python2"))
 (define-public libnl-python3 (libnl-python-package "python3"))
 
 (define-public iw

gnu/packages/lisp-xyz.scm

@@ -12982,8 +12982,8 @@ score.  When evaluated, the musical score is rendered to an image.")
   (sbcl-package->ecl-package sbcl-cmn))
 
 (define-public sbcl-coalton
-  (let ((commit "bf475c8c53e02a2e0cb29deab4d101d25743bfca")
-        (revision "5"))
+  (let ((commit "939342495f55991812c2c2767322c5e51e755216")
+        (revision "4"))
     (package
       (name "sbcl-coalton")
       (version (git-version "0.0.1" revision commit))
@@ -12995,7 +12995,7 @@ score.  When evaluated, the musical score is rendered to an image.")
                (commit commit)))
          (file-name (git-file-name "cl-coalton" version))
          (sha256
-          (base32 "0zrp2s82n2mxx7knbnbsdj64zar21nnnf8iwzrqzs4g3v6xpyz9z"))))
+          (base32 "08qzj3v4fvn9h87whyqg650rpap8lva7jr94d1akv6m2z62l5q68"))))
       (build-system asdf-build-system/sbcl)
       (native-inputs
        (list sbcl-fiasco))
@@ -27700,6 +27700,49 @@ adaptations.")
 (define-public ecl-radiance
   (sbcl-package->ecl-package sbcl-radiance))
 
+(define-public sbcl-radiance-contribs
+  (let ((commit "710b3e1f9971e48368d52eea0b407f2e8f510981")
+        (revision "1"))
+    (package
+      (name "sbcl-radiance-contribs")
+      (version (git-version "1.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://codeberg.org/shirakumo/radiance-contribs")
+               (commit commit)))
+         (file-name (git-file-name "radiance-contribs" version))
+         (sha256
+          (base32 "08ivnd7a6vfciqna680qpx6zj6vw9xcbrzq29iz3x7x9sp1pqgq3"))))
+      (build-system asdf-build-system/sbcl)
+      (arguments
+       ;; TODO: Include more contribs.
+       `(#:asd-systems '("r-clip"
+                         "i-log4cl"
+                         "i-sqlite"
+                         "r-data-model"
+                         "r-simple-rate"
+                         "r-welcome")))
+      (inputs
+       (list sbcl-radiance
+             sbcl-cffi
+             sbcl-clip
+             sbcl-cl-sqlite
+             sbcl-log4cl))
+      (home-page "https://shirakumo.github.io/radiance/")
+      (synopsis "Standard implementations and drivers for the radiance interfaces")
+      (description
+       "This is a collection of useful helper modules and standard
+implementations for Radiance interfaces.")
+      (license license:zlib))))
+
+(define-public cl-radiance-contribs
+  (sbcl-package->cl-source-package sbcl-radiance-contribs))
+
+(define-public ecl-radiance-contribs
+  (sbcl-package->ecl-package sbcl-radiance-contribs))
+
 (define-public sbcl-random-sample
   (let ((commit "46b70374ed796b84ea003e83c1db97b0caf97e22")
         (revision "0"))

gnu/packages/lisp.scm

@@ -33,7 +33,6 @@
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
 ;;; Copyright © 2024 David Pflug <david@pflug.io>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2026 Igorj Gorjaĉev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -913,7 +912,7 @@ assembler, PEG) is less than 1MB.")
 (define-public jpm
   (package
     (name "jpm")
-    (version "1.2.0")
+    (version "1.1.0")
     (source
      (origin
        (method git-fetch)
@@ -922,7 +921,7 @@ assembler, PEG) is less than 1MB.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "06ywq1ajvqx3lfpldwbakc21hxhb313r0196xnmrrbb6k1f8hsfx"))))
+        (base32 "05rdxigmiy7vf93s16a8n2029lq33073jccz1rjl4iisxj6piw4l"))))
     (build-system copy-build-system)
     (arguments
      (list

gnu/packages/machine-learning.scm

@@ -51,6 +51,24 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages machine-learning)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix svn-download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system ocaml)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system r)
+  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages assembly)
   #:use-module (gnu packages audio)
@@ -71,7 +89,6 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages digest)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gcc)
@@ -137,23 +154,6 @@
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system cargo)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system ocaml)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system r)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix svn-download)
-  #:use-module (guix utils)
   #:use-module (ice-9 match))
 
 (define-public dlpack
@@ -4666,7 +4666,7 @@ different backends")
 (define-public koboldcpp
   (package
     (name "koboldcpp")
-    (version "1.111.2")
+    (version "1.110")
     (source
      (origin
        (method git-fetch)
@@ -4682,7 +4682,7 @@ different backends")
             (delete-file-recursively "lib")
             (for-each delete-file (find-files "." "\\.(dll|exe|bat)$"))))
        (sha256
-        (base32 "0mlq0p14p5vhc0pknkjidcw885mr0c92881lp629n44qxdf7dx8i"))))
+        (base32 "1lfdfsk227qgk44sq10qa93cl5s221djnpj82wg6b38dg7yy0b62"))))
     (build-system gnu-build-system)
     (arguments
      (list

gnu/packages/mail.scm

@@ -68,7 +68,6 @@
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2026 Sergey Trofimov <sarg@sarg.org.ru>
 ;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
-;;; Copyright © 2026 Herman Rimm <herman@rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4745,7 +4744,7 @@ on RFC 3501 and original @code{imaplib} module.")
 (define-public rspamd
   (package
     (name "rspamd")
-    (version "3.14.3")
+    (version "3.12.1")
     (source
      (origin
        (method git-fetch)
@@ -4753,7 +4752,7 @@ on RFC 3501 and original @code{imaplib} module.")
              (url "https://github.com/rspamd/rspamd")
              (commit version)))
        (sha256
-        (base32 "1yh3933ak7qzzys6yzixrs8pmmsh16ny23im958h8rqg0xrq3mcy"))
+        (base32 "0li75dqqy0irrvv2jddmll2adf15cywif982ijj034hldg9162bc"))
        (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
@@ -4784,11 +4783,11 @@ on RFC 3501 and original @code{imaplib} module.")
     (native-inputs
      (list pkg-config))
     (synopsis "Spam filtering system")
-    (description
-     "Rspamd is a spam filter that evaluates email messages by a number
-of rules including: regular expressions, statistical analysis, and URL
-blacklists.  Rspamd gives each message a spam score, e.g., for further
-processing by an MTA.")
+    (description "Rspamd is an advanced spam filtering system that
+allows evaluation of messages by a number of rules including regular
+expressions, statistical analysis and custom services such as URL
+black lists.  Each message is analysed by Rspamd and given a spam
+score.")
     (home-page "https://www.rspamd.com/")
     (license license:asl2.0)))
 

gnu/packages/markup.scm

@@ -134,7 +134,7 @@ specific format when needed.")
                   (delete 'configure)) ; no configure script
        #:test-target "test"))
     (native-inputs
-     `(("python" ,python-minimal-wrapper)
+     `(("python" ,python-2)
        ("tidy" ,tidy-html)))
     (synopsis "Markdown processing library")
     (description "Hoedown is a standards compliant, fast, secure markdown

gnu/packages/maths.scm

@@ -487,9 +487,8 @@ programming languages.")
                  ""))))
           ;; The 'check phase requires test programs build using 'build-tests'.
           (add-before 'check 'build-tests
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "cmake" "--build" "." "--target" "build-tests")))))))
+            (lambda _
+              (invoke "cmake" "--build" "." "--target" "build-tests"))))))
     (inputs (list cadical-2.1
                   cln
                   cryptominisat
@@ -8806,7 +8805,7 @@ and comparisons are supported.")
          "1fwlgbcdxz30dzsqw3y1b6ic1rhzfadghj7cq7yxsj14npgnwzga"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list pkg-config python-minimal-wrapper))
+     (list pkg-config python-2)) ;for tests; syntax incompatible with Python 3
     (inputs
      (list openblas suitesparse))
     (arguments

gnu/packages/messaging.scm

@@ -2690,6 +2690,23 @@ validating international phone numbers.")
    (home-page "https://github.com/google/libphonenumber")
    (license license:asl2.0)))
 
+(define-public libphonenumber-8.11
+  (package/inherit libphonenumber
+    (name (package-name libphonenumber))
+    (version "8.11.5")
+    (source (origin
+              (inherit (package-source libphonenumber))
+              (uri (git-reference
+                    (url "https://github.com/google/libphonenumber")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1y4ivhy3kwgggrr3g521zaf97334aan0yqpzzryss80k326q5rhf"))))
+    (inputs
+     (modify-inputs inputs
+       (delete "abseil-cpp" "icedtea")))))
+
 (define-public chatty
   (package
     (name "chatty")

gnu/packages/mpd.scm

@@ -531,47 +531,6 @@ MPRIS 2 support.")
     (home-page "https://github.com/eonpatapon/mpDris2")
     (license license:gpl3+)))
 
-(define-public mpdris2-rs
-  (package
-    (name "mpdris2-rs")
-    (version "1.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/szclsya/mpdris2-rs")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "023m4g1kgr2q2vllaij7nlxd5gp3vklvbhf5drymgqz3pcmslb52"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'install-systemd-unit
-            (lambda _
-              (let ((unit-dir (in-vicinity #$output "lib/systemd/user/")))
-                (substitute* "misc/mpdris2-rs.service"
-                  (("/usr/local/bin/mpdris2-rs")
-                   (in-vicinity #$output "bin/mpdris2-rs")))
-                (install-file "misc/mpdris2-rs.service" unit-dir)))))))
-    (inputs (cargo-inputs 'mpdris2-rs))
-    (home-page "https://github.com/szclsya/mpdris2-rs")
-    (synopsis "Exposing MPRIS V2.2 D-Bus interface for mpd")
-    (description
-     "A lightweight implementation of MPD to D-Bus bridge, which exposes MPD
-player and playlist information onto MPRIS2 interface so other programs can use
-this generic interface to retrieve MPD's playback state.
-
-Distinctively, mpdris2-rs uses MPD protocol's native
-@command{readpicture}/@command{albumart} methods to fetch album arts.  This
-means mpdris2-rs won't need any access to your local filesystem (apart from
-your @env{XDG_RUNTIME_DIR} for temporarily storing fetched albumarts) and can
-provide album arts even with remote MPD servers and Internet radios.")
-    (license license:gpl3)))
-
 (define-public cantata
   (package
     (name "cantata")

gnu/packages/networking.scm

@@ -89,13 +89,33 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages networking)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system perl)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system qt)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages aidc)
   #:use-module (gnu packages algebra)
-  #:use-module (gnu packages assembly)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autogen)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages assembly)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
@@ -111,7 +131,6 @@
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages dns)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
@@ -135,21 +154,21 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages kde-frameworks)
-  #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libbsd)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages logging)
-  #:use-module (gnu packages lua)
   #:use-module (gnu packages lxqt)
+  #:use-module (gnu packages lua)
+  #:use-module (gnu packages kerberos)
   #:use-module (gnu packages man)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages nettle)
-  #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages openldap)
+  #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages password-utils)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
@@ -185,25 +204,6 @@
   #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system go)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system perl)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system qt)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (ice-9 match))
 
 (define-public usrsctp

gnu/packages/node.scm

@@ -31,10 +31,20 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages node)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix build utils) #:select (alist-replace))
+  #:use-module (guix packages)
+  #:use-module (guix derivations)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system node)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages libevent)
@@ -45,16 +55,6 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
-  #:use-module (gnu packages)
-  #:use-module ((guix build utils) #:select (alist-replace))
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system node)
-  #:use-module (guix derivations)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26))

gnu/packages/package-management.scm

@@ -2620,14 +2620,14 @@ the boot loader configuration.")
 (define-public flatpak
   (package
     (name "flatpak")
-    (version "1.16.6")
+    (version "1.16.5")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
                            version "/flatpak-" version ".tar.xz"))
        (sha256
-        (base32 "1hzfb337cyg5h4k3rh30jjzccfwazm3gx9lj9prh5dj4zvryfqqy"))
+        (base32 "0mn1rf1q0r8bhqkm84f1vj3lvl63ccalnc4p98k6qxj92rcfj853"))
        (patches
         (search-patches "flatpak-fix-fonts-icons.patch"
                         "flatpak-fix-icon-validation.patch"

gnu/packages/patches/bam-python3-compat.patch

@@ -1,291 +0,0 @@
-This patch is taken from the upstream repository
-
-From b937572d157e660af98e224523ffb3fe5810ed2c Mon Sep 17 00:00:00 2001
-Message-ID: <b937572d157e660af98e224523ffb3fe5810ed2c.1776087342.git.efraim@flashner.co.il>
-From: Felix Geyer <debfx@fobos.de>
-Date: Fri, 30 Aug 2019 19:08:35 +0200
-Subject: [PATCH] Port scripts to Python 3
-
-Compatibility with Python 2 is preserved.
----
- scripts/gendocs.py |  2 +-
- scripts/test.py    | 67 +++++++++++++++++++++++-----------------------
- scripts/tinydoc.py | 23 ++++++++--------
- 3 files changed, 47 insertions(+), 45 deletions(-)
-
-diff --git a/scripts/gendocs.py b/scripts/gendocs.py
-index c9f206e..ba872c4 100644
---- a/scripts/gendocs.py
-+++ b/scripts/gendocs.py
-@@ -29,6 +29,6 @@ root.nodes += [ParseTextFile(Node("License"), "license.txt", True)]
- 
- # render files
- for o in outputs:
--	o.file = file(o.output_name(), "w")
-+	o.file = open(o.output_name(), "w")
- 	o.render(root)
- 	o.file.close()
-diff --git a/scripts/test.py b/scripts/test.py
-index accc26c..bbc9c7d 100755
---- a/scripts/test.py
-+++ b/scripts/test.py
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
- 
-+from __future__ import print_function
- import os, sys, shutil, subprocess
- 
- extra_bam_flags = ""
-@@ -36,8 +37,8 @@ def copytree(src, dst):
- 				copytree(srcname, dstname)
- 			else:
- 				shutil.copy2(srcname, dstname)
--		except (IOError, os.error), why:
--			print "Can't copy %s to %s: %s" % (`srcname`, `dstname`, str(why))
-+		except (IOError, os.error) as why:
-+			print("Can't copy '%s' to '%s': %s" % (srcname, dstname, str(why)))
- 
- 
- def run_bam(testname, flags):
-@@ -45,7 +46,7 @@ def run_bam(testname, flags):
- 	olddir = os.getcwd()
- 	os.chdir(output_path+"/"+testname)
- 	
--	p = subprocess.Popen(bam+" "+flags, stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT)
-+	p = subprocess.Popen(bam+" "+flags, stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT, universal_newlines=True)
- 	report = p.stdout.readlines()
- 	p.wait()
- 	ret = p.returncode
-@@ -64,8 +65,8 @@ def test(name, moreflags="", should_fail=0):
- 	os.chdir(output_path+"/"+name)
- 	cmdline = bam+" -t -v "+extra_bam_flags+" " + moreflags
- 	
--	print name + ":",
--	p = subprocess.Popen(cmdline, stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT)
-+	print(name + ":", end=" ")
-+	p = subprocess.Popen(cmdline, stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT, universal_newlines=True)
- 	report = p.stdout.readlines()
- 	p.wait()
- 	ret = p.returncode
-@@ -73,50 +74,50 @@ def test(name, moreflags="", should_fail=0):
- 	os.chdir(olddir)
- 	
- 	if (should_fail and not ret) or (not should_fail and ret):
--		print " FAILED!"
-+		print(" FAILED!")
- 		for l in report:
--			print "\t", l,
-+			print("\t", l, end=" ")
- 		failed_tests += [name + "(returned %d)" % ret]
- 	else:
--		print " ok"
-+		print(" ok")
- 
- def difftest(name, flags1, flags2):
- 	global failed_tests
- 	if len(tests) and not name in tests:
- 		return
- 	testname = "difftest: %s '%s' vs '%s': "%(name, flags1, flags2)
--	print testname,
-+	print(testname, end=" ")
- 	ret1, report1 = run_bam(name, flags1)
- 	ret2, report2 = run_bam(name, flags2)
- 	
- 	if ret1:
--		print "FAILED! '%s' returned %d" %(flags1, ret1)
-+		print("FAILED! '%s' returned %d" %(flags1, ret1))
- 		failed_tests += [testname]
- 		return
- 	
- 	if ret2:
--		print "FAILED! '%s' returned %d" %(flags2, ret2)
-+		print("FAILED! '%s' returned %d" %(flags2, ret2))
- 		failed_tests += [testname]
- 		return
- 	
- 	if len(report1) != len(report2):
--		print "FAILED! %d lines vs %d lines" % (len(report1), len(report2))
-+		print("FAILED! %d lines vs %d lines" % (len(report1), len(report2)))
- 		failed_tests += [testname]
- 		return
- 	
- 	failed = 0
--	for i in xrange(0, len(report1)):
-+	for i in range(0, len(report1)):
- 		if report1[i] != report2[i]:
- 			if not failed:
--				print "FAILED!"
--			print "1:", report1[i].strip()
--			print "2:", report2[i].strip()
-+				print("FAILED!")
-+			print("1:", report1[i].strip())
-+			print("2:", report2[i].strip())
- 			failed += 1
- 			
- 	if failed:
- 		failed_tests += [testname]
- 	else:
--		print "ok"
-+		print("ok")
- 
- def unittests():
- 	global failed_tests
-@@ -129,7 +130,7 @@ def unittests():
- 	
- 	tests = []
- 	state = 0
--	for line in file('src/base.lua'):
-+	for line in open('src/base.lua'):
- 		if state == 0:
- 			if "@UNITTESTS" in line:
- 				state = 1
-@@ -157,16 +158,16 @@ def unittests():
- 	os.chdir(output_path+"/unit")
- 	
- 	for test in tests:
--		f = file("bam.lua", "w")
-+		f = open("bam.lua", "w")
- 		if test.catch != None:
--			print >>f, "print(\"CATCH:\", %s)"%(test.line)
-+			print("print(\"CATCH:\", %s)"%(test.line), file=f)
- 		else:
--			print >>f, test.line
--		print >>f, 'DefaultTarget(PseudoTarget("Test"))'
-+			print(test.line, file=f)
-+		print('DefaultTarget(PseudoTarget("Test"))', file=f)
- 		f.close()
- 
--		print  "%s:"%(test.line),
--		p = subprocess.Popen(bam + " --dry", stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT)
-+		print("%s:"%(test.line), end=" ")
-+		p = subprocess.Popen(bam + " --dry", stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT, universal_newlines=True)
- 		report = p.stdout.readlines()
- 		p.wait()
- 		ret = p.returncode
-@@ -174,7 +175,7 @@ def unittests():
- 		failed = False
- 		if ret != test.err:
- 			failed = True
--			print "FAILED! error %d != %d" % (test.err, ret)
-+			print("FAILED! error %d != %d" % (test.err, ret))
- 		
- 		if test.catch != None:
- 			found = False
-@@ -185,7 +186,7 @@ def unittests():
- 					if catched == test.catch:
- 						found = True
- 					else:
--						print "FAILED! catch '%s' != '%s'" % (test.catch, catched)
-+						print("FAILED! catch '%s' != '%s'" % (test.catch, catched))
- 						
- 			if not found:
- 				failed = True
-@@ -198,16 +199,16 @@ def unittests():
- 			
- 			if not found:
- 				failed = True
--				print "FAILED! could not find '%s' in output" % (test.find)
-+				print("FAILED! could not find '%s' in output" % (test.find))
- 		if failed or verbose:
- 			if failed:
- 				failed_tests += [test.line]
- 			else:
--				print "",
-+				print("", end=" ")
- 			for l in report:
--				print "\t", l.rstrip()
-+				print("\t", l.rstrip())
- 		else:
--			print "ok"
-+			print("ok")
- 			
- 
- 	os.chdir(olddir)
-@@ -246,11 +247,11 @@ test("multipleoutput")
- test("missingoutput", "", 1)
- 
- if len(failed_tests):
--	print "FAILED TESTS:"
-+	print("FAILED TESTS:")
- 	for t in failed_tests:
--		print "\t"+t
-+		print("\t"+t)
- 	sys.exit(1)
- else:
--	print "ALL TESTS PASSED!"
-+	print("ALL TESTS PASSED!")
- 	sys.exit(0)
- 
-diff --git a/scripts/tinydoc.py b/scripts/tinydoc.py
-index 536a74f..6557cf8 100644
---- a/scripts/tinydoc.py
-+++ b/scripts/tinydoc.py
-@@ -1,4 +1,5 @@
- 
-+from __future__ import print_function
- import re, time
- 
- class Node:
-@@ -47,20 +48,20 @@ class Output:
- 	
- 	def render_node_index(self, cur):
- 		if len(cur.index):
--			print >>self.file, self.index_node_begin(cur)
-+			print(self.index_node_begin(cur), file=self.file)
- 		for node in cur.nodes:
- 			self.render_node_index(node)
- 		if len(cur.index):
--			print >>self.file, self.index_node_end(cur)
-+			print(self.index_node_end(cur), file=self.file)
- 	def render_node(self, cur):
- 		if len(cur.index):
--			print >>self.file, self.format_header(cur)
--			print >>self.file, self.format_body(cur)
-+			print(self.format_header(cur), file=self.file)
-+			print(self.format_body(cur), file=self.file)
- 		for node in cur.nodes:
- 			self.render_node(node)
- 			
- 	def index_nodes(self, cur, index=""):
--		for i in xrange(0, len(cur.nodes)):
-+		for i in range(0, len(cur.nodes)):
- 			if len(index):
- 				cur.nodes[i].index = index + "." + str(i+1)
- 			else:
-@@ -73,14 +74,14 @@ class Output:
- 		
- 	def render(self, rootnode):
- 		self.index_nodes(rootnode)
--		print >>self.file, self.render_begin()
-+		print(self.render_begin(), file=self.file)
- 		
--		print >>self.file, self.index_begin()
-+		print(self.index_begin(), file=self.file)
- 		self.render_node_index(rootnode)
--		print >>self.file, self.index_end()
-+		print(self.index_end(), file=self.file)
- 		
- 		self.render_node(rootnode)
--		print >>self.file, self.render_end()
-+		print(self.render_end(), file=self.file)
- 
- class HTMLOutput(Output):
- 	def render_begin(self):
-@@ -225,7 +226,7 @@ class HTMLOutput(Output):
- 
- def ParseTextFile(rootnode, filename, addbr=False):
- 	group = rootnode
--	for line in file(filename):
-+	for line in open(filename):
- 		if group_tag in line:
- 			group_name = line.split(group_tag)[-1].split(end_tag)[0].strip()
- 			group = Node(group_name)
-@@ -244,7 +245,7 @@ def ParseFile(rootnode, filename):
- 	# 2 = outputting function decl
- 	state = 0
- 	group = rootnode
--	for line in file(filename):
-+	for line in open(filename):
- 		if state == 0:
- 			if group_tag in line:
- 				group_name = line.split(group_tag)[-1].split(end_tag)[0].strip()

gnu/packages/patches/neovim-tree-sitter-grammar-path.patch

@@ -1,33 +0,0 @@
-This patch makes neovim look for tree-sitter parsers in the directories
-specified by TREE_SITTER_GRAMMAR_PATH.  Thereby, making it compatible
-with the tree-sitter setup used by other Guix packages. e.g. emacs.
-
-diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
-index f70f99421c..480e7bb77a 100644
---- a/runtime/lua/vim/treesitter/language.lua
-+++ b/runtime/lua/vim/treesitter/language.lua
-@@ -126,12 +126,19 @@ function M.add(lang, opts)
-       return nil, string.format('Invalid language name "%s"', lang)
-     end
- 
--    local fname = 'parser/' .. lang .. '.*'
--    local paths = api.nvim_get_runtime_file(fname, false)
--    if #paths == 0 then
--      return nil, string.format('No parser for language "%s"', lang)
-+    local paths = vim.split(os.getenv('TREE_SITTER_GRAMMAR_PATH') or '', ':')
-+    for _, elem in ipairs(paths) do
-+      local fname = elem .. '/' .. 'libtree-sitter-' .. lang .. '*'
-+      local paths = vim.fn.glob(fname, false, true)
-+      if #paths > 0 then
-+        path = paths[1]
-+        break
-+      end
-     end
--    path = paths[1]
-+  end
-+
-+  if path == nil then
-+    return nil, string.format('No parser for language "%s"', lang)
-   end
- 
-   local res = loadparser(path, lang, symbol_name)

gnu/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch

@@ -1,21 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Subject: Move candle-onnx from exclude to members so cargo package can build it.
-Date: 2026-03-01
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -4,6 +4,7 @@
-     "candle-datasets",
-     "candle-examples",
-     "candle-nn",
-+    "candle-onnx",
-     "candle-pyo3",
-     "candle-transformers",
-     "candle-wasm-examples/*",
-@@ -15,7 +16,6 @@
-     "candle-flash-attn",
-     "candle-kernels",
-     "candle-metal-kernels",
--    "candle-onnx",
- ]
- resolver = "2"

gnu/packages/patches/warzone2100-unbundle-libs.patch

@@ -37,7 +37,7 @@ diff -ru a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
 -add_subdirectory(fmt EXCLUDE_FROM_ALL)
 -set_property(TARGET fmt PROPERTY FOLDER "3rdparty")
 -# Define a custom inline namespace for the fmt used by WZ, to prevent ODR violations if static linking to any libraries that themselves embed (a different version of) fmt
--target_compile_definitions(fmt PUBLIC "FMT_BEGIN_NAMESPACE=namespace fmt { inline namespace v12_wz2100 {")
+-target_compile_definitions(fmt PUBLIC "FMT_BEGIN_NAMESPACE=namespace fmt { inline namespace v11_wz2100 {")
 -target_compile_definitions(fmt PUBLIC "FMT_END_NAMESPACE=}}")
 -
 +pkg_check_modules(FMT REQUIRED fmt)
@@ -238,12 +238,12 @@ diff -ru a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
  	include(FetchContent)
  	FetchContent_Declare(
 diff -ru a/lib/framework/wzstring.cpp b/lib/framework/wzstring.cpp
---- a/lib/framework/wzstring.cpp
-+++ b/lib/framework/wzstring.cpp
-@@ -29,8 +29,8 @@
- // "By default, Visual Studio always returns the value 199711L for the __cplusplus preprocessor macro."
- #define UTF_CPP_CPLUSPLUS 201703L
- #endif
+--- a/lib/framework/wzstring.cpp	2025-09-16 11:41:32.000000000 -0500
++++ b/lib/framework/wzstring.cpp	2025-09-18 13:37:23.686668245 -0500
+@@ -24,8 +24,8 @@
+ #include <sstream>
+ #include <iomanip>
+ #include <limits>
 -#include <utfcpp/source/utf8.h>
 -#include <utf8proc/utf8proc.h>
 +#include <utf8cpp/utf8.h>

gnu/packages/patches/zed-0.225.10-add-message-notification-action.patch

@@ -1,107 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Subject: Add non-dismissing notification action hooks.
-Date: 2026-03-08
-License: gpl3+
-
-MessageNotification only supports primary and secondary buttons that always
-dismiss the notification after running their handlers. That is too restrictive
-for flows where the user needs to inspect something first and then return to the
-same prompt.
-
-Add a generic non-dismissing `more_info_on_click` action alongside the existing
-URL-based more-info button. This keeps the notification component reusable for
-"inspect first, decide second" workflows without forcing every caller to build a
-custom notification view.
-diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
-index 84f479b77e..9e210cb554 100644
---- a/crates/workspace/src/notifications.rs
-+++ b/crates/workspace/src/notifications.rs
-@@ -714,6 +714,7 @@ pub mod simple_message_notification {
-         secondary_icon_color: Option<Color>,
-         secondary_on_click: Option<Arc<dyn Fn(&mut Window, &mut Context<Self>)>>,
-         more_info_message: Option<SharedString>,
-+        more_info_on_click: Option<Arc<dyn Fn(&mut Window, &mut Context<Self>)>>,
-         more_info_url: Option<Arc<str>>,
-         show_close_button: bool,
-         show_suppress_button: bool,
-@@ -758,6 +759,7 @@ pub mod simple_message_notification {
-                 secondary_icon_color: None,
-                 secondary_on_click: None,
-                 more_info_message: None,
-+                more_info_on_click: None,
-                 more_info_url: None,
-                 show_close_button: true,
-                 show_suppress_button: true,
-@@ -843,6 +845,22 @@ pub mod simple_message_notification {
-             self
-         }
- 
-+        pub fn more_info_on_click<F>(mut self, on_click: F) -> Self
-+        where
-+            F: 'static + Fn(&mut Window, &mut Context<Self>),
-+        {
-+            self.more_info_on_click = Some(Arc::new(on_click));
-+            self
-+        }
-+
-+        pub fn more_info_on_click_arc<F>(mut self, on_click: Arc<F>) -> Self
-+        where
-+            F: 'static + Fn(&mut Window, &mut Context<Self>),
-+        {
-+            self.more_info_on_click = Some(on_click);
-+            self
-+        }
-+
-         pub fn more_info_url<S>(mut self, url: S) -> Self
-         where
-             S: Into<Arc<str>>,
-@@ -946,20 +964,36 @@ pub mod simple_message_notification {
-                         }))
-                         .child(
-                             h_flex().w_full().justify_end().children(
--                                self.more_info_message
--                                    .iter()
--                                    .zip(self.more_info_url.iter())
--                                    .map(|(message, url)| {
--                                        let url = url.clone();
--                                        Button::new(message.clone(), message.clone())
--                                            .label_size(LabelSize::Small)
--                                            .icon(IconName::ArrowUpRight)
--                                            .icon_size(IconSize::Indicator)
--                                            .icon_color(Color::Muted)
--                                            .on_click(cx.listener(move |_, _, _, cx| {
-+                                self.more_info_message.iter().filter_map(|message| {
-+                                    let more_info_on_click = self.more_info_on_click.clone();
-+                                    let more_info_url = self.more_info_url.clone();
-+
-+                                    if more_info_on_click.is_none() && more_info_url.is_none() {
-+                                        return None;
-+                                    }
-+
-+                                    let mut button = Button::new(message.clone(), message.clone())
-+                                        .label_size(LabelSize::Small)
-+                                        .icon(IconName::ArrowUpRight)
-+                                        .icon_size(IconSize::Indicator)
-+                                        .icon_color(Color::Muted);
-+
-+                                    button = match (more_info_on_click, more_info_url) {
-+                                        (Some(on_click), _) => button.on_click(cx.listener(
-+                                            move |_, _, window, cx| {
-+                                                (on_click)(window, cx);
-+                                            },
-+                                        )),
-+                                        (None, Some(url)) => button.on_click(cx.listener(
-+                                            move |_, _, _, cx| {
-                                                 cx.open_url(&url);
--                                            }))
--                                    }),
-+                                            },
-+                                        )),
-+                                        (None, None) => button,
-+                                    };
-+
-+                                    Some(button)
-+                                }),
-                             ),
-                         ),
-                 )

gnu/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch

@@ -1,65 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Subject: Collapse multi-line git dependency entries to single lines
-Date: 2026-03-01
-License: expat
-
-Collapse multi-line git dependency entries to single lines so that
-line-based substitute* patterns can process them.
-
---- a/Cargo.toml	2026-03-01 19:09:53.710020628 +0000
-+++ b/Cargo.toml	2026-03-01 19:20:31.697337662 +0000
-@@ -626,15 +626,7 @@
- rayon = "1.8"
- regex = "1.5"
- # WARNING: If you change this, you must also publish a new version of zed-reqwest to crates.io
--reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662463bda39148ba154100dd44d3fba5873a4", default-features = false, features = [
--    "charset",
--    "http2",
--    "macos-system-configuration",
--    "multipart",
--    "rustls-tls-native-roots",
--    "socks",
--    "stream",
--], package = "zed-reqwest", version = "0.12.15-zed" }
-+reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662463bda39148ba154100dd44d3fba5873a4", default-features = false, features = ["charset", "http2", "macos-system-configuration", "multipart", "rustls-tls-native-roots", "socks", "stream"], package = "zed-reqwest", version = "0.12.15-zed" }
- rsa = "0.9.6"
- runtimelib = { version = "1.2.0", default-features = false, features = [
-     "async-dispatcher-runtime", "aws-lc-rs"
---- a/crates/gpui/Cargo.toml	2026-03-01 19:12:33.129039363 +0000
-+++ b/crates/gpui/Cargo.toml	2026-03-01 19:20:33.133327405 +0000
-@@ -167,9 +167,7 @@
- cosmic-text = { version = "0.17.0", optional = true }
- swash = { version = "0.2.6" }
- # WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
--font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", features = [
--    "source-fontconfig-dlopen",
--], optional = true }
-+font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", features = ["source-fontconfig-dlopen"], optional = true }
- calloop = "0.14.3"
- filedescriptor = { version = "0.8.2", optional = true }
- open = { version = "5.2.0", optional = true }
-@@ -207,10 +205,7 @@
-     "sync",
- ], optional = true }
- # WARNING: If you change this, you must also publish a new version of zed-xim to crates.io
--xim = { git = "https://github.com/zed-industries/xim-rs.git", rev = "16f35a2c881b815a2b6cdfd6687988e84f8447d8" , features = [
--    "x11rb-xcb",
--    "x11rb-client",
--], package = "zed-xim", version = "0.4.0-zed", optional = true }
-+xim = { git = "https://github.com/zed-industries/xim-rs.git", rev = "16f35a2c881b815a2b6cdfd6687988e84f8447d8" , features = ["x11rb-xcb", "x11rb-client"], package = "zed-xim", version = "0.4.0-zed", optional = true }
- x11-clipboard = { version = "0.9.3", optional = true }
- 
- [target.'cfg(target_os = "windows")'.dependencies]
---- a/crates/livekit_client/Cargo.toml	2026-03-01 19:12:33.133661336 +0000
-+++ b/crates/livekit_client/Cargo.toml	2026-03-01 19:20:33.893321975 +0000
-@@ -46,9 +46,7 @@
- 
- [target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
- libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
--livekit = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks", features = [
--    "__rustls-tls"
--] }
-+livekit = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks", features = ["__rustls-tls"] }
- 
- [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
- scap.workspace = true

gnu/packages/patches/zed-0.225.10-disable-dlopen.patch

@@ -1,31 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Subject: Disable dlopen for wayland-backend and fontconfig in gpui.
-Date: 2026-03-01
-License: ASL2.0
-
-Remove the "dlopen" feature from wayland-backend and the
-"source-fontconfig-dlopen" feature from zed-font-kit so that libwayland
-and libfontconfig are linked directly rather than loaded at runtime via
-dlopen.  This ensures these dependencies are visible to the package
-manager and avoids runtime failures when the libraries are not in the
-dlopen search path.
-
---- a/crates/gpui/Cargo.toml	2026-03-01 21:21:38.661240897 +0000
-+++ b/crates/gpui/Cargo.toml	2026-03-01 21:23:00.282205935 +0000
-@@ -167,7 +167,7 @@
- cosmic-text = { version = "0.17.0", optional = true }
- swash = { version = "0.2.6" }
- # WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
--font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", features = ["source-fontconfig-dlopen"], optional = true }
-+font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
- calloop = "0.14.3"
- filedescriptor = { version = "0.8.2", optional = true }
- open = { version = "5.2.0", optional = true }
-@@ -177,7 +177,6 @@
- calloop-wayland-source = { version = "0.4.1", optional = true }
- wayland-backend = { version = "0.3.3", features = [
-     "client_system",
--    "dlopen",
- ], optional = true }
- wayland-client = { version = "0.31.11", optional = true }
- wayland-cursor = { version = "0.31.11", optional = true }

gnu/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch

@@ -1,113 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Subject: Exclude libwebrtc dependency from audio crate on Linux.
-Date: 2026-03-01
-
-The audio crate conditionally depends on libwebrtc for echo cancellation
-on platforms that have it.  It already cfg-guards the libwebrtc usage for
-Windows-GNU and FreeBSD.  Add target_os = "linux" to those cfg conditions
-so libwebrtc is not required on Linux either.  The rest of the audio crate
-(sound playback, output streams, end_call) continues to work without it.
-
---- a/crates/audio/Cargo.toml	2026-03-01 21:21:38.652107544 +0000
-+++ b/crates/audio/Cargo.toml	2026-03-01 21:22:20.494478427 +0000
-@@ -29,5 +29,5 @@
- thiserror.workspace = true
- util.workspace = true
- 
--[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
-+[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))'.dependencies]
- libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
---- a/crates/audio/src/audio.rs	2026-03-01 21:21:38.656793329 +0000
-+++ b/crates/audio/src/audio.rs	2026-03-01 21:40:18.939230433 +0000
-@@ -6,7 +6,7 @@
- };
- use gpui::{App, AsyncApp, BackgroundExecutor, BorrowAppContext, Global};
- 
--#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
- mod non_windows_and_freebsd_deps {
-     pub(super) use cpal::Sample;
-     pub(super) use libwebrtc::native::apm;
-@@ -15,7 +15,7 @@
-     pub(super) use std::sync::Arc;
- }
- 
--#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
- use non_windows_and_freebsd_deps::*;
- 
- use rodio::{
-@@ -102,7 +102,7 @@
- 
- pub struct Audio {
-     output_handle: Option<MixerDeviceSink>,
--    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-+    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
-     pub echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
-     source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
-     replays: replays::Replays,
-@@ -114,7 +114,7 @@
-             output_handle: Default::default(),
-             #[cfg(not(any(
-                 all(target_os = "windows", target_env = "gnu"),
--                target_os = "freebsd"
-+                target_os = "freebsd", target_os = "linux"
-             )))]
-             echo_canceller: Arc::new(Mutex::new(apm::AudioProcessingModule::new(
-                 true, false, false, false,
-@@ -140,13 +140,13 @@
-             // The webrtc apm is not yet compiling for windows & freebsd
-             #[cfg(not(any(
-                 any(all(target_os = "windows", target_env = "gnu")),
--                target_os = "freebsd"
-+                target_os = "freebsd", target_os = "linux"
-             )))]
-             let echo_canceller = Arc::clone(&self.echo_canceller);
- 
-             #[cfg(not(any(
-                 any(all(target_os = "windows", target_env = "gnu")),
--                target_os = "freebsd"
-+                target_os = "freebsd", target_os = "linux"
-             )))]
-             {
-                 let source = rodio::source::Zero::new(CHANNEL_COUNT, SAMPLE_RATE)
-@@ -166,10 +166,10 @@
- 
-             #[cfg(any(
-                 any(all(target_os = "windows", target_env = "gnu")),
--                target_os = "freebsd"
-+                target_os = "freebsd", target_os = "linux"
-             ))]
-             {
--                let source = rodio::source::Zero::<f32>::new(CHANNEL_COUNT, SAMPLE_RATE);
-+                let source = rodio::source::Zero::new(CHANNEL_COUNT, SAMPLE_RATE);
-                 output_handle.mixer().add(source);
-             }
- 
-@@ -190,7 +190,7 @@
-         self.replays.replays_to_tar(executor)
-     }
- 
--    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-+    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
-     pub fn open_microphone(voip_parts: VoipParts) -> anyhow::Result<impl Source> {
-         let stream = open_input_stream(voip_parts.input_audio_device)?;
-         let stream = stream
-@@ -319,7 +319,7 @@
-     }
- }
- 
--#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
- pub struct VoipParts {
-     echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
-     replays: replays::Replays,
-@@ -327,7 +327,7 @@
-     input_audio_device: Option<DeviceId>,
- }
- 
--#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
- impl VoipParts {
-     pub fn new(cx: &AsyncApp) -> anyhow::Result<Self> {
-         let (apm, replays) = cx.read_default_global::<Audio, _>(|audio, _| {

gnu/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch

@@ -1,320 +0,0 @@
-From: Danny Milosavljevic <dannym@friendly-machines.com>
-Date: Fri, 6 Mar 2026 21:06:00 +0000
-Subject: [PATCH] sqlez: Fix named in-memory SQLite mode
-License: expat
-
-Zed's named "in-memory" SQLite databases were being opened with
-URI-looking paths such as `file:DB?mode=memory&cache=shared` but without
-`SQLITE_OPEN_URI`. SQLite therefore treated those strings as literal
-filenames, which leaked test databases to disk and defeated the intended
-shared-memory behavior.
-
-Fix that by opening named in-memory databases with `SQLITE_OPEN_URI` so
-`mode=memory&cache=shared` is interpreted correctly, and add coverage to
-ensure no literal backing files are created.
-
-That URI fix makes shared-cache schema locking real, which in turn
-exposes a second bug in `ThreadSafeConnection`: per-thread connection
-initialization can race schema setup on another connection to the same
-named in-memory database and fail while preparing `PRAGMA foreign_keys`.
-
-Fix that by retrying connection initialization queries when SQLite
-reports a transient schema/database lock, and add a regression test for
-that case.
-
-diff --git a/crates/sqlez/src/connection.rs b/crates/sqlez/src/connection.rs
-index 53f0d4e261..3dc530757a 100644
---- a/crates/sqlez/src/connection.rs
-+++ b/crates/sqlez/src/connection.rs
-@@ -18,7 +18,7 @@ pub struct Connection {
- unsafe impl Send for Connection {}
- 
- impl Connection {
--    pub(crate) fn open(uri: &str, persistent: bool) -> Result<Self> {
-+    fn open_with_flags(uri: &str, persistent: bool, flags: i32) -> Result<Self> {
-         let mut connection = Self {
-             sqlite3: ptr::null_mut(),
-             persistent,
-@@ -26,7 +26,6 @@ impl Connection {
-             _sqlite: PhantomData,
-         };
- 
--        let flags = SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX | SQLITE_OPEN_READWRITE;
-         unsafe {
-             sqlite3_open_v2(
-                 CString::new(uri)?.as_ptr(),
-@@ -44,6 +43,14 @@ impl Connection {
-         Ok(connection)
-     }
- 
-+    pub(crate) fn open(uri: &str, persistent: bool) -> Result<Self> {
-+        Self::open_with_flags(
-+            uri,
-+            persistent,
-+            SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX | SQLITE_OPEN_READWRITE,
-+        )
-+    }
-+
-     /// Attempts to open the database at uri. If it fails, a shared memory db will be opened
-     /// instead.
-     pub fn open_file(uri: &str) -> Self {
-@@ -51,13 +58,20 @@ impl Connection {
-     }
- 
-     pub fn open_memory(uri: Option<&str>) -> Self {
--        let in_memory_path = if let Some(uri) = uri {
--            format!("file:{}?mode=memory&cache=shared", uri)
-+        if let Some(uri) = uri {
-+            let in_memory_path = format!("file:{}?mode=memory&cache=shared", uri);
-+            return Self::open_with_flags(
-+                &in_memory_path,
-+                false,
-+                SQLITE_OPEN_CREATE
-+                    | SQLITE_OPEN_NOMUTEX
-+                    | SQLITE_OPEN_READWRITE
-+                    | SQLITE_OPEN_URI,
-+            )
-+            .expect("Could not create fallback in memory db");
-         } else {
--            ":memory:".to_string()
--        };
--
--        Self::open(&in_memory_path, false).expect("Could not create fallback in memory db")
-+            Self::open(":memory:", false).expect("Could not create fallback in memory db")
-+        }
-     }
- 
-     pub fn persistent(&self) -> bool {
-@@ -265,9 +279,50 @@ impl Drop for Connection {
- mod test {
-     use anyhow::Result;
-     use indoc::indoc;
-+    use std::{
-+        fs,
-+        sync::atomic::{AtomicUsize, Ordering},
-+    };
- 
-     use crate::connection::Connection;
- 
-+    static NEXT_NAMED_MEMORY_DB_ID: AtomicUsize = AtomicUsize::new(0);
-+
-+    fn unique_named_memory_db(prefix: &str) -> String {
-+        format!(
-+            "{prefix}_{}_{}",
-+            std::process::id(),
-+            NEXT_NAMED_MEMORY_DB_ID.fetch_add(1, Ordering::Relaxed)
-+        )
-+    }
-+
-+    fn literal_named_memory_paths(name: &str) -> [String; 3] {
-+        let main = format!("file:{name}?mode=memory&cache=shared");
-+        [main.clone(), format!("{main}-wal"), format!("{main}-shm")]
-+    }
-+
-+    struct NamedMemoryPathGuard {
-+        paths: [String; 3],
-+    }
-+
-+    impl NamedMemoryPathGuard {
-+        fn new(name: &str) -> Self {
-+            let paths = literal_named_memory_paths(name);
-+            for path in &paths {
-+                let _ = fs::remove_file(path);
-+            }
-+            Self { paths }
-+        }
-+    }
-+
-+    impl Drop for NamedMemoryPathGuard {
-+        fn drop(&mut self) {
-+            for path in &self.paths {
-+                let _ = fs::remove_file(path);
-+            }
-+        }
-+    }
-+
-     #[test]
-     fn string_round_trips() -> Result<()> {
-         let connection = Connection::open_memory(Some("string_round_trips"));
-@@ -382,6 +437,41 @@ mod test {
-         assert_eq!(read_blobs, vec![blob]);
-     }
- 
-+    #[test]
-+    fn named_memory_connections_do_not_create_literal_backing_files() {
-+        let name = unique_named_memory_db("named_memory_connections_do_not_create_backing_files");
-+        let guard = NamedMemoryPathGuard::new(&name);
-+
-+        let connection1 = Connection::open_memory(Some(&name));
-+        connection1
-+            .exec(indoc! {"
-+                CREATE TABLE shared (
-+                    value INTEGER
-+                )"})
-+            .unwrap()()
-+        .unwrap();
-+        connection1
-+            .exec("INSERT INTO shared (value) VALUES (7)")
-+            .unwrap()()
-+        .unwrap();
-+
-+        let connection2 = Connection::open_memory(Some(&name));
-+        assert_eq!(
-+            connection2
-+                .select_row::<i64>("SELECT value FROM shared")
-+                .unwrap()()
-+            .unwrap(),
-+            Some(7)
-+        );
-+
-+        for path in &guard.paths {
-+            assert!(
-+                fs::metadata(path).is_err(),
-+                "named in-memory database unexpectedly created backing file {path}"
-+            );
-+        }
-+    }
-+
-     #[test]
-     fn multi_step_statement_works() {
-         let connection = Connection::open_memory(Some("multi_step_statement_works"));
-diff --git a/crates/sqlez/src/thread_safe_connection.rs b/crates/sqlez/src/thread_safe_connection.rs
-index 966f14a9c2..9d868fcba4 100644
---- a/crates/sqlez/src/thread_safe_connection.rs
-+++ b/crates/sqlez/src/thread_safe_connection.rs
-@@ -7,12 +7,15 @@ use std::{
-     ops::Deref,
-     sync::{Arc, LazyLock},
-     thread,
-+    time::Duration,
- };
- use thread_local::ThreadLocal;
- 
- use crate::{connection::Connection, domain::Migrator, util::UnboundedSyncSender};
- 
- const MIGRATION_RETRIES: usize = 10;
-+const CONNECTION_INITIALIZE_RETRIES: usize = 50;
-+const CONNECTION_INITIALIZE_RETRY_DELAY: Duration = Duration::from_millis(1);
- 
- type QueuedWrite = Box<dyn 'static + Send + FnOnce()>;
- type WriteQueue = Box<dyn 'static + Send + Sync + Fn(QueuedWrite)>;
-@@ -197,21 +200,50 @@ impl ThreadSafeConnection {
-             Self::open_shared_memory(uri)
-         };
- 
-+        if let Some(initialize_query) = connection_initialize_query {
-+            let mut last_error = None;
-+            let initialized = (0..CONNECTION_INITIALIZE_RETRIES).any(|attempt| {
-+                match connection.exec(initialize_query).and_then(|mut statement| statement()) {
-+                    Ok(()) => true,
-+                    Err(err)
-+                        if is_schema_lock_error(&err)
-+                            && attempt + 1 < CONNECTION_INITIALIZE_RETRIES =>
-+                    {
-+                        last_error = Some(err);
-+                        thread::sleep(CONNECTION_INITIALIZE_RETRY_DELAY);
-+                        false
-+                    }
-+                    Err(err) => {
-+                        panic!(
-+                            "Initialize query failed to execute: {}\n\nCaused by:\n{err:#}",
-+                            initialize_query
-+                        )
-+                    }
-+                }
-+            });
-+
-+            if !initialized {
-+                let err = last_error.expect("connection initialization retries should record the last error");
-+                panic!(
-+                    "Initialize query failed to execute after retries: {}\n\nCaused by:\n{err:#}",
-+                    initialize_query
-+                );
-+            }
-+        }
-+
-         // Disallow writes on the connection. The only writes allowed for thread safe connections
-         // are from the background thread that can serialize them.
-         *connection.write.get_mut() = false;
- 
--        if let Some(initialize_query) = connection_initialize_query {
--            connection.exec(initialize_query).unwrap_or_else(|_| {
--                panic!("Initialize query failed to execute: {}", initialize_query)
--            })()
--            .unwrap()
--        }
--
-         connection
-     }
- }
- 
-+fn is_schema_lock_error(err: &anyhow::Error) -> bool {
-+    let message = format!("{err:#}");
-+    message.contains("database schema is locked") || message.contains("database is locked")
-+}
-+
- impl ThreadSafeConnection {
-     /// Special constructor for ThreadSafeConnection which disallows db initialization and migrations.
-     /// This allows construction to be infallible and not write to the db.
-@@ -282,7 +314,7 @@ mod test {
-     use indoc::indoc;
-     use std::ops::Deref;
- 
--    use std::thread;
-+    use std::{thread, time::Duration};
- 
-     use crate::{domain::Domain, thread_safe_connection::ThreadSafeConnection};
- 
-@@ -318,38 +350,21 @@ mod test {
-     }
- 
-     #[test]
--    #[should_panic]
--    fn wild_zed_lost_failure() {
--        enum TestWorkspace {}
--        impl Domain for TestWorkspace {
--            const NAME: &str = "workspace";
--
--            const MIGRATIONS: &[&str] = &["
--                    CREATE TABLE workspaces(
--                        workspace_id INTEGER PRIMARY KEY,
--                        dock_visible INTEGER, -- Boolean
--                        dock_anchor TEXT, -- Enum: 'Bottom' / 'Right' / 'Expanded'
--                        dock_pane INTEGER, -- NULL indicates that we don't have a dock pane yet
--                        timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
--                        FOREIGN KEY(dock_pane) REFERENCES panes(pane_id),
--                        FOREIGN KEY(active_pane) REFERENCES panes(pane_id)
--                    ) STRICT;
--
--                    CREATE TABLE panes(
--                        pane_id INTEGER PRIMARY KEY,
--                        workspace_id INTEGER NOT NULL,
--                        active INTEGER NOT NULL, -- Boolean
--                        FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
--                            ON DELETE CASCADE
--                            ON UPDATE CASCADE
--                    ) STRICT;
--                "];
--        }
-+    fn connection_initialize_query_retries_transient_schema_lock() {
-+        let name = "connection_initialize_query_retries_transient_schema_lock";
-+        let locking_connection = crate::connection::Connection::open_memory(Some(name));
-+        locking_connection.exec("BEGIN IMMEDIATE").unwrap()().unwrap();
-+        locking_connection
-+            .exec("CREATE TABLE test(col TEXT)")
-+            .unwrap()()
-+            .unwrap();
- 
--        let builder =
--            ThreadSafeConnection::builder::<TestWorkspace>("wild_zed_lost_failure", false)
--                .with_connection_initialize_query("PRAGMA FOREIGN_KEYS=true");
-+        let releaser = thread::spawn(move || {
-+            thread::sleep(Duration::from_millis(10));
-+            locking_connection.exec("ROLLBACK").unwrap()().unwrap();
-+        });
- 
--        smol::block_on(builder.build()).unwrap();
-+        ThreadSafeConnection::create_connection(false, name, Some("PRAGMA FOREIGN_KEYS=true"));
-+        releaser.join().unwrap();
-     }
- }

gnu/packages/patches/zed-0.225.10-fix-test-db-isolation.patch

@@ -1,328 +0,0 @@
-From: Danny Milosavljevic <dannym@friendly-machines.com>
-Date: Fri, 6 Mar 2026 21:22:41 +0000
-Subject: [PATCH] db: Scope default test databases to the current test
-License: expat
-
-In test builds, the default database statics use fixed names such as
-`DB` and `KEY_VALUE_STORE`. That makes unrelated tests in the same test
-binary share the same named in-memory databases, which leaks state
-across tests and makes failures depend on execution order and
-concurrency.
-
-A first attempt at isolating those statics by thread is not sufficient:
-one test can legitimately use multiple threads, and splitting the test's
-workspace state across separate databases breaks parent-child foreign key
-relationships.
-
-Fix this by scoping the default test databases by the current test name
-instead. The `gpui::test` harness now installs the current test name on
-the executing thread, the test dispatcher propagates that scope to its
-realtime worker threads, and the default test statics resolve one shared
-database wrapper per test scope rather than per thread.
-
-That keeps sharing within a single test where it is intentional, while
-stopping hidden cross-test state leakage.
-
-diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
-index 36f0365af9..3ff8499c1d 100644
---- a/crates/db/src/db.rs
-+++ b/crates/db/src/db.rs
-@@ -19,6 +19,12 @@ use std::future::Future;
- use std::path::Path;
- use std::sync::atomic::AtomicBool;
- use std::sync::{LazyLock, atomic::Ordering};
-+#[cfg(any(test, feature = "test-support"))]
-+use std::collections::HashMap;
-+#[cfg(any(test, feature = "test-support"))]
-+use std::sync::Mutex;
-+#[cfg(any(test, feature = "test-support"))]
-+use std::{borrow::Cow, ops::Deref};
- use util::{ResultExt, maybe};
- use zed_env_vars::ZED_STATELESS;
- 
-@@ -97,7 +103,8 @@ async fn open_fallback_db<M: Migrator>() -> ThreadSafeConnection {
- pub async fn open_test_db<M: Migrator>(db_name: &str) -> ThreadSafeConnection {
-     use sqlez::thread_safe_connection::locking_queue;
- 
--    ThreadSafeConnection::builder::<M>(db_name, false)
-+    let db_name = scoped_test_db_name(db_name);
-+    ThreadSafeConnection::builder::<M>(&db_name, false)
-         .with_db_initialization_query(DB_INITIALIZE_QUERY)
-         .with_connection_initialize_query(CONNECTION_INITIALIZE_QUERY)
-         // Serialize queued writes via a mutex and run them synchronously
-@@ -107,6 +114,69 @@ pub async fn open_test_db<M: Migrator>(db_name: &str) -> ThreadSafeConnection {
-         .unwrap()
- }
- 
-+#[cfg(any(test, feature = "test-support"))]
-+fn scoped_test_db_name(db_name: &str) -> Cow<'_, str> {
-+    let Some(test_name) = current_test_scope_name() else {
-+        return Cow::Borrowed(db_name);
-+    };
-+
-+    let mut scoped_name = String::with_capacity(db_name.len() + test_name.len() + 2);
-+    scoped_name.push_str(db_name);
-+    scoped_name.push('@');
-+    for ch in test_name.chars() {
-+        if ch.is_ascii_alphanumeric() || matches!(ch, '-' | '_' | '.') {
-+            scoped_name.push(ch);
-+        } else {
-+            scoped_name.push('_');
-+        }
-+    }
-+
-+    Cow::Owned(scoped_name)
-+}
-+
-+#[cfg(any(test, feature = "test-support"))]
-+fn current_test_scope_name() -> Option<String> {
-+    if let Some(test_name) = gpui::current_test_name() {
-+        return Some(test_name.to_string());
-+    }
-+
-+    let current_thread = std::thread::current();
-+    if let Some(test_name) = current_thread.name() {
-+        return Some(test_name.to_string());
-+    }
-+
-+    Some(format!("thread_{:?}", current_thread.id()))
-+}
-+
-+#[cfg(any(test, feature = "test-support"))]
-+pub struct TestScopedStatic<T: Send + Sync + 'static> {
-+    initializer: fn() -> T,
-+    values: Mutex<HashMap<String, &'static T>>,
-+}
-+
-+#[cfg(any(test, feature = "test-support"))]
-+impl<T: Send + Sync + 'static> TestScopedStatic<T> {
-+    pub fn new(initializer: fn() -> T) -> Self {
-+        Self {
-+            initializer,
-+            values: Mutex::new(HashMap::new()),
-+        }
-+    }
-+}
-+
-+#[cfg(any(test, feature = "test-support"))]
-+impl<T: Send + Sync + 'static> Deref for TestScopedStatic<T> {
-+    type Target = T;
-+
-+    fn deref(&self) -> &Self::Target {
-+        let scope_name = current_test_scope_name().unwrap_or_else(|| "default".to_string());
-+        let mut values = self.values.lock().unwrap();
-+        *values
-+            .entry(scope_name)
-+            .or_insert_with(|| Box::leak(Box::new((self.initializer)())))
-+    }
-+}
-+
- /// Implements a basic DB wrapper for a given domain
- ///
- /// Arguments:
-@@ -126,16 +196,23 @@ macro_rules! static_connection {
- 
-         impl $t {
-             #[cfg(any(test, feature = "test-support"))]
--            pub async fn open_test_db(name: &'static str) -> Self {
-+            pub async fn open_test_db(name: &str) -> Self {
-                 $t($crate::open_test_db::<$t>(name).await)
-             }
-         }
- 
-         #[cfg(any(test, feature = "test-support"))]
--        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
--            #[allow(unused_parens)]
--            $t($crate::smol::block_on($crate::open_test_db::<($($d,)* $t)>(stringify!($id))))
--        });
-+        pub static $id: std::sync::LazyLock<$crate::TestScopedStatic<$t>> =
-+            std::sync::LazyLock::new(|| {
-+                fn initializer() -> $t {
-+                    #[allow(unused_parens)]
-+                    $t($crate::smol::block_on(
-+                        $crate::open_test_db::<($($d,)* $t)>(stringify!($id))
-+                    ))
-+                }
-+
-+                $crate::TestScopedStatic::new(initializer)
-+            });
- 
-         #[cfg(not(any(test, feature = "test-support")))]
-         pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
-@@ -161,9 +238,10 @@ where
- 
- #[cfg(test)]
- mod tests {
-+    use anyhow::Result;
-     use std::thread;
- 
--    use sqlez::domain::Domain;
-+    use sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection};
-     use sqlez_macros::sql;
- 
-     use crate::open_db;
-@@ -295,4 +373,64 @@ mod tests {
-             assert!(guard.join().is_ok());
-         }
-     }
-+
-+    pub struct ScopedStaticDb(ThreadSafeConnection);
-+
-+    impl Domain for ScopedStaticDb {
-+        const NAME: &str = "test_scoped_static_db";
-+        const MIGRATIONS: &[&str] = &[sql!(
-+            CREATE TABLE IF NOT EXISTS scoped_values(
-+                value INTEGER NOT NULL
-+            ) STRICT;
-+        )];
-+    }
-+
-+    crate::static_connection!(SCOPED_STATIC_DB, ScopedStaticDb, []);
-+
-+    impl ScopedStaticDb {
-+        fn replace_value(&self, value: i64) -> Result<()> {
-+            smol::block_on(self.write(move |connection| {
-+                connection.exec("DELETE FROM scoped_values")?()?;
-+                connection
-+                    .exec_bound("INSERT INTO scoped_values(value) VALUES (?)")
-+                    ?(value)?;
-+                anyhow::Ok(())
-+            }))
-+        }
-+
-+        fn read_value(&self) -> Result<Option<i64>> {
-+            self.select_row::<i64>("SELECT value FROM scoped_values").unwrap()()
-+        }
-+    }
-+
-+    #[test]
-+    fn static_test_connections_are_scoped_by_test_name() {
-+        gpui::with_test_name(Some("static_test_connections_are_scoped_by_test_name_a"), || {
-+            assert_eq!(SCOPED_STATIC_DB.read_value().unwrap(), None);
-+            SCOPED_STATIC_DB.replace_value(7).unwrap();
-+            assert_eq!(SCOPED_STATIC_DB.read_value().unwrap(), Some(7));
-+        });
-+
-+        gpui::with_test_name(Some("static_test_connections_are_scoped_by_test_name_b"), || {
-+            assert_eq!(SCOPED_STATIC_DB.read_value().unwrap(), None);
-+            SCOPED_STATIC_DB.replace_value(11).unwrap();
-+            assert_eq!(SCOPED_STATIC_DB.read_value().unwrap(), Some(11));
-+        });
-+    }
-+
-+    #[test]
-+    fn static_test_connections_share_state_across_threads_with_same_test_name() {
-+        gpui::with_test_name(
-+            Some("static_test_connections_share_state_across_threads_with_same_test_name"),
-+            || {
-+                SCOPED_STATIC_DB.replace_value(13).unwrap();
-+
-+                let test_name = gpui::current_test_name();
-+                let thread = std::thread::spawn(move || {
-+                    gpui::with_test_name(test_name, || SCOPED_STATIC_DB.read_value().unwrap())
-+                });
-+                assert_eq!(thread.join().unwrap(), Some(13));
-+            },
-+        );
-+    }
- }
-diff --git a/crates/gpui/src/platform/test/dispatcher.rs b/crates/gpui/src/platform/test/dispatcher.rs
-index fc3f7f253a..0d98b082ca 100644
---- a/crates/gpui/src/platform/test/dispatcher.rs
-+++ b/crates/gpui/src/platform/test/dispatcher.rs
-@@ -136,8 +136,9 @@ impl PlatformDispatcher for TestDispatcher {
-     }
- 
-     fn spawn_realtime(&self, f: Box<dyn FnOnce() + Send>) {
-+        let test_name = crate::current_test_name();
-         std::thread::spawn(move || {
--            f();
-+            crate::with_test_name(test_name, f);
-         });
-     }
- }
-diff --git a/crates/gpui/src/test.rs b/crates/gpui/src/test.rs
-index 9f8fd8b198..469affdc1c 100644
---- a/crates/gpui/src/test.rs
-+++ b/crates/gpui/src/test.rs
-@@ -29,11 +29,44 @@ use crate::{Entity, Subscription, TestAppContext, TestDispatcher};
- use futures::StreamExt as _;
- use smol::channel;
- use std::{
-+    cell::Cell,
-     env,
-     panic::{self, RefUnwindSafe},
-     pin::Pin,
- };
- 
-+thread_local! {
-+    static CURRENT_TEST_NAME: Cell<Option<&'static str>> = const { Cell::new(None) };
-+}
-+
-+/// Returns the test name currently associated with this thread, if any.
-+pub fn current_test_name() -> Option<&'static str> {
-+    CURRENT_TEST_NAME.with(Cell::get)
-+}
-+
-+/// Runs the closure with the given test name installed for the current thread.
-+pub fn with_test_name<R>(name: Option<&'static str>, f: impl FnOnce() -> R) -> R {
-+    CURRENT_TEST_NAME.with(|current_name| {
-+        struct RestoreTestName<'a> {
-+            current_name: &'a Cell<Option<&'static str>>,
-+            previous_name: Option<&'static str>,
-+        }
-+
-+        impl Drop for RestoreTestName<'_> {
-+            fn drop(&mut self) {
-+                self.current_name.set(self.previous_name);
-+            }
-+        }
-+
-+        let previous_name = current_name.replace(name);
-+        let _restore = RestoreTestName {
-+            current_name,
-+            previous_name,
-+        };
-+        f()
-+    })
-+}
-+
- /// Run the given test function with the configured parameters.
- /// This is intended for use with the `gpui::test` macro
- /// and generally should not be used directly.
-diff --git a/crates/gpui_macros/src/test.rs b/crates/gpui_macros/src/test.rs
-index 490ea07fee..3abcaad3ae 100644
---- a/crates/gpui_macros/src/test.rs
-+++ b/crates/gpui_macros/src/test.rs
-@@ -191,10 +191,12 @@ fn generate_test_function(
-                     &[#seeds],
-                     #max_retries,
-                     &mut |dispatcher, _seed| {
--                        let foreground_executor = gpui::ForegroundExecutor::new(std::sync::Arc::new(dispatcher.clone()));
--                        #cx_vars
--                        foreground_executor.block_test(#inner_fn_name(#inner_fn_args));
--                        #cx_teardowns
-+                        gpui::with_test_name(Some(stringify!(#outer_fn_name)), || {
-+                            let foreground_executor = gpui::ForegroundExecutor::new(std::sync::Arc::new(dispatcher.clone()));
-+                            #cx_vars
-+                            foreground_executor.block_test(#inner_fn_name(#inner_fn_args));
-+                            #cx_teardowns
-+                        })
-                     },
-                     #on_failure_fn_name
-                 );
-@@ -274,9 +276,11 @@ fn generate_test_function(
-                     &[#seeds],
-                     #max_retries,
-                     &mut |dispatcher, _seed| {
--                        #cx_vars
--                        #inner_fn_name(#inner_fn_args);
--                        #cx_teardowns
-+                        gpui::with_test_name(Some(stringify!(#outer_fn_name)), || {
-+                            #cx_vars
-+                            #inner_fn_name(#inner_fn_args);
-+                            #cx_teardowns
-+                        })
-                     },
-                     #on_failure_fn_name,
-                 );

gnu/packages/patches/zed-0.225.10-fix-workspace-race.patch

@@ -1,310 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Subject: Fix workspace persistence races during restoration.
-Date: 2026-03-01
-License: expat
-
-In 0.225.10, workspace persistence has three separate ordering problems.
-
-First, newly allocated workspace IDs could be used for item persistence before a
-parent row had been inserted into the workspaces table. That made editor
-persistence race with workspace creation and could fail with a foreign key
-constraint error.
-
-Second, workspace layout persistence and per-item persistence run on separate
-asynchronous paths. That allowed the workspace layout to be saved with item IDs
-before the background item-serialization worker had finished writing the
-corresponding per-item rows. On restore, deserializers that require persisted
-item state could then fail with "No entry in database for item_id ...", which
-could drop restored state and break restoration features that depend on that
-persisted item state, including edited-window restoration.
-
-Third, restore-side cleanup assumed that deserialized items had already been
-saved under their new runtime item IDs after being added to panes. In reality,
-adding a deserialized item only enqueues that serialization work. Cleanup could
-therefore delete the old persisted rows before the new rows existed, leaving the
-next reopen with a pane/item layout that still referenced state that had just
-been deleted.
-
-This change fixes all three issues:
-
-- eagerly create the parent workspaces row as soon as a new workspace ID is
-  allocated, before any item serializer can write child rows
-- keep item persistence on the existing serialization queue, but add an
-  ordering barrier before saving workspace layout so the layout is never
-  published ahead of the item state it references
-- during restore, wait for the queued serialization of newly added
-  deserialized items before cleaning up stale persisted item IDs, and skip
-  that cleanup pass if the barrier cannot be established or awaited so stale
-  rows are kept rather than deleting still-needed state
-
-See also <https://github.com/zed-industries/zed/pull/50873>.
-
-diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
-index e0ad046e8d..aeb4c3ba39 100644
---- a/crates/workspace/src/persistence.rs
-+++ b/crates/workspace/src/persistence.rs
-@@ -2124,6 +2124,13 @@ impl WorkspaceDb {
-         }
-     }
- 
-+    query! {
-+        pub(crate) async fn ensure_workspace_row(workspace_id: WorkspaceId) -> Result<()> {
-+            INSERT OR IGNORE INTO workspaces(workspace_id)
-+            VALUES (?1)
-+        }
-+    }
-+
-     query! {
-         pub(crate) async fn set_window_open_status(workspace_id: WorkspaceId, bounds: SerializedWindowBounds, display: Uuid) -> Result<()> {
-             UPDATE workspaces
-diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
-index 4141952cc7..3ea631ed6f 100644
---- a/crates/workspace/src/workspace.rs
-+++ b/crates/workspace/src/workspace.rs
-@@ -1175,6 +1175,11 @@ enum WorkspaceLocation {
-     None,
- }
- 
-+enum SerializableItemMessage {
-+    Item(Box<dyn SerializableItemHandle>),
-+    Barrier(oneshot::Sender<()>),
-+}
-+
- type PromptForNewPath = Box<
-     dyn Fn(
-         &mut Workspace,
-@@ -1253,7 +1258,7 @@ pub struct Workspace {
-     on_prompt_for_open_path: Option<PromptForOpenPath>,
-     terminal_provider: Option<Box<dyn TerminalProvider>>,
-     debugger_provider: Option<Arc<dyn DebuggerProvider>>,
--    serializable_items_tx: UnboundedSender<Box<dyn SerializableItemHandle>>,
-+    serializable_items_tx: UnboundedSender<SerializableItemMessage>,
-     _items_serializer: Task<Result<()>>,
-     session_id: Option<String>,
-     scheduled_tasks: Vec<Task<()>>,
-@@ -1554,7 +1559,7 @@ impl Workspace {
-         }
- 
-         let (serializable_items_tx, serializable_items_rx) =
--            mpsc::unbounded::<Box<dyn SerializableItemHandle>>();
-+            mpsc::unbounded::<SerializableItemMessage>();
-         let _items_serializer = cx.spawn_in(window, async move |this, cx| {
-             Self::serialize_items(&this, serializable_items_rx, cx).await
-         });
-@@ -1759,6 +1764,7 @@ impl Workspace {
-             } else {
-                 DB.next_id().await.unwrap_or_else(|_| Default::default())
-             };
-+            DB.ensure_workspace_row(workspace_id).await?;
- 
-             let toolchains = DB.toolchains(workspace_id).await?;
- 
-@@ -6036,8 +6042,16 @@ impl Workspace {
-                     window_id: Some(window.window_handle().window_id().as_u64()),
-                     user_toolchains,
-                 };
-+                let item_serialization_barrier = self.item_serialization_barrier();
- 
-                 window.spawn(cx, async move |_| {
-+                    let Some(item_serialization_barrier) = item_serialization_barrier.log_err()
-+                    else {
-+                        return;
-+                    };
-+                    if item_serialization_barrier.await.log_err().is_none() {
-+                        return;
-+                    }
-                     persistence::DB.save_workspace(serialized_workspace).await;
-                 })
-             }
-@@ -6108,31 +6122,49 @@ impl Workspace {
- 
-     async fn serialize_items(
-         this: &WeakEntity<Self>,
--        items_rx: UnboundedReceiver<Box<dyn SerializableItemHandle>>,
-+        mut items_rx: UnboundedReceiver<SerializableItemMessage>,
-         cx: &mut AsyncWindowContext,
-     ) -> Result<()> {
-         const CHUNK_SIZE: usize = 200;
- 
--        let mut serializable_items = items_rx.ready_chunks(CHUNK_SIZE);
-+        while let Some(message) = items_rx.next().await {
-+            let mut unique_items = HashMap::default();
-+            let mut barrier = None;
-+            let mut channel_closed = false;
- 
--        while let Some(items_received) = serializable_items.next().await {
--            let unique_items =
--                items_received
--                    .into_iter()
--                    .fold(HashMap::default(), |mut acc, item| {
--                        acc.entry(item.item_id()).or_insert(item);
--                        acc
--                    });
-+            Self::push_serializable_item_message(message, &mut unique_items, &mut barrier);
- 
--            // We use into_iter() here so that the references to the items are moved into
--            // the tasks and not kept alive while we're sleeping.
--            for (_, item) in unique_items.into_iter() {
--                if let Ok(Some(task)) = this.update_in(cx, |workspace, window, cx| {
--                    item.serialize(workspace, false, window, cx)
--                }) {
--                    cx.background_spawn(async move { task.await.log_err() })
--                        .detach();
-+            while barrier.is_none() && unique_items.len() < CHUNK_SIZE {
-+                match items_rx.try_next() {
-+                    Ok(Some(message)) => {
-+                        Self::push_serializable_item_message(
-+                            message,
-+                            &mut unique_items,
-+                            &mut barrier,
-+                        );
-+                    }
-+                    Ok(None) => {
-+                        channel_closed = true;
-+                        break;
-+                    }
-+                    Err(_) => break,
-+                }
-+            }
-+
-+            let batch_succeeded = Self::serialize_item_batch(this, unique_items, cx)
-+                .await
-+                .log_err()
-+                .is_some();
-+
-+            if let Some(barrier) = barrier {
-+                if batch_succeeded {
-+                    let _ = barrier.send(());
-                 }
-+                continue;
-+            }
-+
-+            if channel_closed {
-+                break;
-             }
- 
-             cx.background_executor()
-@@ -6143,12 +6175,54 @@ impl Workspace {
-         Ok(())
-     }
- 
-+    fn push_serializable_item_message(
-+        message: SerializableItemMessage,
-+        unique_items: &mut HashMap<EntityId, Box<dyn SerializableItemHandle>>,
-+        barrier: &mut Option<oneshot::Sender<()>>,
-+    ) {
-+        match message {
-+            SerializableItemMessage::Item(item) => {
-+                unique_items.entry(item.item_id()).or_insert(item);
-+            }
-+            SerializableItemMessage::Barrier(sender) => {
-+                *barrier = Some(sender);
-+            }
-+        }
-+    }
-+
-+    async fn serialize_item_batch(
-+        this: &WeakEntity<Self>,
-+        unique_items: HashMap<EntityId, Box<dyn SerializableItemHandle>>,
-+        cx: &mut AsyncWindowContext,
-+    ) -> Result<()> {
-+        let serialize_tasks = match this.update_in(cx, move |workspace, window, cx| {
-+            unique_items
-+                .into_values()
-+                .filter_map(|item| item.serialize(workspace, false, window, cx))
-+                .collect::<Vec<_>>()
-+        }) {
-+            Ok(serialize_tasks) => serialize_tasks,
-+            Err(_) => return Ok(()),
-+        };
-+
-+        try_join_all(serialize_tasks).await?;
-+        Ok(())
-+    }
-+
-+    fn item_serialization_barrier(&self) -> Result<oneshot::Receiver<()>> {
-+        let (sender, receiver) = oneshot::channel();
-+        self.serializable_items_tx
-+            .unbounded_send(SerializableItemMessage::Barrier(sender))
-+            .map_err(|err| anyhow!("failed to send item serialization barrier: {err}"))?;
-+        Ok(receiver)
-+    }
-+
-     pub(crate) fn enqueue_item_serialization(
-         &mut self,
-         item: Box<dyn SerializableItemHandle>,
-     ) -> Result<()> {
-         self.serializable_items_tx
--            .unbounded_send(item)
-+            .unbounded_send(SerializableItemMessage::Item(item))
-             .map_err(|err| anyhow!("failed to send serializable item over channel: {err}"))
-     }
- 
-@@ -6252,24 +6326,42 @@ impl Workspace {
-             // after loading the items, we might have different items and in order to avoid
-             // the database filling up, we delete items that haven't been loaded now.
-             //
--            // The items that have been loaded, have been saved after they've been added to the workspace.
--            let clean_up_tasks = workspace.update_in(cx, |_, window, cx| {
--                item_ids_by_kind
--                    .into_iter()
--                    .map(|(item_kind, loaded_items)| {
--                        SerializableItemRegistry::cleanup(
--                            item_kind,
--                            serialized_workspace.id,
--                            loaded_items,
--                            window,
--                            cx,
--                        )
--                        .log_err()
--                    })
--                    .collect::<Vec<_>>()
--            })?;
-+            // Newly deserialized items only enqueue serialization when they are added to their panes.
-+            // Wait for that queued work to finish before deleting the old persisted item ids.
-+            let item_serialization_barrier = workspace
-+                .update_in(cx, |workspace, _, _| {
-+                    workspace.item_serialization_barrier().log_err()
-+                })
-+                .log_err()
-+                .flatten();
-+
-+            let item_serialization_flushed = if let Some(item_serialization_barrier) =
-+                item_serialization_barrier
-+            {
-+                item_serialization_barrier.await.log_err().is_some()
-+            } else {
-+                false
-+            };
- 
--            futures::future::join_all(clean_up_tasks).await;
-+            if item_serialization_flushed {
-+                let clean_up_tasks = workspace.update_in(cx, |_, window, cx| {
-+                    item_ids_by_kind
-+                        .into_iter()
-+                        .map(|(item_kind, loaded_items)| {
-+                            SerializableItemRegistry::cleanup(
-+                                item_kind,
-+                                serialized_workspace.id,
-+                                loaded_items,
-+                                window,
-+                                cx,
-+                            )
-+                            .log_err()
-+                        })
-+                        .collect::<Vec<_>>()
-+                })?;
-+
-+                futures::future::join_all(clean_up_tasks).await;
-+            }
- 
-             workspace
-                 .update_in(cx, |workspace, window, cx| {
-@@ -9001,6 +9093,7 @@ fn deserialize_remote_project(
-         } else {
-             persistence::DB.next_id().await?
-         };
-+        persistence::DB.ensure_workspace_row(workspace_id).await?;
- 
-         Ok((workspace_id, serialized_workspace))
-     })

gnu/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch

@@ -1,163 +0,0 @@
-From: Danny Milosavljevic <dannym@friendly-machines.com>
-Date: Fri, 6 Mar 2026 20:20:00 +0000
-Subject: [PATCH] workspace: Keep local workspaces whose roots are only regular files
-License: expat
-
-Zed persists local workspaces for standalone regular files as well as
-directory-backed projects. Recent-workspace cleanup and last-session
-restoration were using a helper that only kept local workspaces if all
-saved paths existed and at least one of them was a directory.
-
-That made local workspaces whose roots were only regular files look
-invalid. A background recent-workspaces pass could then delete the
-workspace row, which in turn cascaded to item-specific state such as
-editors. In the window edited-state restore test, reopening a
-standalone regular file could therefore fail because the saved editor
-row had been deleted by that cleanup path.
-
-Fix this by treating a local workspace as valid whenever all of its
-saved paths still exist, whether those paths are directories or
-regular files. Apply the same rule to last-session workspace
-restoration, and add regression coverage for both code paths.
-
-diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
---- a/crates/workspace/src/persistence.rs
-+++ b/crates/workspace/src/persistence.rs
-@@ -1783,19 +1783,13 @@ impl WorkspaceDb {
-         }
-     }
- 
--    async fn all_paths_exist_with_a_directory(paths: &[PathBuf], fs: &dyn Fs) -> bool {
--        let mut any_dir = false;
-+    async fn all_paths_exist(paths: &[PathBuf], fs: &dyn Fs) -> bool {
-         for path in paths {
--            match fs.metadata(path).await.ok().flatten() {
--                None => return false,
--                Some(meta) => {
--                    if meta.is_dir {
--                        any_dir = true;
--                    }
--                }
-+            if fs.metadata(path).await.ok().flatten().is_none() {
-+                return false;
-             }
-         }
--        any_dir
-+        true
-     }
- 
-     // Returns the recent locations which are still valid on disk and deletes ones which no longer
-@@ -1843,7 +1837,11 @@ impl WorkspaceDb {
-             // If a local workspace points to WSL, this check will cause us to wait for the
-             // WSL VM and file server to boot up. This can block for many seconds.
-             // Supported scenarios use remote workspaces.
--            if !has_wsl_path && Self::all_paths_exist_with_a_directory(paths.paths(), fs).await {
-+            //
-+            // Local workspaces may legitimately contain only regular files (for example, a
-+            // standalone file opened outside any worktree). Those should be preserved as
-+            // long as all of their saved paths still exist.
-+            if !has_wsl_path && Self::all_paths_exist(paths.paths(), fs).await {
-                 result.push((id, SerializedWorkspaceLocation::Local, paths, timestamp));
-             } else {
-                 delete_tasks.push(self.delete_workspace_by_id(id));
-@@ -1903,7 +1901,7 @@ impl WorkspaceDb {
-                     window_id,
-                 });
-             } else {
--                if Self::all_paths_exist_with_a_directory(paths.paths(), fs).await {
-+                if Self::all_paths_exist(paths.paths(), fs).await {
-                     workspaces.push(SessionWorkspace {
-                         workspace_id,
-                         location: SerializedWorkspaceLocation::Local,
-@@ -3425,6 +3423,91 @@ mod tests {
-         );
-     }
- 
-+    #[gpui::test]
-+    async fn test_recent_workspaces_on_disk_keeps_regular_file_only_workspace(
-+        cx: &mut gpui::TestAppContext,
-+    ) {
-+        let dir = tempfile::TempDir::with_prefix("regular-file-workspace").unwrap();
-+        let regular_file = dir.path().join("a");
-+
-+        let fs = fs::FakeFs::new(cx.executor());
-+        fs.insert_tree(dir.path(), json!({"a": "hey"})).await;
-+
-+        let db = WorkspaceDb::open_test_db("test_recent_workspaces_keeps_regular_file_only")
-+            .await;
-+        let workspace = SerializedWorkspace {
-+            id: WorkspaceId(1),
-+            paths: PathList::new(&[regular_file.clone()]),
-+            location: SerializedWorkspaceLocation::Local,
-+            center_group: Default::default(),
-+            window_bounds: Default::default(),
-+            display: Default::default(),
-+            docks: Default::default(),
-+            centered_layout: false,
-+            breakpoints: Default::default(),
-+            session_id: None,
-+            window_id: Some(1),
-+            user_toolchains: Default::default(),
-+        };
-+
-+        db.save_workspace(workspace.clone()).await;
-+
-+        let recent = db.recent_workspaces_on_disk(fs.as_ref()).await.unwrap();
-+        assert_eq!(
-+            recent,
-+            vec![(
-+                workspace.id,
-+                SerializedWorkspaceLocation::Local,
-+                workspace.paths.clone(),
-+                recent[0].3,
-+            )]
-+        );
-+        assert_eq!(db.workspace_for_roots(&[regular_file]).unwrap().id, workspace.id);
-+    }
-+
-+    #[gpui::test]
-+    async fn test_last_session_workspace_locations_keeps_regular_file_only_workspace(
-+        cx: &mut gpui::TestAppContext,
-+    ) {
-+        let dir = tempfile::TempDir::with_prefix("regular-file-workspace-session").unwrap();
-+        let regular_file = dir.path().join("a");
-+
-+        let fs = fs::FakeFs::new(cx.executor());
-+        fs.insert_tree(dir.path(), json!({"a": "hey"})).await;
-+
-+        let db = WorkspaceDb::open_test_db("test_last_session_keeps_regular_file_only").await;
-+        let workspace = SerializedWorkspace {
-+            id: WorkspaceId(1),
-+            paths: PathList::new(&[regular_file.clone()]),
-+            location: SerializedWorkspaceLocation::Local,
-+            center_group: Default::default(),
-+            window_bounds: Default::default(),
-+            display: Default::default(),
-+            docks: Default::default(),
-+            centered_layout: false,
-+            breakpoints: Default::default(),
-+            session_id: Some("one-session".to_owned()),
-+            window_id: Some(7),
-+            user_toolchains: Default::default(),
-+        };
-+
-+        db.save_workspace(workspace.clone()).await;
-+
-+        let locations = db
-+            .last_session_workspace_locations("one-session", None, fs.as_ref())
-+            .await
-+            .unwrap();
-+        assert_eq!(
-+            locations,
-+            vec![SessionWorkspace {
-+                workspace_id: workspace.id,
-+                location: SerializedWorkspaceLocation::Local,
-+                paths: workspace.paths,
-+                window_id: Some(WindowId::from(7u64)),
-+            }]
-+        );
-+    }
-+
-     #[gpui::test]
-     async fn test_get_or_create_ssh_project() {
-         let db = WorkspaceDb::open_test_db("test_get_or_create_ssh_project").await;

gnu/packages/patches/zed-0.225.10-remove-patch-crates-io.patch

@@ -1,24 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Subject: Remove the [patch.crates-io] section from Cargo.toml.
-Date: 2026-03-01
-License: expat
-
-These overrides redirect crates-io dependencies to git sources, which cannot be
-fetched in an offline build.  With vendored sources the overrides are unnecessary.
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -804,13 +804,6 @@
-     "Win32_Media",
- ]
-
--[patch.crates-io]
--async-task = { git = "https://github.com/smol-rs/async-task.git", rev = "b4486cd71e4e94fbda54ce6302444de14f4d190e" }
--notify = { git = "https://github.com/zed-industries/notify.git", rev = "ce58c24cad542c28e04ced02e20325a4ec28a31d" }
--notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "ce58c24cad542c28e04ced02e20325a4ec28a31d" }
--windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }
--calloop = { git = "https://github.com/zed-industries/calloop" }
--
- [profile.dev]
- split-debuginfo = "unpacked"
- incremental = true

gnu/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch

@@ -1,75 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Subject: Use mock livekit client on Linux to avoid libwebrtc dependency.
-Date: 2026-03-01
-License: GPL3+
-
-libwebrtc is not packaged in Guix and is difficult to build from source.
-Zed already has a mock_client fallback for FreeBSD and Windows-GNU which
-lack libwebrtc.  Add target_os = "linux" to those cfg conditions so Linux
-also uses mock_client, and exclude the libwebrtc/livekit dependencies from
-Cargo.toml on Linux.  This disables voice/video calls but allows the rest
-of Zed to build.
-
---- a/crates/livekit_client/Cargo.toml	2026-03-01 21:21:38.647599342 +0000
-+++ b/crates/livekit_client/Cargo.toml	2026-03-01 21:22:19.846482866 +0000
-@@ -44,7 +44,7 @@
- ui.workspace = true
- util.workspace = true
- 
--[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
-+[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))'.dependencies]
- libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
- livekit = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks", features = ["__rustls-tls"] }
- 
---- a/crates/livekit_client/src/lib.rs	2026-03-01 21:21:44.752291052 +0000
-+++ b/crates/livekit_client/src/lib.rs	2026-03-01 21:22:37.234363786 +0000
-@@ -15,7 +15,8 @@
-         test,
-         feature = "test-support",
-         all(target_os = "windows", target_env = "gnu"),
--        target_os = "freebsd"
-+        target_os = "freebsd",
-+        target_os = "linux"
-     ))
- ))]
- mod livekit_client;
-@@ -25,7 +26,8 @@
-         test,
-         feature = "test-support",
-         all(target_os = "windows", target_env = "gnu"),
--        target_os = "freebsd"
-+        target_os = "freebsd",
-+        target_os = "linux"
-     ))
- ))]
- pub use livekit_client::*;
-@@ -36,7 +38,8 @@
-         test,
-         feature = "test-support",
-         all(target_os = "windows", target_env = "gnu"),
--        target_os = "freebsd"
-+        target_os = "freebsd",
-+        target_os = "linux"
-     )
- ))]
- mod mock_client;
-@@ -46,7 +49,8 @@
-         test,
-         feature = "test-support",
-         all(target_os = "windows", target_env = "gnu"),
--        target_os = "freebsd"
-+        target_os = "freebsd",
-+        target_os = "linux"
-     )
- ))]
- pub mod test;
-@@ -56,7 +60,8 @@
-         test,
-         feature = "test-support",
-         all(target_os = "windows", target_env = "gnu"),
--        target_os = "freebsd"
-+        target_os = "freebsd",
-+        target_os = "linux"
-     )
- ))]
- pub use mock_client::*;

gnu/packages/prolog.scm

@@ -4,7 +4,7 @@
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2021, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2024-2026 jgart <jgart@dismail.de>
+;;; Copyright © 2024-2025 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,7 +39,6 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages game-development)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages libedit)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages maths)
@@ -237,7 +236,7 @@ it.")
 (define-public trealla
   (package
     (name "trealla")
-    (version "2.92.30")
+    (version "2.92.25")
     (source
      (origin
        (method git-fetch)
@@ -246,13 +245,12 @@ it.")
           (url "https://github.com/trealla-prolog/trealla")
           (commit (string-append "v" version))))
        (sha256
-        (base32 "1vbjv2nf3c2npf349i9y0zknc2g0hizksv0yhgscdpwzvzfp6n9m"))
+        (base32 "1asp09g225971fq8n96xh688mk3xrvdj5pd6hvvqc1y1hgimyyr7"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (inputs
      (list curl
            gsl
-           libedit
            libffi
            openssl
            raylib

gnu/packages/python-web.scm

@@ -106,16 +106,28 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages python-web)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix deprecation)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
@@ -128,7 +140,6 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lsof)
   #:use-module (gnu packages node)
-  #:use-module (gnu packages nss)
   #:use-module (gnu packages openstack)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
@@ -154,17 +165,6 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages)
-  #:use-module (guix build-system cargo)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix deprecation)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (srfi srfi-1))
 
 (define-public python-aiocoap

gnu/packages/python-xyz.scm

@@ -197,6 +197,9 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages python-xyz)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages attr)
   #:use-module (gnu packages autotools)
@@ -207,10 +210,11 @@
   #:use-module (gnu packages bioinformatics)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages build-tools)
-  #:use-module (gnu packages c)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages c)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages databases)
@@ -219,7 +223,6 @@
   #:use-module (gnu packages digest)
   #:use-module (gnu packages django)
   #:use-module (gnu packages djvu)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages duckdb)
   #:use-module (gnu packages elf)
@@ -268,7 +271,6 @@
   #:use-module (gnu packages networking)
   #:use-module (gnu packages ninja)
   #:use-module (gnu packages node)
-  #:use-module (gnu packages nss)
   #:use-module (gnu packages openstack)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pdf)
@@ -307,10 +309,10 @@
   #:use-module (gnu packages video)
   #:use-module (gnu packages web)
   #:use-module (gnu packages wxwidgets)
-  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages)
+  #:use-module (guix packages)
   #:use-module (guix build-system cargo)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
@@ -320,11 +322,9 @@
   #:use-module (guix build-system python)
   #:use-module (guix deprecation)
   #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
   #:use-module (guix hg-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
@@ -13218,30 +13218,6 @@ and a plugin for Pillow.")
        (sha256
         (base32 "16mkap63d14f69105b3bm8pi64fvpdznncgn48vhgls0jf977m31"))))))
 
-(define-public python-jxlpy
-  (package
-    (name "python-jxlpy")
-    (version "0.9.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/olokelo/jxlpy")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1d1jrvpyvp8rix8kfmi962hl73mj0f7mib0xzk04va4kzc9p726s"))))
-    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f))      ; no tests, just examples
-    (inputs (list libjxl))
-    (propagated-inputs (list python-cython))
-    (native-inputs (list python-cython python-setuptools))
-    (home-page "https://github.com/olokelo/jxlpy")
-    (synopsis "JPEG XL integration in Python")
-    (description "This package provides Cython-based Python bindings for
-libjxl, as well as a pillow plugin.")
-    (license license:expat)))
-
 (define-public python-pixelmatch
   (package
     (name "python-pixelmatch")
@@ -21675,6 +21651,26 @@ programming errors.")
 into aligned columns.")
     (license license:expat)))
 
+(define-public python-chai
+  (package
+    (name "python-chai")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "chai" version))
+       (sha256
+        (base32 "1k6n6zbgrrs83crp6mr3yqj9zlv40b8rpisyrliwsq7naml2p3gz"))
+       (patches (search-patches "python-chai-drop-python2.patch"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pytest python-setuptools))
+    (home-page "https://github.com/agoragames/chai")
+    (synopsis "Mocking framework for Python")
+    (description
+     "Chai provides an api for mocking, stubbing and spying your python
+objects, patterned after the Mocha library for Ruby.")
+    (license license:bsd-3)))
+
 (define-public python-pysol-cards
   (package
     (name "python-pysol-cards")
@@ -40302,6 +40298,47 @@ e.g. filters, callbacks and errbacks can all be promises.")
         (sha256
          (base32 "1gj57xqgrg53yfn9ypikgky01hvazxdyl556kwsc7b7avyxm9dbv")))))))
 
+;; XXX: No new release since 2021, no updates on default branch since 2023, no
+;; users in Guix; consider to remove if it keeps failing to build.
+(define-public python-virtualenv-clone
+  (package
+    (name "python-virtualenv-clone")
+    (version "0.5.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/edwardgeorge/virtualenv-clone")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0p0d1y3axvjfnxlgwjx2374gikc8bmc82g0m7yashihbikh7pcxa"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "-k" (string-join
+                    ;; UnicodeDecodeError: 'utf-8' codec can't decode byte
+                    ;; 0xba in position 10: invalid start byte
+                    (list "not test_clone_contents"
+                          ;;  AssertionError: All versions were skipped.
+                          "test_clone_syspath"
+                          "test_clone_version"
+                          "test_virtualenv_syspath"
+                          "test_virtualenv_versions")
+                    " and not "))))
+    (native-inputs
+     (list python-pytest
+           python-setuptools
+           python-tomli
+           python-virtualenv
+           python-wheel))
+    (home-page "https://github.com/edwardgeorge/virtualenv-clone")
+    (synopsis "Clone a non-relocatable virtualenv cleanly")
+    (description
+     "Clone non-relocatable virtualenvs without breaking site-packages.")
+    (license license:expat)))
+
 (define-public python-vncdotool
   (package
     (name "python-vncdotool")

gnu/packages/rpc.scm

@@ -24,13 +24,23 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages rpc)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages protobuf)
@@ -40,16 +50,6 @@
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages regex)
   #:use-module (gnu packages tls)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (srfi srfi-1))
 
 ;; XXX: Starting from version 1.47.5, opencensus-proto is required.

gnu/packages/rust-apps.scm

@@ -263,77 +263,6 @@ capable of sustaining any number of domain names in a bunch of original
 alternative zones.")
     (license license:agpl3+)))
 
-(define-public ast-grep
-  (package
-    (name "ast-grep")
-    (version "0.42.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/ast-grep/ast-grep")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1h6335dq768vn7gfyhi90j1ljawpsf7wzgqzysgbwrwnk6h67mad"))
-       (snippet
-        #~(begin (use-modules (guix build utils))
-                 (delete-file-recursively "fixtures")))))
-    (build-system cargo-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:cargo-install-paths ''("crates/cli")
-      #:cargo-test-flags
-      ''("--"
-         ;; These tests require the bundled shared libraries.
-         "--skip=test::test_load_parser"
-         "--skip=test::test_register_lang")
-      #:modules '((guix build cargo-build-system)
-                  (guix build utils)
-                  (ice-9 match))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'install-completions
-            (lambda* (#:key native-inputs #:allow-other-keys)
-              (for-each
-                (match-lambda
-                  ((shell . path)
-                   (mkdir-p (in-vicinity #$output (dirname path)))
-                   (let ((binary
-                           (if #$(%current-target-system)
-                               (search-input-file native-inputs "bin/ast-grep")
-                               (in-vicinity #$output "bin/ast-grep"))))
-                     (with-output-to-file (in-vicinity #$output path)
-                       (lambda _
-                         (invoke binary "completions" shell))))))
-                '(("bash" . "share/bash-completion/completions/ast-grep")
-                  ("elvish" . "share/elvish/lib/ast-grep")
-                  ("fish" . "share/fish/vendor_completions.d/ast-grep.fish")
-                  ("zsh" . "share/zsh/site-functions/_ast-grep")))))
-          (add-after 'install 'wrap-sg
-            (lambda _
-              ;; sg needs ast-grep to be in its PATH.
-              (wrap-program (in-vicinity #$output "bin/sg")
-                `("PATH" ":" prefix
-                  (,(dirname (in-vicinity #$output "bin/ast-grep"))))))))))
-    (native-inputs
-     (if (%current-target-system)
-         (list this-package)
-         '()))
-    (inputs (cons* bash-minimal (cargo-inputs 'ast-grep)))
-    (home-page "https://github.com/ast-grep/ast-grep")
-    (synopsis "CLI tool for code structural search, lint, and rewriting")
-    (description
-     "@code{ast-grep} is an abstract syntax tree based tool to search code by
-pattern code.  Think of it as your old-friend grep, but matching AST nodes
-instead of text.  Write patterns as if you are writing ordinary code.  It will
-match all code that has the same syntactical structure.  You can use @code{$}
-and upper case letters as a wildcard, e.g. @code{$MATCH}, to match any single
-AST node.  Think of it as regular expression dot @code{.}, except it is not
-textual.")
-    (license license:expat)))
-
 (define-public bat
   (package
     (name "bat")
@@ -1964,7 +1893,7 @@ JSON viewer and jq filter editor.")
 (define-public jujutsu
   (package
     (name "jujutsu")
-    (version "0.40.0")
+    (version "0.39.0")
     (source
      (origin
        (method git-fetch)
@@ -1973,7 +1902,7 @@ JSON viewer and jq filter editor.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wdl6jqvv3bhdij65gsn0lpycw2qg2i5p1rc2wi42fdhghsfq6iw"))))
+        (base32 "0c0n56b5y6wmyvcc18nhrfsmcavjlh2zwv9224lrcs6h602a5jdd"))))
     (build-system cargo-build-system)
     (arguments
      (list

gnu/packages/rust-sources.scm

@@ -59,128 +59,6 @@
        (base32
         "1yhs9lj9gnzbvimv0y5f1a4my0slbvygkcjjkaxd4wkkyfvfbkxy")))))
 
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-(define-public rust-alacritty-0.25.1.9d9640d
-  (hidden-package
-   (package
-     (name "rust-alacritty")
-     (version "0.25.1")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/zed-industries/alacritty")
-          (commit "9d9640d4e56d67a09d049f9c0a300aae08d4f61e")))
-        (file-name
-         (git-file-name "rust-alacritty" "0.25.1.9d9640d"))
-        (sha256
-         (base32 "16g4jdbwdhqihc2x403fdaxf6m9gcj44cm53dyk68b3wl7chh29s"))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("alacritty_terminal")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")))
-     (inputs (cargo-inputs 'rust-alacritty-0.25.1.9d9640d))
-     (home-page "https://github.com/zed-industries/alacritty")
-     (synopsis "Terminal emulator library")
-     (description
-      "This package provides a terminal emulator library.")
-     (license license:asl2.0))))
-
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-(define-public rust-candle-0.9.1.724d75e
-  (hidden-package
-   (package
-     (name "rust-candle")
-     (version "0.9.1")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/zed-industries/candle")
-          (commit "724d75eb3deebefe83f2a7381a45d4fac6eda383")))
-        (file-name
-         (git-file-name "rust-candle" "0.9.1.724d75e"))
-        (sha256
-         (base32 "1n9g84g0ikldw42f0j3ad975vjvx6ildwqh8dw3zi3rps518hx14"))
-        (patches
-         (search-patches
-          "rust-candle-0.9.1-add-candle-onnx-to-workspace.patch"))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("candle-core"
-                                      "candle-nn"
-                                      "candle-onnx")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")))
-     (inputs (cargo-inputs 'rust-candle-0.9.1.724d75e))
-     (home-page "https://github.com/huggingface/candle")
-     (synopsis "Minimalist ML framework for Rust")
-     (description
-      "This package provides a minimalist ML framework for Rust.")
-     (license (list license:asl2.0 license:expat)))))
-
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-(define-public rust-dap-types-0.0.1.1b461b3
-  (hidden-package
-   (package
-     (name "rust-dap-types")
-     (version "0.0.1")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/zed-industries/dap-types")
-          (commit "1b461b310481d01e02b2603c16d7144b926339f8")))
-        (file-name
-         (git-file-name "rust-dap-types" "0.0.1.1b461b3"))
-        (sha256
-         (base32 "0snc05ia4jvykajavsvyxcyn24s2jxbw7k9wmby23r1aqxf31i0z"))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("dap-types")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")))
-     (inputs (cargo-inputs 'rust-dap-types-0.0.1.1b461b3))
-     (home-page "https://github.com/zed-industries/dap-types")
-     (synopsis "Rust types for the Debug Adapter Protocol")
-     (description
-      "This package provides Rust types for the Debug Adapter Protocol.")
-     (license (list license:asl2.0 license:expat)))))
-
 (define-public rust-deunicode-1
   (hidden-package
    (package
@@ -224,46 +102,6 @@
 transliterating them.  It supports Emoji and Chinese.")
      (license license:bsd-3))))
 
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-(define-public rust-gh-workflow-0.8.0.c9eac0e
-  (hidden-package
-   (package
-     (name "rust-gh-workflow")
-     (version "0.8.0")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/zed-industries/gh-workflow")
-          (commit "c9eac0ed361583e1072860d96776fa52775b82ac")))
-        (file-name
-         (git-file-name "rust-gh-workflow" "0.8.0.c9eac0e"))
-        (sha256
-         (base32 "172bn9b16f7qj3mn0h8r8bwiiiw2awgqlzj5n6f2gjcgk5nmh1hp"))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("gh-workflow-macros"
-                                      "gh-workflow")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")))
-     (inputs (cargo-inputs 'rust-gh-workflow-0.8.0.c9eac0e))
-     (home-page "https://github.com/tailcallhq/gh-workflow")
-     (synopsis "Type-safe GitHub Actions workflow generation")
-     (description
-      "This package provides type-safe GitHub Actions workflow generation.")
-     (license license:expat))))
-
 (define-public rust-hypher-0.1
   (hidden-package
    (package
@@ -307,191 +145,6 @@ transliterating them.  It supports Emoji and Chinese.")
      (description "@code{hypher} is a Rust library for syllabification.")
      (license (list license:expat license:asl2.0)))))
 
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-;;
-;; Only livekit-protocol, livekit-runtime, and livekit-api are
-;; packaged.  The libwebrtc, webrtc-sys, and livekit crates are
-;; disabled on Linux by our zed-use-mock-livekit-on-linux patch
-;; (which adds target_os = "linux" to the cfg gate), but their
-;; Cargo.toml files must remain for workspace resolution; their
-;; source is replaced with empty stubs.  The snippet also deletes
-;; unused workspace members (livekit-ffi, soxr-sys, yuv-sys,
-;; imgproc, examples) and the 1.6 MiB generated livekit.serde.rs
-;; (guarded by a nonexistent "serde" feature, so never compiled).
-;;
-;; TODO: Regenerate livekit-protocol/src/livekit.rs (5650 lines)
-;; from the .proto source in the livekit-protocol/protocol
-;; submodule (github.com/livekit/protocol) using prost-build and
-;; pbjson-build as native-inputs, then delete the shipped copy.
-(define-public rust-livekit-0.7.8.5f04705
-  (hidden-package
-   (package
-     (name "rust-livekit")
-     (version "0.7.8")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/zed-industries/livekit-rust-sdks")
-          (commit "5f04705ac3f356350ae31534ffbc476abc9ea83d")))
-        (file-name
-         (git-file-name "rust-livekit" "0.7.8.5f04705"))
-        (sha256
-         (base32 "1irnw9dax0nl8rl7jxdxs5vw6hg166jj4gf1s5cza6igvmrkl6y9"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin
-            (for-each delete-file-recursively
-                      '(".github" "examples" "imgproc"
-                        "livekit-ffi" "soxr-sys" "yuv-sys"
-                        ;; Keep Cargo.toml for workspace resolution
-                        ;; but replace source with stubs.
-                        "libwebrtc/src"
-                        "livekit/src"
-                        "webrtc-sys/src"
-                        "webrtc-sys/include"
-                        "webrtc-sys/libwebrtc"))
-            (for-each (lambda (f)
-                        (mkdir-p (dirname f))
-                        (call-with-output-file f (const #t)))
-                      '("libwebrtc/src/lib.rs"
-                        "livekit/src/lib.rs"
-                        "webrtc-sys/src/lib.rs"))
-            (delete-file
-             "livekit-protocol/src/livekit.serde.rs")
-            (substitute* "Cargo.toml"
-              (("\"livekit-ffi\",") "")
-              (("\"soxr-sys\",") "")
-              (("\"yuv-sys\",") "")
-              (("\"imgproc\",") ""))))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("livekit-protocol"
-                                      "livekit-runtime"
-                                      "livekit-api"
-                                      "webrtc-sys-build"
-                                      "webrtc-sys"
-                                      "libwebrtc"
-                                      "livekit")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")
-            #:phases
-            #~(modify-phases %standard-phases
-               (replace 'package
-                 (lambda* (#:key source (cargo-package-crates '())
-                           (cargo-package-flags '("--no-metadata" "--no-verify"))
-                           (vendor-dir "guix-vendor")
-                           #:allow-other-keys)
-                   (use-modules (ice-9 ftw))
-                   ;; Same as the standard package phase, but deletes
-                   ;; cargo's target/package/tmp-crate/ scratch directory
-                   ;; between the packaging loop and the repacking step.
-                   ;; Cargo copies .crate files there during packaging and
-                   ;; does not clean up.  The repacking step's recursive
-                   ;; find-files picks them up, and scandir confuses the
-                   ;; tmp-crate directory with an extracted crate when
-                   ;; names sort after "tmp-crate" alphabetically.
-                   (when (file-exists? "Cargo.toml.orig")
-                     (delete-file "Cargo.toml.orig"))
-                   (for-each
-                    (lambda (pkg)
-                      (apply invoke "cargo" "package" "--offline"
-                             "--package" pkg cargo-package-flags)
-                      (for-each
-                       (lambda (crate)
-                         (invoke "tar" "xzf" crate "-C" vendor-dir))
-                       (find-files "target/package" "\\.crate$"))
-                      ((assoc-ref %standard-phases 'patch-cargo-checksums)
-                       #:vendor-dir vendor-dir))
-                    cargo-package-crates)
-                   ;; Delete cargo's scratch directory.
-                   (when (file-exists? "target/package/tmp-crate")
-                     (delete-file-recursively "target/package/tmp-crate"))
-                   ;; Repack crates with deterministic timestamps.
-                   (with-directory-excursion "target/package"
-                     (for-each
-                      (lambda (crate)
-                        (invoke "tar" "xf" crate)
-                        (delete-file crate)
-                        (let ((dir
-                               (car (scandir
-                                     "."
-                                     (lambda (file)
-                                       (and (not (member file '("." "..")))
-                                            (not (string-suffix?
-                                                  ".crate" file))))))))
-                          (for-each
-                           (lambda (file)
-                             (let ((s (lstat file)))
-                               (unless (eq? (stat:type s) 'symlink)
-                                 (utime file 0 0 0 0))))
-                           (find-files dir #:directories? #t))
-                          (apply invoke "tar" "czf"
-                                 (string-append dir ".crate")
-                                 "--sort=name" "--mtime=@0"
-                                 "--owner=root:0" "--group=root:0"
-                                 (find-files dir #:directories? #t))
-                          (delete-file-recursively dir)))
-                      (find-files "." "\\.crate$"))))))))
-     (inputs (cargo-inputs 'rust-livekit-0.7.8.5f04705))
-     (home-page "https://github.com/livekit/rust-sdks")
-     (synopsis "LiveKit real-time communication SDK for Rust")
-     (description
-      "This package provides a LiveKit real-time communication SDK for Rust.")
-     (license license:asl2.0))))
-
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-(define-public rust-notify-8.2.0.ce58c24
-  (hidden-package
-   (package
-     (name "rust-notify")
-     (version "8.2.0")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/zed-industries/notify.git")
-          (commit "ce58c24cad542c28e04ced02e20325a4ec28a31d")))
-        (file-name
-         (git-file-name "rust-notify" "8.2.0.ce58c24"))
-        (sha256
-         (base32 "09zn3ll1vlsblgrdacyw3zx58xzdxlab8ba7h22bbb57n76dmkl0"))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("notify-types"
-                                      "notify")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")))
-     (inputs (cargo-inputs 'rust-notify-8.2.0.ce58c24))
-     (home-page "https://github.com/notify-rs/notify")
-     (synopsis "Cross-platform filesystem notification library")
-     (description
-      "This package provides a cross-platform filesystem notification library
-for Rust.")
-     (license (list license:asl2.0 license:expat)))))
-
 (define-public rust-pcre2-utf32-0.2
   (hidden-package
    (package
@@ -574,77 +227,6 @@ UTF-32 support.")
             "0zgqklzmyk893n82zq8d0is57npvy9lsfpqb83h1bbx9c42fl35p"))))
        (inputs (cargo-inputs 'rust-pipewire-0.8.0.93138d0))))))
 
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-(define-public rust-pet-0.1.0.d5b5bb0
-  (hidden-package
-   (package
-     (name "rust-pet")
-     (version "0.1.0")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/microsoft/python-environment-tools.git")
-          (commit "d5b5bb0c4558a51d8cc76b514bc870fd1c042f16")))
-        (file-name
-         (git-file-name "rust-pet" "0.1.0.d5b5bb0"))
-        (sha256
-         (base32 "01djr1761l7c889v9lng7igjqxiz208r2vrwij661cn2fy5xcm5f"))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("pet-fs"
-                                      "pet-core"
-                                      "pet-python-utils"
-                                      "pet-jsonrpc"
-                                      "pet-reporter"
-                                      "pet-conda"
-                                      "pet-virtualenv"
-                                      "pet-virtualenvwrapper"
-                                      "pet-env-var-path"
-                                      "pet-global-virtualenvs"
-                                      "pet-homebrew"
-                                      "pet-linux-global-python"
-                                      "pet-mac-commandlinetools"
-                                      "pet-mac-python-org"
-                                      "pet-mac-xcode"
-                                      "pet-pipenv"
-                                      "pet-pixi"
-                                      "pet-poetry"
-                                      "pet-pyenv"
-                                      "pet-telemetry"
-                                      "pet-uv"
-                                      "pet-venv"
-                                      "pet-windows-store"
-                                      "pet-windows-registry"
-                                      "pet")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")
-            #:phases
-            #~(modify-phases %standard-phases
-                (add-after 'unpack 'fix-versions
-                  (lambda _
-                    (let ((version #$(package-version this-package)))
-                      (substitute* (find-files "." "^Cargo[.]toml$")
-                        (("^(pet-[a-z-]*) = [{] path = \"([^\"]*)\" [}]" x pkg path)
-                         (string-append pkg " = { version = \"" version "\", path = \"" path "\" }")))))))))
-     (inputs (cargo-inputs 'rust-pet-0.1.0.d5b5bb0))
-     (home-page "https://github.com/microsoft/python-environment-tools")
-     (synopsis "Python environment tools")
-     (description
-      "This package provides Python environment tools.")
-     (license license:expat))))
-
 (define-public rust-pubgrub-0.3.0.b70cf70
   (let ((commit "b70cf707aa43f21b32f3a61b8a0889b15032d5c4")
         (revision "0"))
@@ -1095,47 +677,6 @@ intelligence.")
       (inputs (cons oniguruma
                     (cargo-inputs 'rust-syntect-5.3))))))
 
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-(define-public rust-tiktoken-rs-0.9.1.2570c43
-  (hidden-package
-   (package
-     (name "rust-tiktoken-rs")
-     (version "0.9.1")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/zed-industries/tiktoken-rs")
-          (commit "2570c4387a8505fb8f1d3f3557454b474f1e8271")))
-        (file-name
-         (git-file-name "rust-tiktoken-rs" "0.9.1.2570c43"))
-        (sha256
-         (base32 "0yki1whx16xqgsrnr6gjsxakj6qzyvz958g6c9h15xp154kw6573"))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("tiktoken-rs")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")))
-     (inputs (cargo-inputs 'rust-tiktoken-rs-0.9.1.2570c43))
-     (home-page "https://github.com/zurawiki/tiktoken-rs")
-     (synopsis "Rust library for OpenAI's BPE tokenizer")
-     (description
-      "This package provides Rust bindings for OpenAI's @acronym{BPE, byte
-pair encoding} tokenizer, used to count and manage tokens for OpenAI
-language models.")
-     (license license:expat))))
-
 (define-public rust-tikv-jemallocator-for-polars
   (let ((commit "c7991e5bb6b3e9f79db6b0f48dcda67c5c3d2936")
         (revision "0"))
@@ -1419,95 +960,3 @@ and runtime for AI-assisted coding.")
     (description "Glycin is a sandbox image decoder for image viewers and
 thumbnails to display untrusted content safely.")
     (license (list license:mpl2.0 license:lgpl2.1+))))
-
-;; Workspace dependency of zed.
-;;
-;; Cargo side: Cargo unifies dependency versions across zed's
-;; workspace, including this package's transitive dependencies,
-;; and records them in zed's Cargo.lock.
-;;
-;; Guix side: zed's cargo-inputs entry (generated from zed's
-;; Cargo.lock) already contains all of this package's transitive
-;; dependencies, so this package reuses zed's cargo-inputs.
-(define-public rust-zed-xim-0.4.0-zed.16f35a2
-  (hidden-package
-   (package
-     (name "rust-zed-xim")
-     (version "0.4.0-zed")
-     (source
-      (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://github.com/zed-industries/xim-rs.git")
-          (commit "16f35a2c881b815a2b6cdfd6687988e84f8447d8")))
-        (file-name
-         (git-file-name "rust-zed-xim" "0.4.0-zed.16f35a2"))
-        (sha256
-         (base32 "14cyxxdgjpbkf8ny4c46cfqjinavi2cyxzwfngldlls97m5zh555"))))
-     (build-system cargo-build-system)
-     (arguments
-      (list #:skip-build? #t
-            #:install-source? #t
-            #:cargo-package-crates ''("xim-ctext"
-                                      "xim-parser"
-                                      "zed-xim")
-            #:cargo-package-flags ''("--no-metadata" "--no-verify"
-                                     "--exclude-lockfile")
-            #:phases
-            #~(modify-phases %standard-phases
-               (replace 'package
-                 (lambda* (#:key source (cargo-package-crates '())
-                           (cargo-package-flags '("--no-metadata" "--no-verify"))
-                           (vendor-dir "guix-vendor")
-                           #:allow-other-keys)
-                   (use-modules (ice-9 ftw))
-                   ;; Same as the standard package phase, but deletes
-                   ;; cargo's target/package/tmp-crate/ scratch directory
-                   ;; between the packaging loop and the repacking step.
-                   (when (file-exists? "Cargo.toml.orig")
-                     (delete-file "Cargo.toml.orig"))
-                   (for-each
-                    (lambda (pkg)
-                      (apply invoke "cargo" "package" "--offline"
-                             "--package" pkg cargo-package-flags)
-                      (for-each
-                       (lambda (crate)
-                         (invoke "tar" "xzf" crate "-C" vendor-dir))
-                       (find-files "target/package" "\\.crate$"))
-                      ((assoc-ref %standard-phases 'patch-cargo-checksums)
-                       #:vendor-dir vendor-dir))
-                    cargo-package-crates)
-                   (when (file-exists? "target/package/tmp-crate")
-                     (delete-file-recursively "target/package/tmp-crate"))
-                   (with-directory-excursion "target/package"
-                     (for-each
-                      (lambda (crate)
-                        (invoke "tar" "xf" crate)
-                        (delete-file crate)
-                        (let ((dir
-                               (car (scandir
-                                     "."
-                                     (lambda (file)
-                                       (and (not (member file '("." "..")))
-                                            (not (string-suffix?
-                                                  ".crate" file))))))))
-                          (for-each
-                           (lambda (file)
-                             (let ((s (lstat file)))
-                               (unless (eq? (stat:type s) 'symlink)
-                                 (utime file 0 0 0 0))))
-                           (find-files dir #:directories? #t))
-                          (apply invoke "tar" "czf"
-                                 (string-append dir ".crate")
-                                 "--sort=name" "--mtime=@0"
-                                 "--owner=root:0" "--group=root:0"
-                                 (find-files dir #:directories? #t))
-                          (delete-file-recursively dir)))
-                      (find-files "." "\\.crate$"))))))))
-     (inputs (cargo-inputs 'rust-zed-xim-0.4.0-zed.16f35a2))
-     (home-page "https://github.com/XDeme1/xim-rs")
-     (synopsis "X input method client and server")
-     (description
-      "This package provides a library for @code{xim}, the X input method.")
-     (license license:expat))))

gnu/packages/sdl.scm

@@ -153,7 +153,7 @@ hardware.")
   (package
     (inherit sdl2)
     (name "sdl3")
-    (version "3.4.4")
+    (version "3.2.10")
     (source
      (origin
        (method url-fetch)
@@ -162,7 +162,7 @@ hardware.")
                            version "/SDL3-" version ".tar.gz"))
        (sha256
         (base32
-         "0r1q1frjs0am93aspgha4k15rvmmiwsp5kn2pw5i9fw9daz2swgf"))))
+         "1q0ksmg1h0xfjpgbshslxc5a2b2flcm7n5lwiq4v8vf6vssffyzq"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -188,11 +188,8 @@ hardware.")
     (propagated-inputs
      (list alsa-lib
            libxcursor                   ;enables X11 cursor support
-           libxi
            libxkbcommon
            libxrandr
-           libxscrnsaver
-           libxtst
            mesa                         ;required by wayland
            pipewire-minimal
            pulseaudio
@@ -209,7 +206,7 @@ hardware.")
 (define-public sdl2-compat
   (package
     (name "sdl2-compat")
-    (version "2.32.66")
+    (version "2.32.54")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -218,7 +215,7 @@ hardware.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1las3lq2sn7hiwpcdzf1rpcjz2g3dfrnl83b8n78v8y665fmbbk4"))))
+                "0ijpx62b9syypxxnwvggz4l5fmrgln95ka180am9g2hgyqkqlj5n"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases

gnu/packages/search.scm

@@ -34,18 +34,29 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages search)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system meson)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages aspell)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
-  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages databases)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages ebook)
   #:use-module (gnu packages elf)
-  #:use-module (gnu packages file)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
@@ -56,10 +67,9 @@
   #:use-module (gnu packages less)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pcre)
-  #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pdf)
   #:use-module (gnu packages photo)
-  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-crypto)
@@ -72,17 +82,7 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system perl)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils))
+  #:use-module (gnu packages pkg-config))
 
 (define-public xapian
   (package

gnu/packages/sssd.scm

@@ -22,6 +22,20 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages sssd)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix modules)
+  #:use-module (guix utils)
+  #:use-module (guix build utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages augeas)
   #:use-module (gnu packages autotools)
@@ -33,7 +47,6 @@
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages dns)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gettext)
@@ -44,29 +57,17 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages openldap)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages pcre)
-  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages popt)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages samba)
   #:use-module (gnu packages security-token)
   #:use-module (gnu packages selinux)
   #:use-module (gnu packages ssh)
-  #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages)
-  #:use-module (guix build utils)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix modules)
-  #:use-module (guix packages)
-  #:use-module (guix utils))
+  #:use-module (gnu packages xml))
 
 (define-public adcli
   (package

gnu/packages/statistics.scm

@@ -1465,12 +1465,12 @@ inference for statistical models.")
                          "|"))))))))
     (native-inputs
      (list bison
+           dvisvgm
            flex
            python-numpydoc
            python-sphinx
            ;; python-sphinx-gallery ;; Currently broken
-           swig-4.0
-           texlive-dvisvgm))
+           swig-4.0))
     (inputs
      (list openblas                ; the only required dependency
            ;; The dependencies below are all optional.

gnu/packages/sync.scm

@@ -26,7 +26,21 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages sync)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system qt)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (gnu packages)
   #:use-module (gnu packages acl)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
@@ -34,7 +48,6 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages dlang)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
@@ -66,20 +79,7 @@
   #:use-module (gnu packages shells)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages sqlite)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system go)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system qt)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils))
+  #:use-module (gnu packages tls))
 
 (define-public nextcloud-client
   (package

gnu/packages/text-editors.scm

@@ -37,7 +37,7 @@
 ;;; Copyright © 2024 Murilo <murilo@disroot.org>
 ;;; Copyright © 2025 Ashvith Shetty <ashvithshetty0010@zohomail.in>
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
-;;; Copyright © 2025, 2026 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Marc Coquand <marc@coquand.email>
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright © 2025 Junker <dk@junkeria.club>
@@ -121,7 +121,6 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages protobuf)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-web)
@@ -134,10 +133,7 @@
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages vulkan)
-  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
@@ -418,40 +414,39 @@ based command language.")
 (define-public kakoune
   (package
     (name "kakoune")
-    (version "2026.04.12")
+    (version "2025.06.03")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/mawww/kakoune/")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "https://github.com/mawww/kakoune/"
+                           "releases/download/v" version "/"
+                           "kakoune-" version ".tar.bz2"))
        (sha256
-        (base32 "11c4sgb9k1iahi06i5p6m0qz1qf5hz4g2f1z80di23987bwvbjlv"))))
+        (base32 "16b466anx7gf1jci3gxj87xr5qw9fgyhpc3509myzf6z3cgr9mff"))))
     (build-system gnu-build-system)
     (arguments
-     (list
-      #:make-flags
-      #~(list (string-append "PREFIX=" #$output)
-              (string-append "CXX=" #$(cxx-for-target)))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-source
-            (lambda _
-              ;; kakoune uses confstr with _CS_PATH to find out where to find
-              ;; a posix shell, but this doesn't work in the build
-              ;; environment. This substitution just replaces that result
-              ;; with the "sh" path.
-              (substitute* "src/shell_manager.cc"
-                (("if \\(m_shell.empty\\(\\)\\)" line)
-                 (string-append "m_shell = \"" (which "sh")
-                                "\";\n        " line)))))
-          (add-after 'install 'wrap-executable
-            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-program (string-append #$output "/bin/kak")
-                `("PATH" ":" prefix
-                  (,(dirname (search-input-file inputs "bin/perl")))))))
-          (delete 'configure))))            ; no configure script
+     `(#:make-flags
+       (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+             (string-append "CXX=" ,(cxx-for-target)))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-source
+           (lambda _
+             ;; kakoune uses confstr with _CS_PATH to find out where to find
+             ;; a posix shell, but this doesn't work in the build
+             ;; environment. This substitution just replaces that result
+             ;; with the "sh" path.
+             (substitute* "src/shell_manager.cc"
+               (("if \\(m_shell.empty\\(\\)\\)" line)
+                (string-append "m_shell = \"" (which "sh")
+                               "\";\n        " line)))))
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (wrap-program (string-append (assoc-ref outputs "out") "/bin/kak")
+              `("PATH" ":" prefix
+                (,(dirname (search-input-file inputs "bin/perl")))))))
+         (delete 'configure))))            ; no configure script
+    (native-inputs (list pkg-config))
     (inputs (list perl))
     (native-search-paths
      (list (search-path-specification
@@ -961,13 +956,13 @@ OpenBSD team.")
 (define-public nano
   (package
     (name "nano")
-    (version "9.0")
+    (version "8.7.1")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
       (sha256
-       (base32 "1piz044cjyk77w33g2qqwg386irqpgzabm9snwjhl4cnnis46f4z"))))
+       (base32 "1pyy3hnjr9g0831wcdrs18v0lh7v63yj1kaf3ljz3qpj92rdrw3n"))))
     (build-system gnu-build-system)
     (arguments
      (if (%current-target-system)
@@ -2022,171 +2017,3 @@ with full unicode support and antialiased text rendering.")
 syntax highlighting, customizable color scheme (including support for 24-bit true
 colours), kitty keyboard protocol, editorconfig support, amongst other features.")
     (license license:gpl2)))
-
-(define-public zed
-  (package
-    (name "zed")
-    (version "0.225.10")
-    (outputs '("out"            ; editor, cli, icons, desktop file
-               "remote"         ; zed-remote-server for remote development
-               "server"         ; collab server daemon
-               "tools"))        ; extension_cli
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/zed-industries/zed")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1d6zr88s4nj4fw01gw908aw2mqgjj25baj4gx7qnm6rsbxqrp500"))
-       (patches
-        (search-patches "zed-0.225.10-add-message-notification-action.patch"
-                        "zed-0.225.10-add-guix-container-support.patch"
-                        "zed-0.225.10-collapse-multiline-git-deps.patch"
-                        "zed-0.225.10-disable-dlopen.patch"
-                        "zed-0.225.10-exclude-libwebrtc-from-audio.patch"
-                        "zed-0.225.10-fix-sqlite-memory-mode.patch"
-                        "zed-0.225.10-fix-test-db-isolation.patch"
-                        "zed-0.225.10-fix-workspace-race.patch"
-                        "zed-0.225.10-keep-regular-file-workspaces.patch"
-                        "zed-0.225.10-remove-patch-crates-io.patch"
-                        "zed-0.225.10-use-mock-livekit-on-linux.patch"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:install-source? #f
-           #:cargo-build-flags ''("--release" "-p" "zed")
-           ;; Not installed:
-           ;; auto_update_helper - Windows-only (empty main on Linux)
-           ;; eval - internal AI agent benchmarking tool
-           ;; edit_prediction_cli - internal edit prediction training pipeline
-           ;; storybook - GPUI component viewer for Zed UI development
-           ;; docs_preprocessor - mdbook preprocessor for Zed's docs website
-           ;; zed_visual_test_runner - visual regression tests, macOS-only
-           #:cargo-install-paths ''("crates/zed"
-                                    "crates/cli" ; opens files in running Zed
-                                    ;;; Install remote_server via its own cargo invocation
-                                    ;;; to avoid feature unification with the zed build.
-                                    "crates/remote_server" ; installs as zed-remote-server
-                                    "crates/collab" ; self-hostable collaboration server
-                                    "crates/extension_cli") ; builds extensions from source
-           #:phases
-           #~(modify-phases %standard-phases
-              (add-after 'install 'install-extras
-                (lambda* (#:key outputs #:allow-other-keys)
-                  (let* ((out (assoc-ref outputs "out"))
-                         (bin (string-append out "/bin"))
-                         (libexec (string-append out "/libexec"))
-                         (icons512 (string-append out "/share/icons/hicolor/512x512/apps"))
-                         (icons1024 (string-append out "/share/icons/hicolor/1024x1024/apps"))
-                         (apps (string-append out "/share/applications"))
-                         (remote-bin (string-append (assoc-ref outputs "remote") "/bin"))
-                         (server-bin (string-append (assoc-ref outputs "server") "/bin"))
-                         (tools-bin (string-append (assoc-ref outputs "tools") "/bin")))
-                    ;;; The cli binary is the user-facing launcher that finds
-                    ;;; and delegates to zed-editor via ../libexec/zed-editor.
-                    (mkdir-p libexec)
-                    (rename-file (string-append bin "/zed")
-                                 (string-append libexec "/zed-editor"))
-                    (rename-file (string-append bin "/cli")
-                                 (string-append bin "/zed"))
-                    ;;; Move remote_server to "remote" output as zed-remote-server.
-                    (mkdir-p remote-bin)
-                    (rename-file (string-append bin "/remote_server")
-                                 (string-append remote-bin "/zed-remote-server"))
-                    ;;; Move collab to "server" output.
-                    (mkdir-p server-bin)
-                    (rename-file (string-append bin "/collab")
-                                 (string-append server-bin "/collab"))
-                    (rename-file (string-append bin "/dotenv")
-                                 (string-append server-bin "/dotenv"))
-                    ;;; Move zed-extension to "tools" output.
-                    (mkdir-p tools-bin)
-                    (rename-file (string-append bin "/zed-extension")
-                                 (string-append tools-bin "/zed-extension"))
-                    ;;; Icons.
-                    (mkdir-p icons512)
-                    (mkdir-p icons1024)
-                    (copy-file "crates/zed/resources/app-icon.png"
-                               (string-append icons512 "/zed.png"))
-                    (copy-file "crates/zed/resources/app-icon@2x.png"
-                               (string-append icons1024 "/zed.png"))
-                    ;;; Desktop file.
-                    (mkdir-p apps)
-                    (copy-file "crates/zed/resources/zed.desktop.in"
-                               (string-append apps "/dev.zed.Zed.desktop"))
-                    (substitute* (string-append apps "/dev.zed.Zed.desktop")
-                      (("\\$APP_NAME") "Zed")
-                      (("\\$APP_CLI") "zed")
-                      (("\\$APP_ARGS") "%U")
-                      (("\\$APP_ICON") "zed")
-                      (("\\$DO_STARTUP_NOTIFY") "true")))))
-              (add-after 'unpack 'set-env
-                (lambda _
-                  (setenv "LIBGIT2_NO_VENDOR" "1")
-                  (setenv "LIBSQLITE3_SYS_USE_PKG_CONFIG" "1")))
-              (add-after 'set-env 'patch-git-deps
-                (lambda _
-                  ;; All multi-line entries are collapsed to single
-                  ;; lines by the patch.  reqwest and scap already
-                  ;; carry version fields; just strip the git source.
-                  (substitute* "Cargo.toml"
-                    (("(reqwest = \\{) git = \"[^\"]+\", rev = \"[^\"]+\", " _ prefix)
-                     (string-append prefix " "))
-                    (("(scap = \\{) git = \"[^\"]+\", rev = \"[^\"]+\", " _ prefix)
-                     (string-append prefix " ")))
-                  ;; Replace all remaining git fields with version = "*"
-                  ;; and strip rev/branch.
-                  (substitute* "Cargo.toml"
-                    (("git = \"https://[^\"]+\"")
-                     "version = \"*\"")
-                    ((", rev = \"[^\"]+\"") "")
-                    ((", branch = \"[^\"]+\"") ""))
-                  ;; Sub-crate Cargo.toml files also have git deps.
-                  (for-each
-                   (lambda (file)
-                     ;; rev-before-git deps: replace pair with version = "*".
-                     (substitute* file
-                       (("rev = \"[^\"]+\", git = \"[^\"]+\"")
-                        "version = \"*\""))
-                     ;; git-before-rev deps that already carry a version
-                     ;; field: strip git+rev, keep everything else.
-                     (substitute* file
-                       (("git = \"[^\"]+\" *, rev = \"[^\"]+\" *, ") "")
-                       ((", git *= *\"[^\"]+\"") "")
-                       ((", branch = \"[^\"]+\"") "")))
-                   (find-files "crates" "^Cargo\\.toml$"))
-                  ;; nvim-rs has no version field; add one.
-                  (substitute* "crates/vim/Cargo.toml"
-                    (("(nvim-rs = \\{) " _ prefix)
-                     (string-append prefix " version = \"*\", "))))))))
-    (native-inputs (list cmake-minimal pkg-config protobuf))
-    (inputs
-     (cons* alsa-lib
-            bzip2
-            dbus
-            fontconfig
-            freetype
-            libgit2-1.9
-            libx11
-            libxcb
-            libxkbcommon
-            openssl
-            sqlite
-            vulkan-loader
-            wayland
-            wayland-protocols
-            xcb-util-cursor
-            zlib
-            (list zstd "lib")
-            (cargo-inputs 'zed)))
-    (home-page "https://zed.dev")
-    (synopsis "High-performance, multiplayer code editor")
-    (description
-     "Zed is a high-performance, multiplayer code editor written in Rust.
-
-Note: This build disables WebRTC (libwebrtc) support because libwebrtc is
-not yet packaged in Guix.  As a result, voice and video calls in collaborative
-sessions are not available.  Text-based collaboration, editing, and all other
-features work normally.")
-    (license license:gpl3+)))

gnu/packages/tor.scm

@@ -71,14 +71,14 @@
 (define-public tor
   (package
     (name "tor")
-    (version "0.4.9.6")
+    (version "0.4.9.5")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://dist.torproject.org/tor-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "05vh1bcsr0gx2xwl7r94drmqlzp0dgag43dlajk6769f0nbvm6m8"))))
+               "0yg1k4qcvf7ikc296wgr7nr5axhpkkjb3xkn364n93ildgwc4jf9"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags

gnu/packages/version-control.scm

@@ -66,7 +66,6 @@
 ;;; Copyright © 2025 Dariqq <dariqq@posteo.net>
 ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2025 Matthew Elwin <elwin@northwestern.edu>
-;;; Copyright © 2025 Roman Scherer <roman@burningswell.com>
 ;;; Copyright © 2026 Ingar <ingar@onionmail.info>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1763,78 +1762,6 @@ fetch @acronym{PR, pull requests}, and more.  It is based on the
 supports AGit-Flow and lifts the requirement to use a manifest file.")
     (license license:asl2.0)))
 
-(define-public github-cli
-  (package
-    (name "github-cli")
-    (version "2.83.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/cli/cli")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "04kpcy15r7px92mf13jf4w0v07sjnfqc09m1vfvr5pmw7xsg35k2"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:import-path "github.com/cli/cli/v2/cmd/gh"
-      #:unpack-path "github.com/cli/cli/v2"
-      #:embed-files
-      #~(list ".*\\.xml" ".*\\.tmpl"
-              ;; sigstore-go TUF repository files (root.json, staging_root.json)
-              ".*_?root\\.json" "trusted_root\\.json"
-              ;; go-openapi/spec schema files
-              "jsonschema-draft-04\\.json" "schema\\.json")))
-    (native-inputs
-     (list go-github-com-atotto-clipboard
-           go-github-com-briandowns-spinner
-           go-github-com-cenkalti-backoff-v4
-           go-github-com-cenkalti-backoff-v5
-           go-github-com-charmbracelet-glamour
-           go-github-com-charmbracelet-huh
-           go-github-com-charmbracelet-lipgloss
-           go-github-com-cli-go-gh-v2
-           go-github-com-cli-oauth
-           go-github-com-cli-safeexec
-           go-github-com-digitorus-timestamp
-           go-github-com-distribution-reference
-           go-github-com-gabriel-vasile-mimetype
-           go-github-com-gdamore-tcell-v2
-           go-github-com-gorilla-websocket
-           go-github-com-hashicorp-go-multierror
-           go-github-com-hashicorp-go-version
-           go-github-com-itchyny-timefmt-go
-           go-github-com-joho-godotenv
-           go-github-com-makenowjust-heredoc
-           go-github-com-masterminds-sprig-v3
-           go-github-com-microsoft-dev-tunnels
-           go-github-com-muhammadmuzzammil1998-jsonc
-           go-github-com-opentracing-opentracing-go
-           go-github-com-rivo-tview
-           go-github-com-shurcool-githubv4
-           go-github-com-sigstore-sigstore-go
-           go-github-com-spf13-cobra
-           go-github-com-spf13-pflag
-           go-github-com-stretchr-testify
-           go-github-com-vmihailenco-msgpack-v5
-           go-github-com-zalando-go-keyring
-           go-golang-org-x-sys
-           go-golang-org-x-term
-           go-golang-org-x-text
-           go-google-golang-org-grpc
-           go-gopkg-in-yaml-v3))
-    (home-page "https://cli.github.com/")
-    (synopsis "GitHub's official command-line tool")
-    (description
-     "@command{gh} is GitHub on the command line.  It brings pull requests,
-issues, and other GitHub concepts to the terminal next to where you are
-already working with git and your code.  It works with GitHub.com, GitHub
-Enterprise Cloud, and GitHub Enterprise Server 2.20+.")
-    (license license:expat)))
-
 (define-public cgit
   (package
     (name "cgit")
@@ -3312,46 +3239,40 @@ RCS, PRCS, and Aegis packages.")
 (define-public cvs-fast-export
   (package
     (name "cvs-fast-export")
-    (version "1.68")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://gitlab.com/esr/cvs-fast-export")
-              (commit version)))
-       (sha256
-        (base32
-         "17225lamdw8rf2yk76rhx8zxhzqjhv88ig3ng21qgvxbhl52wnzm"))))
+    (version "1.56")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.catb.org/~esr/cvs-fast-export/"
+                                  "cvs-fast-export-" version ".tar.gz"))
+              (sha256
+               (base32
+                "058bzp3npng48ascls943m16kgvrl0h197a10brf7mvx8zpfc7sc"))))
     (build-system gnu-build-system)
     (arguments
-     (list
-      ;; Tests require a lot of dependencies and are glacially slow.
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure))
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              (string-append "CFLAGS+=-Wno-error=calloc-transposed-args")
-              (string-append "prefix?=" #$output))))
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure))       ; no configure script
+       #:parallel-build? #f         ; parallel a2x commands fail spectacularly
+       #:make-flags
+       (list "CC=gcc" (string-append "prefix?=" (assoc-ref %outputs "out")))))
     (inputs
-     (list git python-wrapper))
+     `(("git" ,git)
+       ("python" ,python-wrapper)))
     (native-inputs
-     (list ruby-asciidoctor/minimal
-           bison
-           flex))
+     (list asciidoc
+           ;; These are needed for the tests.
+           cvs rcs))
     (home-page "http://www.catb.org/esr/cvs-fast-export/")
     (synopsis "Export an RCS or CVS history as a fast-import stream")
-    (description
-     "This program analyzes a collection of RCS files in a CVS repository (or
-outside of one) and, when possible, emits an equivalent history in the form of
-a fast-import stream.  Not all possible histories can be rendered this way;
-the program tries to emit useful warnings when it can't.
+    (description "This program analyzes a collection of RCS files in a CVS
+repository (or outside of one) and, when possible, emits an equivalent history
+in the form of a fast-import stream.  Not all possible histories can be
+rendered this way; the program tries to emit useful warnings when it can't.
 
-The program can also produce a visualization of the resulting commit
-@acronym{DAG, directed acyclic graph} in the input format of
-@uref{http://www.graphviz.org, Graphviz}.  The package also includes
-@command{cvssync}, a tool for mirroring masters from remote CVS hosts.")
+The program can also produce a visualization of the resulting commit directed
+acyclic graph (DAG) in the input format of @uref{http://www.graphviz.org,
+Graphviz}.  The package also includes @command{cvssync}, a tool for mirroring
+masters from remote CVS hosts.")
     (license license:gpl2+)))
 
 (define-public vc-dwim
@@ -4910,8 +4831,9 @@ comes as a command line app and also an Emacs interface.")
            go-gopkg-in-yaml-v3))
     (home-page "https://github.com/github/git-sizer")
     (synopsis "Analyze size of a Git repo")
-    (description "Compute various size metrics for a Git repository, flagging
-those that might cause problems or inconvenience.")
+    (description
+     "Compute various size metrics for a Git repository, flagging those that
+might cause problems or inconvenience.")
     (license license:expat)))
 
 ;;;

gnu/packages/video.scm

@@ -4174,7 +4174,11 @@ tools, XML authoring components, and an extensible plug-in based API.")
     (native-inputs
      (list perl pkg-config))
     (inputs
-     (list libjpeg-turbo
+     (list alsa-lib
+           glu
+           libjpeg-turbo
+           libx11
+           qtbase-5
            eudev))
     (synopsis "Realtime video capture utilities for Linux")
     (description "The v4l-utils provide a series of libraries and utilities to
@@ -4183,8 +4187,11 @@ be used for realtime video capture via Linux-specific APIs.")
     ;; libv4l2 is LGPL2.1+, while utilities are GPL2 only.
     (license (list license:lgpl2.1+ license:gpl2))))
 
-;; 2026-03-20
-(define-deprecated-package v4l-utils-minimal v4l-utils)
+(define-public v4l-utils-minimal
+  (package/inherit v4l-utils
+    (name "v4l-utils-minimal")
+    (inputs (modify-inputs (package-inputs v4l-utils)
+              (delete "qtbase" "glu" "libx11")))))
 
 (define-public obs
   (package

gnu/packages/vim.scm

@@ -801,8 +801,7 @@ is based on Vim's builtin plugin support.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1b524vi44gkcsyy8w4jggvprwdsgy0gjprgxpyhh0dmqm47c0c48"))
-              (patches (search-patches "neovim-tree-sitter-grammar-path.patch"))))
+                "1b524vi44gkcsyy8w4jggvprwdsgy0gjprgxpyhh0dmqm47c0c48"))))
     (build-system cmake-build-system)
     (arguments
      (list #:tests? #f
@@ -853,19 +852,6 @@ is based on Vim's builtin plugin support.")
                   lua5.1-libmpack
                   tree-sitter))
     (native-inputs (list pkg-config gettext-minimal gperf))
-    (propagated-inputs
-     ;; bundled tree-sitters, neovim assumes that these are available.
-     ;; See https://neovim.io/doc/user/treesitter.html#treesitter-parsers
-     (list tree-sitter-c
-           tree-sitter-lua
-           tree-sitter-markdown
-           tree-sitter-vim
-           tree-sitter-vimdoc
-           tree-sitter-query))
-    (native-search-paths
-     (list (search-path-specification
-            (variable "TREE_SITTER_GRAMMAR_PATH")
-            (files '("lib/tree-sitter")))))
     (home-page "https://neovim.io")
     (synopsis "Fork of vim focused on extensibility and agility")
     (description

gnu/packages/virtualization.scm

@@ -2560,7 +2560,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
 (define-public skopeo
   (package
     (name "skopeo")
-    (version "1.22.2")
+    (version "1.22.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2569,7 +2569,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "05ag8rj2w6p78llhiwb2h460nf0vn7mppaara6l1dcb84sycj8jg"))))
+                "0h32h02dvh6dx587idqi11938k293kawvd4d3xk5hwdi6cmpabri"))))
     (build-system gnu-build-system)
     (native-inputs
      (list go-1.24

gnu/packages/web.scm

@@ -100,7 +100,34 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages web)
+  #:use-module (ice-9 match)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix cvs-download)
+  #:use-module (guix hg-download)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system ant)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
+  #:use-module (guix build-system guile)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system node)
+  #:use-module (guix build-system perl)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
+  #:use-module (guix build-system scons)
+  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages apr)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
@@ -109,6 +136,7 @@
   #:use-module (gnu packages bittorrent)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages build-tools)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages check)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
@@ -117,11 +145,10 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages databases)
-  #:use-module (gnu packages datastructures)
   #:use-module (gnu packages digest)
   #:use-module (gnu packages django)
-  #:use-module (gnu packages dns)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages datastructures)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages emacs-xyz)
@@ -152,9 +179,9 @@
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages image-viewers)
-  #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages java)
   #:use-module (gnu packages jemalloc)
+  #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages less)
@@ -163,9 +190,9 @@
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages libunwind)
+  #:use-module (gnu packages llvm)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lisp-xyz)
-  #:use-module (gnu packages llvm)
   #:use-module (gnu packages logging)
   #:use-module (gnu packages lsof)
   #:use-module (gnu packages lua)
@@ -177,7 +204,6 @@
   #:use-module (gnu packages networking)
   #:use-module (gnu packages node)
   #:use-module (gnu packages nss)
-  #:use-module (gnu packages nss)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages openstack)
   #:use-module (gnu packages package-management)
@@ -185,7 +211,6 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages perl-compression)
-  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages prometheus)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
@@ -194,6 +219,7 @@
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages re2c)
   #:use-module (gnu packages readline)
@@ -216,32 +242,6 @@
   #:use-module (gnu packages wget)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages)
-  #:use-module (guix build-system ant)
-  #:use-module (guix build-system cargo)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system go)
-  #:use-module (guix build-system guile)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system node)
-  #:use-module (guix build-system perl)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system qt)
-  #:use-module (guix build-system scons)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix cvs-download)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix hg-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (ice-9 match)
   #:use-module ((srfi srfi-1) #:select (delete-duplicates)))
 
 (define-public qhttp
@@ -503,7 +503,7 @@ Interface} specification.")
 (define-public ablorb
   (package
     (name "ablorb")
-    (version "0.1.1")
+    (version "0.1.0")
     (source
      (origin
        (method git-fetch)
@@ -512,7 +512,7 @@ Interface} specification.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1yyc52863bbqvq9si7bhwwraafa3kir6qr5xqavqbvi140d9c373"))))
+        (base32 "1i705p2gw5aryj0myfj3rmsrmj3ilqdn5w7xd5dwjkyi80rc20kj"))))
     (build-system meson-build-system)
     (inputs (list glib gconf gnome-vfs libxml2))
     (native-inputs (list pkg-config))
@@ -7988,6 +7988,92 @@ Interface} and @acronym{SSL, Secure Sockets Layer} support.  It can be
 embedded into C/C++ applications or used as a standalone web server.")
     (license license:expat)))
 
+(define-public clearsilver
+  (package
+    (name "clearsilver")
+    (version "0.11.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/blong42/clearsilver/")
+             (commit "fbe4926ba9a756163fd1539ff6eee3522cf1f5d8")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02ad43gmqwy7wmh71mh5pk6gl1lax76sjnf42sknj0ijdga170kl"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #false ;there is not test target and tests are run during build
+      #:configure-flags
+      '(list "--disable-java" "--disable-python")
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'prepare-streamhtmlparser
+           (lambda* (#:key inputs #:allow-other-keys)
+             (copy-recursively (assoc-ref inputs "streamhtmlparser")
+                               (string-append (getcwd) "/streamhtmlparser"))
+             (for-each make-file-writable
+                       (find-files "streamhtmlparser" "."
+                                   #:directories? #t))))
+         (add-after 'unpack 'pre-bootstrap
+           (lambda _
+             ;; We don't need the Java stuff
+             (substitute* "configure.in"
+               (("AC_JNI_INCLUDE_DIR") ""))
+
+             ;; This script will call /bin/sh, so it's easier to just
+             ;; bootstrap manually.
+             (delete-file "autogen.sh")
+             (substitute* "rules.mk.in"
+               (("@PTHREAD_LIBS@") "-lpthread")
+               (("@PTHREAD_CFLAGS@") "")
+               (("@PTHREAD_CC@") "gcc"))
+
+             ;; The GNU variadic macros actually work, whereas the C99
+             ;; implementation fails to build.
+             (substitute* "util/neo_misc.h"
+               (("#define USE_C99_VARARG_MACROS") "#define USE_GNUC_VARARG_MACROS"))
+
+             (setenv "CFLAGS" "-fPIC")
+
+             ;; This directory is created some time during the build, but the
+             ;; early libtool processes assume the directory exists.  When
+             ;; they are run first they copy the libraries themselves to the
+             ;; file "libs" instead of moving them into the directory.
+             (mkdir-p "libs")))
+         (add-after 'build 'build-documentation
+           (lambda _ (invoke "make" "man")))
+         (add-after 'install 'install-streamhtmlparser
+           (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
+             (with-directory-excursion "streamhtmlparser"
+               (apply invoke "make" "-j" (if parallel-build?
+                                             (number->string (parallel-job-count))
+                                             "1")
+                      "install" make-flags)))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("python" ,python-2)
+       ("streamhtmlparser"
+        ,(let ((commit "551109ac02a31957a0e776416774c7b515b4b7c7"))
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/google/streamhtmlparser/")
+                   (commit commit)))
+             (file-name (git-file-name "streamhtmlparser" commit))
+             (sha256
+              (base32
+               "0bmrdakk930q3m8fmq0xcy7n7cdvlk1xma4z9204919hvb1gk9md")))))))
+    (home-page "https://github.com/blong42/clearsilver")
+    (synopsis "CGI kit and HTML templating system")
+    (description
+     "This package includes Clearsilver, the CGI kit and HTML templating
+system.")
+    (license license:bsd-3)))
+
 (define-public python-py-ubjson
   (package
     (name "python-py-ubjson")

gnu/packages/wm.scm

@@ -1251,7 +1251,7 @@ to events.")
            pulseaudio
            wayland
            wayland-protocols
-           wlroots-0.19))
+           wlroots))
     (propagated-inputs
      (list python-aiohttp
            python-cairocffi
@@ -2450,19 +2450,19 @@ limited size and a few external dependencies.  It is configurable via
     ;;             LICENSE       LICENSE.dwm   LICENSE.tinywl
     (license (list license:gpl3+ license:expat license:cc0))))
 
-(define-public mangowm
+(define-public mangowc
   (package
-    (name "mangowm")
-    (version "0.12.8")
+    (name "mangowc")
+    (version "0.12.3")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/mangowm/mango")
+              (url "https://github.com/DreamMaoMao/mangowc")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1jfm3kd2iscwfxhflmq8mdph64rd26jc6ps0sqmf0y9ysagqbnlk"))))
+        (base32 "024vq3l8pwv4nxq0rnvpgdhy58fdq2k0zlca83s6nv4zzf0qxqvj"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -2493,20 +2493,17 @@ limited size and a few external dependencies.  It is configurable via
                   pcre2
                   libxcb
                   xcb-util-wm
-                  wlroots-0.19
+                  wlroots
                   scenefx))
-    (home-page "https://github.com/mangowm/mango")
+    (home-page "https://github.com/DreamMaoMao/mangowc")
     (synopsis "Wayland compositor based on wlroots and scenefx")
     (description
-     "MangoWM is a modern, lightweight, high-performance Wayland compositor
+     "MangoWC is a modern, lightweight, high-performance Wayland compositor
 built on dwl — crafted for speed, flexibility, and a customizable desktop experience.")
-    (license (list license:gpl3 ;mangowm itself, dwl
+    (license (list license:gpl3 ;mangowc itself, dwl
                    license:expat ;dwm, sway, wlroots
                    license:cc0)))) ;tinywl
 
-(define-deprecated-package mangowc
-  mangowm)
-
 (define-public niri
   (package
    (name "niri")
@@ -2539,11 +2536,6 @@ built on dwl — crafted for speed, flexibility, and a customizable desktop expe
                      "version = \"*\", optional")
                     (("^git = .*")
                      ""))))
-              (add-after 'unpack 'patch-references
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (substitute* "src/main.rs"
-                    (("dbus-update-activation-environment" cmd)
-                     (search-input-file inputs (in-vicinity "bin" cmd))))))
               (add-after 'unpack 'set-environment
                 (lambda _
                   (setenv "RUSTFLAGS"
@@ -2557,10 +2549,13 @@ built on dwl — crafted for speed, flexibility, and a customizable desktop expe
                   (setenv "RAYON_NUM_THREADS" "1")
                   (setenv "XDG_RUNTIME_DIR" "/tmp")))
               (add-after 'install 'install-extras
-                (lambda _
+                (lambda* (#:key inputs #:allow-other-keys)
                   (substitute* "resources/niri.desktop"
                     (("niri-session")
-                     (string-append #$output "/bin/niri --session")))
+                     (format #f "~a --dbus-daemon=~a ~a/bin/niri --session"
+                             (search-input-file inputs "bin/dbus-run-session")
+                             (search-input-file inputs "bin/dbus-daemon")
+                             #$output)))
                   (install-file
                    "resources/niri.desktop"
                    (in-vicinity #$output "share/wayland-sessions"))
@@ -2719,7 +2714,7 @@ XDG-Output for wlclock to work.")
 (define-public wlroots
   (package
     (name "wlroots")
-    (version "0.20.0")
+    (version "0.19.2")
     (source
      (origin
        (method git-fetch)
@@ -2728,7 +2723,7 @@ XDG-Output for wlclock to work.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1gdmy4mpi7x23g81cdmcr9aakk3g6csl69h9j98yzssa48k6all5"))))
+        (base32 "0w1mq72r92zk9z650gdik17h6rxqnxjy63r2mfj423zxl54s2lzi"))))
     (build-system meson-build-system)
     (arguments
      (list #:phases
@@ -2780,23 +2775,7 @@ modules for building a Wayland compositor.")
 
 ;; Allow packages referring to stable wlroots version, because
 ;; wlroots updates are backward incompatible.
-(define-public wlroots-0.20
-  wlroots)
-
-(define-public wlroots-0.19 
-  (package
-    (inherit wlroots)
-    (name "wlroots")
-    (version "0.19.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1k8qzss7iycbbnwjp3ygsrb3rc8m45vxpy99r213d2vf9dai5v17"))))))
+(define-public wlroots-0.19 wlroots)
 
 (define-public wlroots-0.18
   (package
@@ -2967,7 +2946,7 @@ narrow the items to those matching the tokens in the input.")
                   pcre2
                   swaybg
                   wayland
-                  wlroots-0.19))
+                  wlroots))
     (native-inputs
      (cons* linux-pam mesa pkg-config scdoc wayland-protocols
             (if (%current-target-system)

gnu/services/configuration/environment-variables.scm

@@ -1,143 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Giacomo Leidi <goodoldpaul@autistici.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 services configuration environment-variables)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu services configuration utils)
-  #:use-module (guix diagnostics)
-  #:use-module (guix i18n)
-  #:use-module (ice-9 match)
-  #:use-module (srfi srfi-1)
-  #:export (serialize-string-environment-variable
-            serialize-boolean-environment-variable
-            serialize-number-environment-variable
-            serialize-maybe-string-environment-variable
-            serialize-maybe-boolean-environment-variable
-            serialize-maybe-number-environment-variable
-
-            serialize-environment-variables))
-
-(define* (field-name->environment-variable field-name
-                                           #:key prefix
-                                           (uglify uglify-snake-case))
-  "Serializes FIELD-NAME, a field name from @code{(gnu services configuration)},
-to an environment variable name through UGLIFY, by default a procedure that is
-passed FIELD-NAME, and returns a snake case string representation of
-the field name.  Trailing @code{?} in the name are dropped and @code{-} get
-replaced by @code{_}.  When PREFIX is a string, it is prepended to the result.
-The result of UGLIFY is then upcased and returned.
-
-For example the procedure would convert @code{'a-field} to @code{\"A_FIELD\"}."
-  (let ((variable (string-upcase
-                   (uglify field-name))))
-    (if (string? prefix)
-        (string-append prefix variable)
-        variable)))
-
-(define* (serialize-string-environment-variable field-name value
-                                                #:key prefix
-                                                #:allow-other-keys)
-  (cons (field-name->environment-variable field-name #:prefix prefix)
-        value))
-
-(define* (serialize-maybe-string-environment-variable field-name value
-                                                      #:key prefix
-                                                      #:allow-other-keys)
-  (if (maybe-value-set? value)
-      (serialize-string-environment-variable field-name value #:prefix prefix)
-      #f))
-
-(define* (serialize-boolean-environment-variable field-name value
-                                                 #:key prefix
-                                                 (true-value "true")
-                                                 (false-value "false")
-                                                 #:allow-other-keys)
-  (serialize-string-environment-variable
-   field-name (if value true-value false-value)
-   #:prefix prefix))
-
-(define* (serialize-maybe-boolean-environment-variable field-name value
-                                                       #:key prefix
-                                                       #:allow-other-keys)
-  (if (maybe-value-set? value)
-      (serialize-boolean-environment-variable field-name value #:prefix prefix)
-      #f))
-
-(define* (serialize-number-environment-variable field-name value
-                                                #:key prefix
-                                                #:allow-other-keys)
-  (cons (field-name->environment-variable field-name #:prefix prefix)
-        (number->string value)))
-
-(define* (serialize-maybe-number-environment-variable field-name value
-                                                      #:key prefix
-                                                      #:allow-other-keys)
-  (if (maybe-value-set? value)
-      (serialize-number-environment-variable field-name value #:prefix prefix)
-      #f))
-
-(define (environment-variable-serializer field)
-  (define type (configuration-field-type field))
-  (match type
-    ('string serialize-string-environment-variable)
-    ('maybe-string serialize-maybe-string-environment-variable)
-    ('number serialize-number-environment-variable)
-    ('integer serialize-number-environment-variable)
-    ('positive serialize-number-environment-variable)
-    ('maybe-number serialize-maybe-number-environment-variable)
-    ('maybe-integer serialize-maybe-number-environment-variable)
-    ('maybe-positive serialize-maybe-number-environment-variable)
-    ('boolean serialize-boolean-environment-variable)
-    ('maybe-boolean serialize-boolean-environment-variable)
-    (_
-     (raise
-      (formatted-message
-       (G_ "Unknown environment-variable field type: ~a")
-       type)))))
-
-(define* (serialize-environment-variables config fields
-                                          #:optional selection negate?
-                                          #:key prefix
-                                          (true-value "true")
-                                          (false-value "false"))
-  "Serializes the fields whose name is included in SELECTION from CONFIG, a
-configuration from @code{(gnu services configuration)}, and FIELDS, the
-list of its field records, to a list of pairs.  When NEGATE? is #t all services
-not included in SELECTION will be serialized.  Each  pair represents an
-environment variable.  The first element of each pair is the variable name, the
-second is the value.  When PREFIX is a string it is prepended to the variable
-name.  TRUE-VALUE and FALSE-VALUE will be used as a representation for
-respectfully @code{#t} and @code{#f}."
-  (define selected-names
-    (or selection
-        (map configuration-field-name fields)))
-  (define filtered
-    (filter-configuration-fields fields selected-names negate?))
-  (define getters
-    (map configuration-field-getter filtered))
-  (define names
-    (map configuration-field-name filtered))
-  (define serializers
-    (map environment-variable-serializer filtered))
-
-  (filter-map (match-lambda ((serializer name getter)
-                             (serializer name (getter config)
-                                         #:prefix prefix
-                                         #:true-value true-value
-                                         #:false-value false-value)))
-              (zip serializers names getters)))

gnu/services/configuration/utils.scm

@@ -1,35 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Giacomo Leidi <goodoldpaul@autistici.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 services configuration utils)
-  #:use-module (ice-9 string-fun)
-  #:export (uglify-snake-case))
-
-(define (uglify-snake-case field-name)
-  "Serializes FIELD-NAME, a field name from @code{(gnu services configuration)},
-to a downcased, snake case string representation of the field name.  Trailing
-@code{?} in the name are dropped and dashes are replaced with underscores.
-
-For example the procedure would convert @code{'A-Field?} to @code{\"a_field\"}."
-  (define str (symbol->string field-name))
-  (string-downcase
-   (string-replace-substring
-    (if (string-suffix? "?" str)
-        (string-drop-right str 1)
-        str)
-    "-" "_")))

guix/build/texlive-build-system.scm

@@ -139,11 +139,11 @@ generation also needs to be wrapped within a `faketime' call in the
              (local-sources (font-sources "fonts/source" local-metrics))
              ((not (null? local-sources))) ;nothing to generate: bail out
              (root (getcwd))
-             ;; "texlive-metafont" may be a native input, or included in
-             ;; `texlive-local-tree'.  Handle both cases.
              (metafont
-              (search-input-directory (or native-inputs inputs)
-                                      "share/texmf-dist/metafont"))
+              (cond ((assoc-ref (or native-inputs inputs) "texlive-metafont") =>
+                     (cut string-append <> "/share/texmf-dist"))
+                    (else
+                     (error "Missing 'texlive-metafont' native input"))))
              ;; Collect all font source files from texlive (native-)inputs so
              ;; "mf" can know where to look for them.
              (font-inputs
@@ -151,21 +151,21 @@ generation also needs to be wrapped within a `faketime' call in the
                (append-map (match-lambda
                              ((? (negate texlive-input?)) '())
                              (("texlive-bin" . _) '())
-                             (("texlive-metafont" . _) '())
+                             (("texlive-metafont" . _)
+                              (list (string-append metafont "/metafont/base")))
                              ((_ . input)
                               (font-sources input #f)))
                            (or native-inputs inputs)))))
     ;; Tell mf where to find "mf.base".
-    (setenv "MFBASES" (in-vicinity metafont "../web2c"))
+    (setenv "MFBASES" (string-append metafont "/web2c/"))
     (mkdir-p "build")
     (for-each
      (lambda (source)
        ;; Tell "mf" where are the font source files.  In case current package
        ;; provides multiple sources, treat them separately.
        (setenv "MFINPUTS"
-               (string-join (cons* (string-append root "/" source)
-                                   (in-vicinity metafont "base")
-                                   font-inputs)
+               (string-join (cons (string-append root "/" source)
+                                  font-inputs)
                             ":"))
        ;; Build font metrics (tfm).
        (with-directory-excursion source

guix/import/gem.scm

@@ -8,7 +8,6 @@
 ;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2024 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2026 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,8 +33,6 @@
   #:use-module (guix import json)
   #:use-module (guix packages)
   #:use-module (guix upstream)
-  #:use-module (guix diagnostics)
-  #:use-module (guix i18n)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix base16)
   #:use-module (guix base32)
@@ -161,15 +158,7 @@ Optionally include a VERSION string to fetch a specific version gem."
                                  dependencies
                                  licenses)
                   dependencies-names))
-        (begin
-          (if version
-              (warning
-               (G_ "version ~a of gem '~a' was not found at '~a'~%")
-               version package-name repo)
-              (warning
-               (G_ "gem '~a' not found at '~a'~%")
-               package-name repo))
-          (values #f '())))))
+        (values #f '()))))
 
 (define (guix-package->gem-name package)
   "Given a PACKAGE built from rubygems.org, return the name of the

guix/import/texlive.scm

@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2024, 2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -283,7 +283,6 @@ calls."
   (match-lambda
     ("artistic2" 'artistic2.0)
     ("apache2" 'asl2.0)
-    ("agpl3" 'agpl3+)                   ;usually means "or later"
     ("gpl" 'gpl3+)
     ("gpl1" 'gpl1)
     ("gpl1+" 'gpl1+)
@@ -295,7 +294,6 @@ calls."
     ("lgpl3" 'lgpl3)
     ("knuth" 'knuth)
     ("pd" 'public-domain)
-    ("0bsd" 'bsd-0)
     ("bsd2" 'bsd-2)
     ("bsd3" 'bsd-3)
     ("bsd4" 'bsd-4)
@@ -620,68 +618,54 @@ of package with UPSTREAM-NAME in VERSION."
             (delete-duplicates (sort (map trim-filename specific) string<)
                                string-prefix?))))
 
-(define (texlive->svn-reference upstream-name version database)
-  "Return a <svn-reference> or <svn-multi-reference> object for TeX Live
-package with UPSTREAM-NAME at VERSION."
-  (let ((revision (assoc-ref database 'database-revision)))
-    ;; TEXLIVE-SOURCE is the only package using a regular SVN reference.
-    (if (string= upstream-name "source")
-        (svn-reference
-          (url (string-append %texlive-repository
-                              "tags/texlive-" version "/Build/source"))
-          (revision revision))
-        (let* ((data (assoc-ref database upstream-name))
-               (files (append (or (assoc-ref data 'docfiles) (list))
-                              (or (assoc-ref data 'runfiles) (list))
-                              (or (assoc-ref data 'srcfiles) (list))))
-               (locations
-                ;; Drop "texmf-dist/" prefix from files.  Special case
-                ;; TEXLIVE-SCRIPTS, where files are not all coming from
-                ;; "texmf-dist/".
-                (if (string= upstream-name "scripts")
-                    files
-                    (files->locations
-                     ;; Ignore any file not starting with the expected prefix,
-                     ;; such as tlpkg/tlpostcode/...  Nothing good can come
-                     ;; from this.
-                     (filter-map
-                      (lambda (file)
-                        (and (string-prefix? "texmf-dist/" file)
-                             (string-drop file (string-length "texmf-dist/"))))
-                      files)))))
-          (svn-multi-reference
-            (url (match upstream-name
-                   ("scripts"
-                    (string-append
-                     %texlive-repository "tags/texlive-" version "/Master"))
-                   ("source"
-                    (string-append %texlive-repository
-                                   "tags/texlive-" version "/Build/source"))
-                   (_
-                    (texlive-packages-repository version))))
-            (locations (sort locations string<))
-            (revision revision))))))
+(define (texlive->svn-multi-reference upstream-name version database)
+  "Return <svn-multi-reference> object for TeX Live package with UPSTREAM-NAME
+at VERSION."
+  (let* ((data (assoc-ref database upstream-name))
+         (files (append (or (assoc-ref data 'docfiles) (list))
+                        (or (assoc-ref data 'runfiles) (list))
+                        (or (assoc-ref data 'srcfiles) (list))))
+         (locations
+          ;; Drop "texmf-dist/" prefix from files.  Special case
+          ;; TEXLIVE-SCRIPTS and TEXLIVE-SOURCE, where files are not always
+          ;; exported from "texmf-dist/".
+          (if (member upstream-name '("scripts" "source"))
+              files
+              (files->locations
+               ;; Ignore any file not starting with the expected prefix, such
+               ;; as tlpkg/tlpostcode/...  Nothing good can come from this.
+               (filter-map
+                (lambda (file)
+                  (and (string-prefix? "texmf-dist/" file)
+                       (string-drop file (string-length "texmf-dist/"))))
+                files)))))
+    (svn-multi-reference
+     (url (match upstream-name
+            ("scripts"
+             (string-append
+              %texlive-repository "tags/texlive-" version "/Master"))
+            ("source"
+             (string-append %texlive-repository
+                            "tags/texlive-" version "/Build/source"))
+            (_
+             (texlive-packages-repository version))))
+     (locations (sort locations string<))
+     (revision (assoc-ref database 'database-revision)))))
 
 (define (tlpdb->package upstream-name version database)
   (and-let* ((data (assoc-ref database upstream-name))
              (name (downstream-package-name "texlive-" upstream-name))
              (reference
-              (texlive->svn-reference upstream-name version database))
+              (texlive->svn-multi-reference upstream-name version database))
              (source (with-store store
-                       ((if (string= upstream-name "source")
-                            download-svn-to-store
-                            download-multi-svn-to-store)
+                       (download-multi-svn-to-store
                         store reference
-                        (format #f "~a-~a-svn-checkout" name version)))))
-    (let* ((revision (assoc-ref database 'database-revision))
-           (scripts (list-linked-scripts upstream-name database))
+                        (format #f "~a-~a-svn-multi-checkout" name version)))))
+    (let* ((scripts (list-linked-scripts upstream-name database))
            (upstream-inputs
             (list-upstream-inputs upstream-name version database))
            (tex-formats (list-formats data))
-           (texlive-source? (string= upstream-name "source"))
-           (meta-package?
-            (and (not texlive-source?)
-                 (null? (svn-multi-reference-locations reference))))
+           (meta-package? (null? (svn-multi-reference-locations reference)))
            (empty-package? (and meta-package? (not (pair? tex-formats)))))
       (values
        `(package
@@ -693,25 +677,22 @@ package with UPSTREAM-NAME at VERSION."
            ,(and (not meta-package?)
                  `(origin
                     (method svn-multi-fetch)
-                    (uri ,(if texlive-source?
-                              `(svn-reference
-                                 (url (string-append
-                                       %texlive-repository
-                                       "tags/texlive-" version "/Build/source"))
-                                 (revision ,revision))
-                              `(svn-multi-reference
-                                 (url
-                                  ,(match upstream-name
-                                     ("scripts"
-                                      '(string-append
-                                        %texlive-repository
-                                        "tags/texlive-" version "/Master"))
-                                     (_
-                                      '(texlive-packages-repository version))))
-                                 (revision ,revision)
-                                 (locations
-                                  (list ,@(svn-multi-reference-locations
-                                           reference))))))
+                    (uri (svn-multi-reference
+                          (url
+                           ,(match upstream-name
+                              ("scripts"
+                               '(string-append
+                                 %texlive-repository "tags/texlive-" version
+                                 "/Master"))
+                              ("source"
+                               '(string-append
+                                 %texlive-repository "tags/texlive-" version
+                                 "/Build/source"))
+                              (_
+                               '(texlive-packages-repository version))))
+                          (revision ,(svn-multi-reference-revision reference))
+                          (locations
+                           (list ,@(svn-multi-reference-locations reference)))))
                     (file-name (git-file-name name version))
                     (sha256
                      (base32
@@ -731,7 +712,7 @@ package with UPSTREAM-NAME at VERSION."
           ;;
           ;; Use trivial build system only when the package contains no files,
           ;; and no TeX format file is expected to be built.
-          (build-system ,(if (or empty-package? texlive-source?)
+          (build-system ,(if empty-package?
                              'trivial-build-system
                              'texlive-build-system))
           ;; Arguments.
@@ -774,7 +755,7 @@ package with UPSTREAM-NAME at VERSION."
           (description ,(and=> (assoc-ref data 'longdesc) beautify-description))
           (license
            ,(cond
-             ((or meta-package? texlive-source?)
+             (meta-package?
               '(fsf-free "https://www.tug.org/texlive/copying.html"))
              ((assoc-ref data 'catalogue-license) => string->license)
              (else #f))))
@@ -806,7 +787,8 @@ VERSION."
 (define (package-from-texlive-repository? package)
   (let ((name (package-name package)))
     ;; TEXLIVE-SCRIPTS and TEXLIVE-SOURCE do not use TEXLIVE-BUILD-SYSTEM, but
-    ;; their structure is sufficiently regular to benefit from this updater.
+    ;; package's structure is sufficiently regular to benefit from
+    ;; auto-updates.
     (or (member name '("texlive-scripts" "texlive-source"))
         (and (string-prefix? "texlive-" (package-name package))
              (eq? 'texlive
@@ -823,7 +805,7 @@ prefix when PARTIAL-VERSION? is #t."
          (upstream-source
           (package upstream-name)
           (version version)
-          (urls (texlive->svn-reference upstream-name version database))
+          (urls (texlive->svn-multi-reference upstream-name version database))
           (inputs (list-upstream-inputs upstream-name version database))))))
 
 (define %texlive-updater

guix/profiles.scm

@@ -1944,20 +1944,13 @@ MANIFEST."
             ;; but we have two: the one in /tmp containing all packages and
             ;; the one in #$output containing the generated font maps.  To
             ;; avoid having to merge ls-R files, we copy the generated stuff
-            ;; to /tmp.
-            ;;
-            ;; The ls-R database is generated with a low level call to "ls"
-            ;; command because "mktexlsr" doesn’t preserve alphabetic order,
-            ;; probably due to symlinks.  See also "texlive-local-tree"
-            ;; function from "tex.scm".
+            ;; to /tmp and run mktexlsr only once.
             (let ((a (string-append #$output "/share/texmf-dist"))
-                  (b "/tmp/texlive/share/texmf-dist"))
+                  (b "/tmp/texlive/share/texmf-dist")
+                  (mktexlsr #$(file-append texlive-scripts "/bin/mktexlsr")))
               (copy-recursively a b)
-              (with-directory-excursion b
-                (with-output-to-file "ls-R"
-                  (lambda ()
-                    (invoke "ls" "-1LAR" "./")))
-                (install-file "ls-R" a)))))))
+              (invoke mktexlsr b)
+              (install-file (string-append b "/ls-R") a))))))
   (with-monad %store-monad
     ;; `texlive-scripts' brings essential files to generate font maps.
     ;; Therefore, it must be present in the profile.  This check prevents

guix/upstream.scm

@@ -495,14 +495,6 @@ SOURCE, an <upstream-source>."
            #:recursive? (git-reference-recursive? ref))
           source))
 
-(define* (package-update/svn-fetch store package source
-                                   #:key key-download key-server)
-  "Return the version, checkout, and SOURCE, to update PACKAGE to
-SOURCE, an <upstream-source>."
-  (values (upstream-source-version source)
-          (download-svn-to-store store (upstream-source-urls source))
-          source))
-
 (define* (package-update/svn-multi-fetch store package source
                                          #:key key-download key-server)
   "Return the version, checkout, and SOURCE, to update PACKAGE to
@@ -515,7 +507,6 @@ SOURCE, an <upstream-source>."
   ;; Mapping of origin methods to source update procedures.
   `((,url-fetch . ,package-update/url-fetch)
     (,git-fetch . ,package-update/git-fetch)
-    (,svn-fetch . ,package-update/svn-fetch)
     (,svn-multi-fetch . ,package-update/svn-multi-fetch)))
 
 (define* (package-update store package
@@ -731,8 +722,6 @@ new version string if an update was made, and #f otherwise."
          (old-commit  (match (origin-uri (package-source package))
                         ((? git-reference? ref)
                          (git-reference-commit ref))
-                        ((? svn-reference? ref)
-                         (svn-reference-revision ref))
                         ((? svn-multi-reference? ref)
                          (svn-multi-reference-revision ref))
                         (_ #f)))
@@ -744,16 +733,12 @@ new version string if an update was made, and #f otherwise."
                         ((first _ ...) first)
                         ((? git-reference? ref)
                          (git-reference-url ref))
-                        ((? svn-reference? ref)
-                         (svn-reference-url ref))
                         ((? svn-multi-reference? ref)
                          (svn-multi-reference-url ref))
                         (_ #f)))
          (new-commit  (match (upstream-source-urls source)
                         ((? git-reference? ref)
                          (git-reference-commit ref))
-                        ((? svn-reference? ref)
-                         (svn-reference-revision ref))
                         ((? svn-multi-reference? ref)
                          (svn-multi-reference-revision ref))
                         (_ #f)))

po/packages/POTFILES.in

@@ -78,7 +78,6 @@ gnu/packages/connman.scm
 gnu/packages/containers.scm
 gnu/packages/convmv.scm
 gnu/packages/coq.scm
-gnu/packages/coreboot.scm
 gnu/packages/cpio.scm
 gnu/packages/cpp.scm
 gnu/packages/cppi.scm

tests/services/configuration.scm

@@ -3,7 +3,6 @@
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
-;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,7 +21,6 @@
 
 (define-module (tests services configuration)
   #:use-module (gnu services configuration)
-  #:use-module (gnu services configuration environment-variables)
   #:use-module (guix diagnostics)
   #:use-module (guix gexp)
   #:autoload (guix i18n) (G_)
@@ -50,14 +48,14 @@
   (port-configuration-port (port-configuration)))
 
 (test-equal "wrong type for a field"
-  '("configuration.scm" 61 11)                    ;error location
+  '("configuration.scm" 59 11)                    ;error location
   (guard (c ((configuration-error? c)
              (let ((loc (error-location c)))
                (list (basename (location-file loc))
                      (location-line loc)
                      (location-column loc)))))
     (port-configuration
-     ;; This is line 60; the test relies on line/column numbers!
+     ;; This is line 58; the test relies on line/column numbers!
      (port "This is not a number!"))))
 
 (define-configuration port-configuration-cs
@@ -365,126 +363,3 @@
    (config-with-maybe-string/no-serialization-name
     (config-with-maybe-string/no-serialization
      (name "foo")))))
-
-
-;;;
-;;; environment-variables serializer
-;;;
-
-(define-configuration/no-serialization env-config
-  (port  (number 80) "")
-  (count maybe-number "")
-  (name  string "")
-  (url maybe-string "")
-  (active? (boolean #f) ""))
-
-(test-group "environment variables serializer"
-
-  (test-equal "basic serialization"
-    '(("PORT" . "70")
-      ("COUNT" . "80")
-      ("NAME" . "Hello World")
-      ("URL" . "https://example.org")
-      ("ACTIVE" . "true"))
-    (serialize-environment-variables
-     (env-config
-      (port 70)
-      (name "Hello World")
-      (url "https://example.org")
-      (active? #t)
-      (count 80))
-     env-config-fields))
-
-  (test-equal "field selection"
-    '(("PORT" . "80"))
-    (serialize-environment-variables
-     (env-config
-      (name "Hello World"))
-     env-config-fields
-     '(port)))
-
-  (test-equal "field negative selection"
-    '(("NAME" . "Hello World")
-      ("ACTIVE" . "false"))
-    (serialize-environment-variables
-     (env-config
-      (name "Hello World"))
-     env-config-fields
-     '(port)
-     #t))
-
-  (test-equal "variable prefixes"
-    '(("TEST_PORT" . "80")
-      ("TEST_NAME" . "Hello World")
-      ("TEST_ACTIVE" . "false"))
-    (serialize-environment-variables
-     (env-config
-      (name "Hello World"))
-     env-config-fields
-     #:prefix "TEST_"))
-
-  (test-equal "boolean serialization"
-    '(("PORT" . "80")
-      ("NAME" . "Hello World")
-      ("ACTIVE" . "1"))
-    (serialize-environment-variables
-     (env-config
-      (name "Hello World")
-      (active? #t))
-     env-config-fields
-     #:true-value "1"
-     #:false-value "0"))
-
-  (test-equal "full record serialization"
-    '(("TEST_COUNT" . "800")
-      ("TEST_NAME" . "Hello World")
-      ("TEST_URL" . "https://example.org")
-      ("TEST_ACTIVE" . "1"))
-    (serialize-environment-variables
-     (env-config
-      (port 90)
-      (name "Hello World")
-      (count 800)
-      (url "https://example.org")
-      (active? #t))
-     env-config-fields
-     '(port)
-     #t
-     #:prefix "TEST_"
-     #:true-value "1"
-     #:false-value "0")))
-
-(define-configuration another-env-config
-  (port
-   (number 80)
-   ""
-   (serializer serialize-number-environment-variable))
-  (count
-   (maybe-number)
-   ""
-   (serializer serialize-maybe-number-environment-variable))
-  (name
-   (string)
-   ""
-   (serializer serialize-string-environment-variable))
-  (url
-   (maybe-string)
-   ""
-   (serializer serialize-maybe-string-environment-variable))
-  (active?
-   (boolean #f)
-   ""
-   (serializer serialize-boolean-environment-variable)))
-
-(test-group "environment variables serializer, with field serializers"
-
-  (test-assert "full record serialization"
-    (gexp?
-     (serialize-configuration
-      (another-env-config
-       (port 90)
-       (name "Hello World")
-       (count 800)
-       (url "https://example.org")
-       (active? #t))
-      another-env-config-fields))))