gnu: ant-bootstrap: Add hack to build on i686.

* gnu/packages/java-bootstrap.scm (ant-bootstrap)[arguments]: Conditionally patch isFile checks. Change-Id: If09594e301dc4691f564e197499acc7d7af71706
gnu: r-seurat: Conditionally skip a test on 32-bit platforms.
2026-04-16 14:18:34 +02:00 · 2026-04-16 14:18:34 +02:00 · 2026-04-16 14:18:34 +02:00 · 2026-04-16 14:18:34 +02:00 · 2026-04-16 14:18:33 +02:00 · 2026-04-16 14:18:33 +02:00
71 changed files with 4003 additions and 1256 deletions
@@ -68,6 +68,7 @@ guix/discovery\.scm                                @guix/core
 guix/docker\.scm                                   @guix/core
 guix/download\.scm                                 @guix/core
 guix/elf\.scm                                      @guix/core
+guix/fossil-download\.scm                          @guix/core
 guix/ftp-client\.scm                               @guix/core
 guix/gexp\.scm                                     @guix/core
 guix/git-authenticate\.scm                         @guix/core
@@ -484,6 +485,7 @@ gnu/services/version-control\.scm                  @guix/vcs
 gnu/tests/version-control\.scm                     @guix/vcs
 guix/build/bzr\.scm                                @guix/vcs
 guix/build/cvs\.scm                                @guix/vcs
+guix/build/fossil\.scm                             @guix/vcs
 guix/build/git\.scm                                @guix/vcs
 guix/build/hg\.scm                                 @guix/vcs
 guix/build/svn\.scm                                @guix/vcs
@@ -104,6 +104,7 @@ MODULES =					\
  guix/discovery.scm				\
  guix/android-repo-download.scm		\
  guix/bzr-download.scm            		\
+  guix/fossil-download.scm			\
  guix/git-download.scm				\
  guix/hg-download.scm				\
  guix/hash.scm					\
@@ -236,6 +237,7 @@ MODULES =					\
  guix/build/asdf-build-system.scm		\
  guix/build/bzr.scm				\
  guix/build/copy-build-system.scm		\
+  guix/build/fossil.scm				\
  guix/build/git.scm				\
  guix/build/hg.scm				\
  guix/build/glib-or-gtk-build-system.scm	\
@@ -20,6 +20,9 @@ Please send Guix bug reports to bug-guix@gnu.org.
 *** New service for Fossil SCM
 *** TeX Live updated to 2026.1

+** Programming interfaces
+*** New (guix fossil-download) module, for fetching Fossil repositories
+
 * Changes in 1.5.0 (since 1.4.0)
 ** Package management
 *** New ‘rpm’ format for the ‘guix pack’ command
@@ -8737,6 +8737,52 @@ The example below denotes a version of gnu-standards to fetch:

@end deftp

+For Fossil repositories, the module @code{(guix fossil-download)} defines
+the @code{fossil-fetch} origin method and @code{fossil-reference} data type
+for support of the Fossil @abbr{SCM, software configuration management} system.
+
+@deffn {Procedure} fossil-fetch ref hash-algo hash [name]
+Return a fixed-output derivation that fetches @var{ref}, a
+@code{<fossil-reference>} object.  The output is expected to have recursive
+hash @var{hash} of type @var{hash-algo} (a symbol).  Use @var{name} as
+the file name, or a generic name if @code{#f}.
+@end deffn
+
+@deftp {Data Type} fossil-reference
+This data type represents a Fossil reference
+for @code{fossil-fetch} to retrieve.
+
+@table @asis
+@item @code{uri} (type: string)
+The URI of a Fossil repository to clone, in one of the following forms,
+in which @code{[...]} denotes optional elements:
+
+@table @code
+@item http[s]://[userid[:password]@@]host[:port][/path]
+A HTTP/HTTPS URL.
+@item [file://]path/to/repo.fossil
+A file URI, where the path must have an extra leading @code{/}
+to use an absolute path (without the URI scheme, the repository
+is opened directly without cloning).
+@end table
+
+@item @code{check-in} (type: string)
+A @url{https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki,
+name of the check-in} to fetch, e.g.@: its canonical hexadecimal identifier,
+associated tag and/or timestamp.
+@end table
+
+The example below denotes the @code{version-3.51.1} tag
+of the SQLite repository:
+
+@lisp
+(fossil-reference
+ (uri "https://sqlite.org/src")
+ (check-in "version-3.51.1"))
+@end lisp
+
+@end deftp
+
@node Defining Package Variants
@section Defining Package Variants

@@ -565,6 +565,7 @@ challenges"))
              "guix/docker.scm"
              "guix/download.scm"
              "guix/elf.scm"
+              "guix/fossil-download.scm"
              "guix/ftp-client.scm"
              "guix/gexp.scm"
              "guix/git-authenticate.scm"
@@ -1214,6 +1215,7 @@ the \"texlive\" importer."
                      "gnu/tests/version-control.scm"
                      "guix/build/bzr.scm"
                      "guix/build/cvs.scm"
+                      "guix/build/fossil.scm"
                      "guix/build/git.scm"
                      "guix/build/hg.scm"
                      "guix/build/svn.scm")))
@@ -1698,6 +1698,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/libcss-check-format.patch		\
  %D%/packages/patches/libeb-gcc-14.patch			\
  %D%/packages/patches/libextractor-tidy-support.patch		\
+  %D%/packages/patches/libfossil-skip-amalgamation.patch	\
  %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch	\
@@ -2114,6 +2115,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-random2-getrandbits-test.patch		\
  %D%/packages/patches/python-pillow-use-zlib-1.3.patch	\
  %D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch	\
+  %D%/packages/patches/python-pynvim-fix-test-command-error.patch	\
  %D%/packages/patches/python-pypytools-python-3-fixes.patch	\
  %D%/packages/patches/python-pyreadstat-link-libiconv.patch	\
  %D%/packages/patches/python-sip-include-dirs.patch	\
@@ -2521,10 +2523,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
  %D%/packages/patches/unity-test-set-subdir-correctly.patch		\
  %D%/packages/patches/unity-test-support-int64.patch		\
+  %D%/packages/patches/ungoogled-chromium-custom-compiler.patch 	\
+  %D%/packages/patches/ungoogled-chromium-empty-parsed-rustc-args.patch	\
  %D%/packages/patches/ungoogled-chromium-extension-search-path.patch	\
  %D%/packages/patches/ungoogled-chromium-RUNPATH.patch		\
  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\
-  %D%/packages/patches/ungoogled-chromium-unbundle-icu-target.patch     \
  %D%/packages/patches/unknown-horizons-python-3.8-distro.patch	\
  %D%/packages/patches/unknown-horizons-python-3.9.patch	\
  %D%/packages/patches/unknown-horizons-python-3.10.patch	\
@@ -765,7 +765,7 @@ file system.")
       (sha256
        (base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
    (build-system pyproject-build-system)
-    (inputs (list python-requests python-argcomplete python-urllib3
+    (propagated-inputs (list python-requests python-argcomplete python-urllib3
                  python-looseversion gnupg))
    (native-inputs (list python-setuptools python-wheel python-requests-cache
                         python-defusedxml))
@@ -773,8 +773,7 @@ file system.")
     (list $SSL_CERT_FILE))
    (arguments
     (list
-      #:test-flags
-      #~(list "-k" "test_*")
+      #:test-backend #~'unittest
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-tests
@@ -793,11 +792,7 @@ file system.")
            (lambda _
              (substitute* "sdkmanager.py"
                (("gpgv")
-                 (string-append #$(this-package-input "gnupg") "/bin/gpgv")))))
-          (replace 'check
-            (lambda* (#:key tests? test-flags #:allow-other-keys)
-              (when tests?
-                (apply invoke "python" "-m" "unittest" test-flags)))))))
+                 (string-append #$(this-package-input "gnupg") "/bin/gpgv"))))))))
    (home-page "https://gitlab.com/fdroid/sdkmanager")
    (synopsis "Replacement for Android sdkmanager written in Python")
    (description
@@ -1182,14 +1177,16 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
 (define-public fdroidserver
  (package
    (name "fdroidserver")
-    (version "2.4.2")
+    (version "2.4.3")
    (source
     (origin
-       (method url-fetch)
-       (uri (pypi-uri "fdroidserver" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://gitlab.com/fdroid/fdroidserver")
+              (commit version)))
+       (file-name (git-file-name name version))
       (sha256
-        (base32
-         "06xybginrwi5c7bw000wz5s5hzi0aqrxskzwh8qc6wv463w2djax"))))
+        (base32 "1745fqxr2qfrls4wr6x9w1262b9pxmw9yvzd9b71ya2qmj74q17n"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1200,22 +1197,17 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
            (lambda _
              (setenv "HOME" "/tmp"))))))
    (propagated-inputs
-     (list python-androguard
+     (list python-platformdirs
+           python-androguard
           python-apache-libcloud
-           python-argcomplete
           python-asn1crypto
           python-clint
           python-defusedxml
-           python-docker
           python-gitpython
-           python-mwclient
           python-oscrypto
           python-paramiko
           python-pillow
-           python-platformdirs
           python-puremagic
-           python-pyasn1
-           python-pyasn1-modules
           python-pyyaml
           python-qrcode
           python-requests
@@ -52,7 +52,7 @@
 (define-public aspell
  (package
    (name "aspell")
-    (version "0.60.8.2")
+    (version "0.60.8.1")
    (source
     (origin
      (method url-fetch)
@@ -60,7 +60,7 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "06b9szgm9cj1zh58r7sbl5fbi3vi9fs7b1as4ir8y176x9ilizjp"))
+        "06yjhwlgpcvbrl5g83qjrpzjwjx7hka5lhsfc3x5gm229nri5nnn"))
      (patches (search-patches "aspell-default-dict-dir.patch"))))
    (build-system gnu-build-system)
    (arguments
@@ -1877,9 +1877,18 @@ R. Seaman's protocol}
         (file-name (git-file-name name version))
         (sha256
          (base32 "0n2jzlpwvjgj8ydg7hsqxnvy8s9pdi5z96id0231kgi87pyfkh7s"))
-         (modules '((guix build utils)))
+         (modules '((guix build utils)
+                    (ice-9 ftw)
+                    (srfi srfi-26)))
         (snippet
          #~(begin
+              ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+              (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 "thirdparty" "thirdparty.cmake")))))
      (build-system cmake-build-system)
      (arguments
@@ -98,24 +98,24 @@
                 (cut patch-shebang <> path)
                 (find-files (string-append #$output "/etc/avahi"))))))))
    (inputs
-     (cons* bash-minimal
-            dbus
-            expat
-            gdbm
-            glib
-            libdaemon
-            libevent
-            ;; Do not use libcap when cross-compiling since it's not quite
-            ;; cross-compilable; and use it only for supported systems.
-            (if (and (not (%current-target-system))
-                     (member (%current-system)
-                             (package-supported-systems libcap)))
-                (list libcap)        ;to enable chroot support in avahi-daemon
-                (list))))
+     `(("bash-minimal" ,bash-minimal)
+       ("dbus" ,dbus)
+       ("expat" ,expat)
+       ("gdbm" ,gdbm)
+       ("glib" ,glib)
+       ;; Do not use libcap when cross-compiling since it's not quite
+       ;; cross-compilable; and use it only for supported systems.
+       ,@(if (and (not (%current-target-system))
+                  (member (%current-system)
+                          (package-supported-systems libcap)))
+             `(("libcap" ,libcap))   ;to enable chroot support in avahi-daemon
+             '())
+       ("libdaemon" ,libdaemon)
+       ("libevent" ,libevent)))
    (native-inputs
-     (list gettext-minimal
-           (list glib "bin")
-           pkg-config))
+     `(("gettext" ,gettext-minimal)
+       ("glib" ,glib "bin")
+       ("pkg-config" ,pkg-config)))
    (synopsis "Implementation of mDNS/DNS-SD protocols")
    (description
     "Avahi is a system which facilitates service discovery on a local
@@ -913,7 +913,7 @@ suite native in R.")
 (define-public r-bpcells
  (package
    (name "r-bpcells")
-    (version "0.3.0")
+    (version "0.3.1")
    (source
     (origin
       (method git-fetch)
@@ -922,7 +922,7 @@ suite native in R.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))
+        (base32 "0yqgcajq83g25mznwcngaw7pi6vcqxqdnynpgb95yci57k3wrp6j"))
       (modules '((guix build utils)))
       (snippet
        '(delete-file-recursively "r/src/vendor/highway"))))
@@ -931,13 +931,15 @@ suite native in R.")
    (arguments
     (list
      #:phases
-      '(modify-phases %standard-phases
+      `(modify-phases %standard-phases
         (add-after 'unpack 'chdir
-           (lambda _
-             (substitute* "r/configure"
-               (("tools/hwy-test.cpp" m)
-                (string-append m " $HWY_LIBS $HWY_CFLAGS")))
-             (chdir "r"))))))
+           (lambda _ (chdir "r")))
+         ,@(if (target-x86-32?)
+               '((add-after 'chdir 'require-sse2
+                   ;; This avoids falling back to the scalar backend in
+                   ;; highway, which fails to build.
+                   (lambda _ (setenv "CFLAGS" "-msse2"))))
+               '()))))
    (propagated-inputs
     (list r-dplyr
           r-ggplot2
@@ -345,8 +345,8 @@ programs and other files depend.")
    (license license:bsd-3)))

 (define-public gn
-  (let ((commit "ee5b7e32b961a9da1933e9f46a018ba6cac8ef60")
-        (revision "2277"))            ;as returned by `git describe`, used below
+  (let ((commit "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a")
+        (revision "2354"))            ;as returned by `git describe`, used below
    (package
      (name "gn")
      (version (git-version "0.0" revision commit))
@@ -356,7 +356,7 @@ programs and other files depend.")
                (uri (git-reference (url home-page) (commit commit)))
                (sha256
                 (base32
-                  "19kkvwxl66vlzlfppbq03fmi59i5g8a1yc71fsfgwqqmx4wywd6w"))
+                  "0yz38czmbc72q1hkiv3cwxqh2i8ji2vkkvvk5ws2cjplmn2vj0x9"))
                (file-name (git-file-name name version))))
      (build-system gnu-build-system)
      (arguments
@@ -366,7 +366,8 @@ programs and other files depend.")
                   (lambda _
                     (setenv "CC" "gcc")
                     (setenv "CXX" "g++")
-                     (setenv "CXXFLAGS" "-g -O2 -Wno-error=redundant-move")
+                     (setenv "CXXFLAGS"
+                             "-g -O2 -Wno-error=redundant-move -Wno-error=comment")
                     (setenv "AR" "ar")))
                 (replace 'configure
                   (lambda _
@@ -79,11 +79,13 @@
  '("base/third_party/cityhash" ;Expat
    "base/third_party/double_conversion" ;BSD-3
    "base/third_party/icu" ;Unicode, X11-style
+    "base/third_party/nspr" ;MPL-2.0
    "base/third_party/superfasthash" ;BSD-3
    "base/third_party/symbolize" ;BSD-3
    "base/third_party/xdg_user_dirs" ;Expat
+    "buildtools/third_party/libc++" ;BSD
+    "buildtools/third_party/libc++abi" ;BSD
    "net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
-    "net/third_party/nss" ;MPL-2.0
    "net/third_party/quiche" ;BSD-3
    "net/third_party/uri_template" ;ASL2.0
    "third_party/abseil-cpp" ;ASL2.0
@@ -104,8 +106,11 @@
    "third_party/catapult" ;BSD-3
    "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
    "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
+    "third_party/catapult/third_party/beautifulsoup4-4.9.3" ;Expat
+    "third_party/catapult/third_party/html5lib-1.1" ;Expat
    "third_party/catapult/third_party/polymer" ;BSD-3
    "third_party/catapult/third_party/six" ;Expat
+    "third_party/catapult/third_party/typ" ;ASL2.0
    ;; XXX: This is a minified version of <https://d3js.org/>.
    "third_party/catapult/tracing/third_party/d3" ;BSD-3
    "third_party/catapult/tracing/third_party/gl-matrix" ;Expat
@@ -120,19 +125,12 @@
    "third_party/cld_3" ;ASL2.0
    "third_party/closure_compiler" ;ASL2.0
    "third_party/compiler-rt" ;ASL2.0
-    "third_party/compiler-rt/src/lib" ;ASL2.0
-    "third_party/compiler-rt/src/lib/builtins" ;ASL2.0
    "third_party/content_analysis_sdk" ;BSD-3
    "third_party/cpuinfo" ;BSD-2
    "third_party/crabbyavif" ;ASL2.0
-    "third_party/crabbyavif/src/sys/dav1d-sys" ;ASL2.0
-    "third_party/crabbyavif/src/sys/aom-sys" ;ASL2.0
-    "third_party/crabbyavif/src/sys/libgav1-sys" ;ASL2.0
-    "third_party/crabbyavif/src/sys/libyuv-sys" ;ASL2.0
-    "third_party/crabbyavif/src/sys/ndk-sys" ;ASL2.0
    "third_party/crashpad" ;ASL2.0
    "third_party/crashpad/crashpad/third_party/lss" ;ASL2.0
-    "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
+    "third_party/crashpad/crashpad/third_party/zlib" ;Zlib
    "third_party/crc32c" ;BSD-3
    "third_party/cros_system_api" ;BSD-3
    "third_party/dav1d" ;BSD-2
@@ -140,19 +138,25 @@
    ;; TODO: can likely be unbundled when Vulkan is updated.
    "third_party/dawn/third_party/khronos" ;ASL2.0
    "third_party/dawn/third_party/gn/webgpu-cts" ;BSD-3
+    "third_party/dawn/third_party/renderdoc" ;Expat
+    "third_party/dawn/third_party/webgpu-headers" ;BSD-3
+    "third_party/depot_tools" ;BSD-3
+    "third_party/devscripts" ;GPL2.0
    "third_party/devtools-frontend" ;BSD-3
    "third_party/devtools-frontend/src/front_end"
    "third_party/devtools-frontend/src/front_end/third_party"
    "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party\
 /additional_readme_paths.json" ;no explicit license; trivial
-    "third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0
    "third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
+    "third_party/devtools-frontend/src/front_end/third_party/csp_evaluator" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/diff" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3
+    "third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
+    "third_party/devtools-frontend/src/front_end/third_party/legacy-javascript" ;ASL-2.0
    "third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/lit" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3
@@ -164,10 +168,12 @@
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/parsel" ; Expat
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs" ; ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay" ;ASL2.0
+    "third_party/devtools-frontend/src/front_end/third_party/source-map-scopes-codec" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party\
 /vscode.web-custom-data" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/third-party-web" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
+    "third_party/devtools-frontend/src/front_end/third_party/web-vitals" ;Expat
    "third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0
    "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0

@@ -179,6 +185,7 @@
    "third_party/farmhash" ;Expat
    "third_party/fast_float" ;ASL2.0, Boost1.0, Expat
    "third_party/fdlibm" ;non-copyleft
+    "third_party/federated_compute/chromium/fcp/confidentialcompute" ;ASL2.0
    "third_party/federated_compute/src/fcp/base" ;ASL2.0
    "third_party/federated_compute/src/fcp/confidentialcompute" ;ASL2.0
    "third_party/federated_compute/src/fcp/protos/confidentialcompute" ;ASL2.0
@@ -187,7 +194,9 @@
    "third_party/fft2d" ;non-copyleft
    "third_party/flatbuffers" ;ASL2.0
    "third_party/fp16" ;Expat
+    "third_party/freetype" ;GPL2.0
    "third_party/fusejs" ;ASL2.0
+    "third_party/fxdiv" ;Expat
    "third_party/gemmlowp" ;ASL2.0
    "third_party/google_input_tools" ;ASL2.0
    "third_party/google_input_tools/third_party/closure_library" ;ASL2.0
@@ -196,6 +205,9 @@
    "third_party/harfbuzz-ng" ;Expat
    "third_party/highway" ;ASL2.0
    "third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
+    "third_party/hyphenation-patterns" ;Expat
+    ;; FIXME: Our icu does not have some headers such as udatamem.h.
+    "third_party/icu" ;Unicode3.0
    "third_party/ink" ;ASL2.0
    "third_party/ink_stroke_modeler" ;ASL2.0
    "third_party/inspector_protocol" ;BSD-3
@@ -208,12 +220,14 @@
    "third_party/libaddressinput" ;ASL2.0
    "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
    "third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3
-    "third_party/libaom/source/libaom/third_party/SVT-AV1" ;BSD-3
    "third_party/libaom/source/libaom/third_party/vector" ;Expat
    "third_party/libaom/source/libaom/third_party/x86inc" ;ISC
+    "third_party/libc++" ;Expat
    "third_party/libdrm" ; Expat
    "third_party/libgav1" ;ASL2.0
    "third_party/libjingle_xmpp" ;BSD-3
+    "third_party/libpfm4" ;BSD
+    "third_party/libpng" ;PNG2.0
    "third_party/libphonenumber" ;ASL2.0
    "third_party/libsecret" ;LGPL2.1+
    "third_party/libsrtp" ;BSD-3
@@ -227,11 +241,15 @@
    "third_party/libvpx/source/libvpx/third_party/x86inc" ;Expat

    "third_party/libwebm" ;BSD-3
+    "third_party/libx11" ;BSD
+    "third_party/libxcb-keysyms" ;BSD
    "third_party/libxml/chromium" ;BSD-3
    "third_party/libyuv" ;BSD-3
    "third_party/libzip" ;BSD-3
    "third_party/lit" ;BSD-3
    "third_party/lit/v3_0" ;BSD-3
+    "third_party/llvm-libc" ;ASL2.0
+    "third_party/llvm-libc/src/shared" ;ASL2.0
    "third_party/lottie" ;Expat
    "third_party/lss" ;BSD-3
    "third_party/lzma_sdk" ;public domain
@@ -244,6 +262,7 @@
    "third_party/modp_b64" ;BSD-3
    "third_party/nasm" ;BSD-2
    "third_party/nearby" ;ASL2.0
+    "third_party/neon_2_sse" ;BSD-2
    "third_party/node" ;Expat
    "third_party/oak/chromium/proto" ;ASL2.0
    "third_party/oak/chromium/proto/attestation" ;ASL2.0
@@ -251,14 +270,20 @@
    "third_party/one_euro_filter" ;BSD-3
    "third_party/openscreen" ;BSD-3
    "third_party/openscreen/src/third_party/tinycbor" ;Expat
+    "third_party/opus" ;BSD-3
    "third_party/ots" ;BSD-3
    "third_party/pdfium" ;BSD-3
    "third_party/pdfium/third_party/agg23" ;Expat
    "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
+    "third_party/pdfium/third_party/lcms" ;Expat
+    "third_party/pdfium/third_party/libopenjpeg" ;BDS-2
    "third_party/pdfium/third_party/libtiff" ;non-copyleft
    "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
    "third_party/perfetto" ;ASL2.0
    "third_party/perfetto/protos/third_party/chromium" ;BSD-3
+    "third_party/perfetto/protos/third_party/pprof" ;ASL2.0
+    "third_party/perfetto/protos/third_party/primes" ;ASL2.0
+    "third_party/perfetto/protos/third_party/simpleperf" ;ASL2.0
    "third_party/pffft" ;the "FFTPACK" license
    "third_party/ply" ;BSD-3
    "third_party/polymer" ;BSD-3
@@ -268,6 +293,7 @@
    "third_party/protobuf/third_party/utf8_range" ; Expat
    "third_party/pthreadpool" ;BSD-2
    "third_party/puffin" ;Non-copyleft
+    "third_party/pyyaml" ;Expat
    "third_party/pyjson5" ;ASL2.0
    "third_party/rapidhash" ;BSD-2
    "third_party/readability" ;ASL2.0
@@ -279,11 +305,14 @@
    "third_party/search_engines_data" ;BSD-3
    "third_party/securemessage" ;ASL2.0
    "third_party/selenium-atoms" ;ASL2.0
+    "third_party/sentencepiece" ;ASL2.0
+    "third_party/sentencepiece/src/third_party/darts_clone" ;BSD-3
    "third_party/shell-encryption" ;ASL2.0
    "third_party/simdutf" ;Non-copyleft
    "third_party/simplejson" ; Non-copyleft
+    "third_party/six" ;Expat
    "third_party/skia" ;BSD-3
-    "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
+    "third_party/skia/include/third_party/vulkan" ;BSD-3
    "third_party/smhasher" ;Expat, public domain

    ;; FIXME: the snappy "replacement" shim (see replace_gn_files.py below) does
@@ -338,7 +367,6 @@
    "third_party/webrtc/modules/third_party/fft" ;Non-copyleft
    "third_party/webrtc/modules/third_party/g711" ;Public domain
    "third_party/webrtc/modules/third_party/g722" ;Public domain
-    "third_party/webrtc/rtc_base/third_party/sigslot" ;Public domain
    "third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
    "third_party/woff2" ;ASL2.0
    "third_party/wuffs" ;ASL2.0
@@ -372,7 +400,7 @@
  ;; run the Blink performance tests, just remove everything to save ~70MiB.
  '("third_party/blink/perf_tests"))

-(define %chromium-version "141.0.7390.65")
+(define %chromium-version "147.0.7727.55")
 (define %ungoogled-revision (string-append %chromium-version "-1"))
 (define %debian-revision (string-append "debian/" %ungoogled-revision))

@@ -384,7 +412,7 @@
    (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
    (sha256
     (base32
-      "1hk4rww2gccly1qv0xnswd77haj02rlza82403dxdjm8fkdfndy6"))))
+      "0l6v4wf16067igawjlh90f3d287mkw0cq4j5lvrxxy17y1skynzc"))))

 (define %debian-origin
  (origin
@@ -397,7 +425,7 @@
                                ((_ version) version))))
    (sha256
     (base32
-      "06s3kvwb3490xb28n6r3q5n1c0ylsvchiw6s4h1rrp8jqzwjbmc6"))))
+      "0gqarll08i7rcs1amapciv263xvzglc8p44ikavq3xd12yyvcd98"))))

 (define (origin-file origin file)
  (computed-file
@@ -410,26 +438,38 @@

 (define %debian-patches
  (map debian-patch
-       '("bookworm/clang19.patch"
-         "bookworm/foreach.patch"
+       '("bookworm/foreach.patch"
+         "debianization/safe-libcxx.patch"
+         "disable/enterprise-tests.patch"
         "disable/node-version-ck.patch"
+         "disable/rustc-allow-features.patch"
+         "fixes/bytemuck.patch"
         "fixes/gentoo-stylesheet.patch"
         "fixes/libcpp-headers.patch"
+         "fixes/libpng-testonly.patch"
         "fixes/rust-clanglib.patch"
+         "llvm-19/clang19.patch"
+         "llvm-19/clone-traits.patch"
+         "llvm-19/keyfactory.patch"
+         "llvm-19/value-or.patch"
+         "llvm-22/ignore-for-ubsan.patch"
         "system/openjpeg.patch"
-         ;; Remove after rust is past
-         ;; <https://github.com/rust-lang/rust/pull/141061>.
-         "trixie/rust-no-alloc-shim.patch")))
+         "trixie/cookie-string-view.patch"
+         "trixie/nodejs-main.patch")))

 (define %guix-patches
  (list (local-file
         (assume-valid-file-name
          (search-patch
-           "ungoogled-chromium-extension-search-path.patch")))
+           "ungoogled-chromium-custom-compiler.patch")))
        (local-file
         (assume-valid-file-name
          (search-patch
-           "ungoogled-chromium-unbundle-icu-target.patch")))
+           "ungoogled-chromium-empty-parsed-rustc-args.patch")))
+        (local-file
+         (assume-valid-file-name
+          (search-patch
+           "ungoogled-chromium-extension-search-path.patch")))
        (local-file
         (assume-valid-file-name
          (search-patch
@@ -500,9 +540,8 @@
             "#if 0"))
          (invoke "python" "build/linux/unbundle/replace_gn_files.py"
                  "--system-libraries" "flac" "fontconfig" "freetype"
-                  "harfbuzz-ng" "icu" "libjpeg"
-                  "libpng" "libwebp" "libxml" "libxslt" "openh264" "opus"
-                  "zlib")))))
+                  "harfbuzz-ng" "libjpeg" "libpng" "libwebp" "libxml"
+                  "libxslt" "openh264" "opus" "zlib")))))

 (define opus+custom
  (package/inherit opus
@@ -531,7 +570,7 @@
                                  %chromium-version "-lite.tar.xz"))
              (sha256
               (base32
-                "09iwglswnr6d45zz3zsjw7jpm1xlwwkxlz9h5nlhqxyd933a04fq"))
+                "1salvlw5sykx3zmsbp7cgmf7y8yy6jlgb4b4zswzsbjrprk4jnap"))
              (modules '((guix build utils)))
              (snippet (force ungoogled-chromium-snippet))))
    (build-system gnu-build-system)
@@ -548,6 +587,7 @@
      ;; directory for an exhaustive list of supported flags.
      ;; (Note: The 'configure' phase will do that for you.)
      #~(list "is_debug=false"
+              "is_component_build=false"
              ;; Use the "official" release optimizations, as opposed to
              ;; a developer build.
              "is_official_build=true"
@@ -555,6 +595,7 @@
              "use_clang_modules=false"
              "use_custom_libcxx=false" ; support for this is deprecated and to be removed.
              "optimize_webui=false"
+              "webnn_use_tflite=false"
              "safe_browsing_use_unrar=false"
              "chrome_pgo_phase=0"
              "use_sysroot=false"
@@ -572,12 +613,10 @@
              "enable_service_discovery=false"
              "enable_vr=false"
              "enable_enterprise_companion=false"
-              "enable_glic=false"
              "enable_iterator_debugging=false"
              "enable_hangout_services_extension=false"
              "enable_widevine=false"
-              ;; Disable type-checking for the Web UI to avoid a Java dependency.
-              "enable_js_type_check=false"
+              "fatal_linker_warnings=false"
              ;; Disable code using TensorFlow until it has been scrutinized
              ;; by the ungoogled project.
              "build_with_tflite_lib=false"
@@ -589,6 +628,11 @@
              "angle_has_histograms=false"
              "angle_build_tests=false"
              "build_angle_perftests=false"
+              "enable_perfetto_unittests=false"
+              "skia_enable_skshapper_tests=false"
+              "tint_build_unittests=false"
+              "enable_nocompile_tests=false"
+              "enable_screen_ai_browsertests=false"

              "clang_warning_suppression_file=\"\""

@@ -597,6 +641,8 @@
              "is_cfi=false"

              "symbol_level=0"
+              "blink_symbol_level=0"
+              "v8_symbol_level=0"
              "v8_enable_backtrace=false"

              ;; Define a custom toolchain that simply looks up CC, AR and
@@ -628,26 +674,10 @@
                             ;; invokation and fails if it's just the version number.
                             " (f6e511eec 2024-10-15) (built from a source tarball)\"")

-              ;; Chromium's build/rust/std/BUILD.gn has a hardcoded
-              ;; list of stdlib rlibs (stdlib_files) that GN uses to
-              ;; declare build outputs.  GN requires static output
-              ;; declarations, so the list must exactly match what
-              ;; rlibs exist in the Rust sysroot.  Chromium's list
-              ;; includes unicode_width because their bundled
-              ;; toolchain (Rust 1.89) ships it as a dependency of
-              ;; getopts 0.2.23.  Our Rust 1.93 has getopts 0.2.24
-              ;; which dropped that dependency, so unicode_width is
-              ;; not in our sysroot.  This GN arg removes it from
-              ;; the list.  (Chromium's own use of unicode_width via
-              ;; codespan-reporting is a separate vendored copy under
-              ;; third_party/rust/chromium_crates_io/ and is
-              ;; unaffected.)
-              "removed_rust_stdlib_libs=[\"unicode_width\"]"
-
              ;; Prefer system libraries.
              "use_system_freetype=true"
              "use_system_harfbuzz=true"
-              "use_system_icu=true"
+              "use_system_icu=false"
              "use_system_lcms2=true"
              "use_system_libffi=true"
              "use_system_libjpeg=true"
@@ -713,9 +743,9 @@

                ;; Many files try to include ICU headers from "third_party/icu/...".
                ;; Remove the "third_party/" prefix to use system headers instead.
-                (substitute* (find-files "chrome" "\\.cc$")
-                  (("third_party/icu/source/(common|i18n)/")
-                   ""))
+                ;(substitute* (find-files "chrome" "\\.cc$")
+                ;  (("third_party/icu/source/(common|i18n)/")
+                ;   ""))

                ;; XXX: Should be unnecessary when use_system_lcms2=true.
                (substitute* "third_party/pdfium/core/fxcodec/icc/icc_transform.h"
@@ -732,16 +762,19 @@
                  (("include \"third_party/curl")
                   "include \"curl"))

-                ;; Unknown flags as of clang-19, can be removed when building with
-                ;; newer clang.
-                (substitute* "build/config/compiler/BUILD.gn"
-                  (("-gsimple-template-names") ""))
-
-                ;; Clang libs are not under bindgen root directory.
-                (substitute* "build/rust/rust_bindgen_generator.gni"
+                ;; Our clang libs and rustfmt are not under bindgen root directory.
+                (substitute* '("build/rust/rust_bindgen_generator.gni"
+                               "build/rust/rust_bindgen.gni")
                  (("(_libclang_path = )rust_bindgen_root" _ libclang)
-                   (string-append libclang "clang_base_path"))))))
-          (add-after 'patch-stuff 'add-absolute-references
+                   (string-append libclang "clang_base_path"))
+                  (("(_rustfmt_path = \")\\$\\{rust_bindgen_root\\}" _ rustfmt)
+                   (string-append rustfmt "${rust_sysroot_absolute}"))))))
+          (add-after 'patch-stuff 'include-pthreadpool
+            ;; FIXME: Somehow the build system cannot locate this header.
+            (lambda _
+              (copy-file "third_party/pthreadpool/src/include/pthreadpool.h"
+                         "pthreadpool.h")))
+          (add-after 'include-pthreadpool 'add-absolute-references
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((cups-config (search-input-file inputs "/bin/cups-config"))
                    (libnssckbi.so (search-input-file inputs
@@ -763,13 +796,22 @@
          (add-after 'add-absolute-references 'adjust-CPLUS_INCLUDE_PATH
            ;; The libcxx include/c++/v1 directory is not exposed via
            ;; CPLUS_INCLUDE_PATH by default, causing errors like
-            ;; "fatal error: 'format' file not found".
+            ;; "fatal error: 'format' file not found".  Also clang is
+            ;; unable to find gcc's bits/c++config.h which is machine
+            ;; dependent.
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
-              (setenv "CPLUS_INCLUDE_PATH"
-                      (string-append
-                       (search-input-directory inputs
-                                               "/include/c++/v1")
-                       ":" (getenv "CPLUS_INCLUDE_PATH")))))
+              (let* ((libcxx-v1 (search-input-directory inputs
+                                                        "include/c++/v1"))
+                     (target-system  #$(nix-system->gnu-triplet
+                                         (or (%current-target-system)
+                                             (%current-system))))
+                     (target-include (string-append "include/c++/"
+                                                    target-system))
+                     (gcc-bits  (search-input-directory inputs
+                                                        target-include)))
+                (setenv "CPLUS_INCLUDE_PATH"
+                        (string-append libcxx-v1 ":" gcc-bits ":"
+                         (getenv "CPLUS_INCLUDE_PATH"))))))
          (add-before 'configure 'prepare-build-environment
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (let ((node (search-input-file (or native-inputs inputs)
@@ -955,7 +997,7 @@
           glib
           gtk+
           harfbuzz
-           icu4c
+           icu4c-77
           lcms
           libcxx
           libffi
@@ -42,20 +42,24 @@
  #:use-module (guix utils)
  #:use-module (srfi srfi-26))

+(define %coreboot-version "26.03")
+
+(define %coreboot-origin
+  (origin
+    (method git-fetch)
+    (uri (git-reference
+           (url "https://review.coreboot.org/coreboot")
+           (commit %coreboot-version)))
+    (file-name (git-file-name "coreboot" %coreboot-version))
+    (sha256
+     (base32
+      "0436rr0vibh35phvkxrc939njvrmnfq9xw87y1b0nlllglvq07kk"))))
+
 (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"))))
+    (version %coreboot-version)
+    (source %coreboot-origin)
    (build-system gnu-build-system)
    (arguments
     (list
@@ -126,17 +130,8 @@ It also comes with example files generated by bincfg.")
 (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"))))
+    (version %coreboot-version)
+    (source %coreboot-origin)
    (build-system gnu-build-system)
    (arguments
     (list
@@ -160,16 +155,8 @@ dump Intel Firmware Descriptor data of an image file.")
 (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"))))
+    (version %coreboot-version)
+    (source %coreboot-origin)
    (build-system gnu-build-system)
    (arguments
     (list
@@ -201,17 +188,8 @@ Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
 (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"))))
+    (version %coreboot-version)
+    (source %coreboot-origin)
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1096,9 +1096,17 @@ to aid in debugging.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256 (base32 "0ppx8r9isc772y0ahpgl8g5b3yxka7ffqzlcsa920aib5nj39lrg"))
-       (modules '((guix build utils)))
+       (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))))
            (substitute* "pyproject.toml"
              ;; Python is linked with GNU readline on all Guix targets.
              ((".*gnureadline.*") "")
@@ -1586,21 +1586,31 @@ exploration and optimization.")
              (commit version)
              (recursive? #t)))
       (file-name (git-file-name name version))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
-        #~(delete-all-but "libs"
-            "delaunay-triangulation"
-            "dxflib"
-            ;; "fontobene-qt"
-            ;; "googletest"
-            ;; "hoedown"
-            "librepcb"
-            ;; "muparser"
-            "optional"
-            "parseagle"
-            ;; "polyclipping"
-            ;; "quazip"
-            "type_safe"))
+        #~(begin
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            (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 "libs"
+                            "delaunay-triangulation"
+                            "dxflib"
+                            ;; "fontobene-qt"
+                            ;; "googletest"
+                            ;; "hoedown"
+                            "librepcb"
+                            ;; "muparser"
+                            "optional"
+                            "parseagle"
+                            ;; "polyclipping"
+                            ;; "quazip"
+                            "type_safe")))
       (sha256
        (base32 "1g3k2g2p5yy7zk971bg7qh4k38p30aydp27c5bfb02gn7djknz7w"))))
    (build-system cmake-build-system)
@@ -2156,9 +2166,18 @@ layout of a circuit corresponds to the desired netlists.")
              ;; no longer have their original upstream.
              (recursive? #t)))
       (file-name (git-file-name name version))
-       (modules '((guix build utils)))
       (snippet
        #~(begin
+            (use-modules (guix build utils)
+                         (ice-9 ftw)
+                         (srfi srfi-26))
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            (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 "3rdparty"
                            ;; The following sources have all been patched, so
                            ;; cannot easily be unbundled.
@@ -784,7 +784,7 @@ reading the extensive documentation about BookmarkPlus on the Emacs Wiki.")
  (package
    (name "emacs-bqn-mode")
    ;; Upstream releases are tagged by date.
-    (version "2025-07-06")
+    (version "2026-02-08")
    (source
     (origin
       (method git-fetch)
@@ -793,7 +793,7 @@ reading the extensive documentation about BookmarkPlus on the Emacs Wiki.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1b25k66nn4qa4ryhm8mzc53qvsvhgjzdngisw28cpdh109627iz3"))))
+        (base32 "1m9l4if3a9i6r76v370gh6azgj2lwqcnpavfv2bkvm9ad56f3pa8"))))
    (build-system emacs-build-system)
    (arguments
     (list #:tests? #f)) ;No tests found in source.
@@ -15925,9 +15925,18 @@ placed at the margin of the minibuffer for your completion candidates.")
               (url "https://github.com/Fuco1/smartparens")
               (commit commit)))
         (file-name (git-file-name name version))
-         (modules '((guix build utils)))
+         (modules '((guix build utils)
+                    (ice-9 ftw)
+                    (srfi srfi-26)))
         (snippet
          '(begin
+             ;; Taken from nextpnr package.
+             (define (delete-all-but directory . preserve)
+               (with-directory-excursion directory
+                 (let* ((pred
+                         (negate (cut member <> (append '("." "..") preserve))))
+                        (items (scandir "." pred)))
+                   (for-each delete-file items))))
             ;; Only activate basic tests.
             (delete-all-but "test"
                             "test-helper.el"
@@ -24571,6 +24580,13 @@ Meow’s motions.")
      #:tests? #f                       ; no test suite
      #:phases
      #~(modify-phases %standard-phases
+          (add-before 'patch-el-files 'patch-xauth-path
+            ;; Uses xauth directly at runtime to authenticate with the X server.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "xcb.el"
+                (("xauth list")
+                 (string-append (search-input-file inputs "/bin/xauth")
+                                " list")))))
          (add-after 'expand-load-path 'regenerate-el-files
            (lambda* (#:key inputs native-inputs #:allow-other-keys)
              (substitute* "xelb-gen"
@@ -24578,6 +24594,7 @@ Meow’s motions.")
              (invoke "make"
                      (format #f "PROTO_PATH=~a/share/xcb"
                              #$(this-package-native-input "xcb-proto"))))))))
+    (inputs (list xauth))
    (native-inputs (list xcb-proto))
    (propagated-inputs (list emacs-compat))
    (home-page "https://github.com/emacs-exwm/xelb")
@@ -35403,12 +35420,199 @@ files are easily readable and they work nicely with version control systems.")
      (build-system emacs-build-system)
      (arguments
       (list #:include #~(cons "^data\\/" %default-include)
-             #:tests? #f))              ; no tests
+             #:tests? #f              ; no tests
+             #:phases
+             #~(modify-phases %standard-phases
+                 ;; The nerd-icons-install-fonts function would otherwise
+                 ;; download fonts from the network.  Replace it with a stub
+                 ;; that instructs the user to install the font via Guix.
+                 (add-after 'unpack 'disable-font-installer
+                   (lambda _
+                     (emacs-batch-edit-file "nerd-icons.el"
+                       '(progn
+                         (search-forward "(defun nerd-icons-install-fonts")
+                         (beginning-of-line)
+                         (kill-sexp)
+                         (insert "\
+(defun nerd-icons-install-fonts (&optional pfx)
+  (interactive \"P\")
+  (message \"To use nerd-icons fonts, install `font-nerd-symbols' using
+`guix package -i font-nerd-symbols' or add it to your manifest or home config.
+Remember, that you may have to run `fc-cache -rv' to refresh the font cache.\
+\"))")
+                         (basic-save-buffer))))))))
      (synopsis "Library for easily using nerd font icons inside Emacs")
      (description "Nerd-icons an alternative to all-the-icons.  It works on both
 GUI and terminal, and requires a nerd font installed on your system.")
      (license license:gpl3+))))

+(define-public emacs-nerd-icons-dired
+  ;; No tags provided upstream
+  (let ((commit "adf9a2bb5f3f13be7a676923639337f3fcc5d8c3")
+        (revision "0"))
+    (package
+      (name "emacs-nerd-icons-dired")
+      (version (git-version "0.0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/rainstormstudio/nerd-icons-dired")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0x1xmwlfjgbk5kk4bxvgz4ykwwgiwmdbzhgsw49kpzz678a3qzrp"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ;no tests
+      (propagated-inputs (list emacs-nerd-icons))
+      (home-page "https://github.com/rainstormstudio/nerd-icons-dired")
+      (synopsis "Icons for Dired via Nerd Icons")
+      (description
+       "This package adds icons to Dired, using the @code{nerd-icons} package.")
+      (license license:gpl3+))))
+
+(define-public emacs-nerd-icons-ivy-rich
+  ;; Tagged release is not up-to-date, according to the "Version:" keyword in
+  ;; main file.
+  (let ((commit "5006f91b49e86e232cdc1a628501b76124c41dac")
+        (revision "0"))
+    (package
+      (name "emacs-nerd-icons-ivy-rich")
+      (version (git-version "1.0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/seagle0128/nerd-icons-ivy-rich")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0m62l4cl9j3ssd25rz40vgrv99bmwn6l4ig2sf8zzi0fpzm8axgh"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ;tests require Cask
+      (propagated-inputs
+       (list emacs-ivy-rich
+             emacs-nerd-icons))
+      (home-page "https://github.com/seagle0128/nerd-icons-ivy-rich")
+      (synopsis "Icons for Ivy via Nerd Icons")
+      (description
+       "This package adds icons to Ivy, using the @code{ivy-rich} and
+@code{nerd-icons} packages.")
+      (license license:gpl3+))))
+
+(define-public emacs-nerd-icons-ibuffer
+  (package
+    (name "emacs-nerd-icons-ibuffer")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/seagle0128/nerd-icons-ibuffer")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1wj6kcgvh700maj9i5pmgzc48lbj0dbxx849a8w519m4anr7b23s"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:tests? #f))                   ;tests require Cask
+    (propagated-inputs
+     (list emacs-nerd-icons))
+    (home-page "https://github.com/seagle0128/nerd-icons-ibuffer")
+    (synopsis "Icons for Ibuffer via Nerd Icons")
+    (description
+     "This package adds icons to ibuffer in Emacs, using the @code{nerd-icons}
+package.")
+    (license license:gpl3+)))
+
+(define-public emacs-nerd-icons-completion
+  ;; No tags provided upstream
+  (let ((commit "63a6b3f1eb98bb381c86a1658ac401c8967079b8")
+        (revision "0"))
+    (package
+      (name "emacs-nerd-icons-completion")
+      (version (git-version "0.0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/rainstormstudio/nerd-icons-completion")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "08p361rh5mv3ng10av1381kzl9s4msdjyca96hsgsh05qwq5pdrf"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ;no tests
+      (propagated-inputs (list emacs-nerd-icons))
+      (home-page "https://github.com/rainstormstudio/nerd-icons-completion")
+      (synopsis "Icons for Emacs minibuffer completion via Nerd Icons")
+      (description
+       "This package adds icons to minibuffer completion in Emacs, using the
+@code{nerd-icons} package.  It supports @code{vertico} and @code{marginalia}.")
+      (license license:gpl3+))))
+
+(define-public emacs-nerd-icons-corfu
+  (package
+    (name "emacs-nerd-icons-corfu")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/LuigiPiucco/nerd-icons-corfu")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "036p45wqwrqhn5xv5sn3gsm2mb79gj6fk24zpkfa7wrv45qqgb21"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:tests? #f))                   ;no tests
+    (propagated-inputs
+     (list emacs-corfu
+           emacs-nerd-icons))
+    (home-page "https://github.com/LuigiPiucco/nerd-icons-corfu")
+    (synopsis "Icons for Corfu via Nerd Icons")
+    (description
+     "This package adds icons to @code{corfu}, using the @code{nerd-icons}
+package.")
+    (license license:gpl3+)))
+
+(define-public emacs-nerd-icons-mode-line
+  ;; No tags provided upstream
+  (let ((commit "23eca8e16799524889d661f4140355e81b8f929c")
+        (revision "0"))
+    (package
+      (name "emacs-nerd-icons-mode-line")
+      (version (git-version "0.0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/grolongo/nerd-icons-mode-line")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0l2bg22cllab9wz5wxd6zhrywavqrlvv1a6y49ij63qhlsfncy6s"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ;no tests
+      (propagated-inputs (list emacs-nerd-icons))
+      (home-page "https://github.com/grolongo/nerd-icons-mode-line")
+      (synopsis "Icons for the Emacs modeline via Nerd Icons")
+      (description
+       "This package adds icons to the modeline in Emacs, using the
+@code{nerd-icons} package.")
+      (license license:gpl3+))))
+
 (define-public emacs-all-the-icons
  ;; The latest release was on 3 June 2021.
  (let ((commit "4778632b29c8c8d2b7cd9ce69535d0be01d846f9")
@@ -460,6 +460,13 @@ It aims to support Nintendo DSi and 3DS as well.")
                    (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))))
+
              ;; Clean up the source from bundled libraries we don't need.
              (delete-all-but "Externals"
                              ;; XXX: The build system is currently hard-coded
@@ -649,6 +656,14 @@ turbo speed, networked multiplayer, and graphical enhancements.")
                    (srfi srfi-26)))
         (snippet
          #~(begin
+              ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+              (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))))
+
              ;; Clean up the source from bundled libraries we don't need.
              (delete-all-but "Externals"
                              ;; XXX: The build system is currently hard-coded
@@ -1064,9 +1079,17 @@ The following systems are supported:
         (sha256
          (base32
           "0dfsz4dsh49dc9xx9rjhfzfkg4h91i2ksgp2inlr9yhgldw9q8h3"))
-         (modules '((guix build utils)))
+         (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 "src/third-party"
                              "blip_buf"
                              "inih")))))
@@ -2296,9 +2319,42 @@ physical device and the RetroPad virtual controller.")
         (modules '((guix build utils)))
         (snippet
          '(begin
+             (use-modules (guix build utils)
+                          (ice-9 ftw)
+                          (srfi srfi-1)
+                          (srfi srfi-26))
+             (define (delete-all-but . preserve)
+               ;; Walk the file tree and delete everything except the paths
+               ;; listed in PRESERVE.  Directories listed PRESERVE will cause
+               ;; their whole contents to be preserved.
+               (let ((preserve (map (compose (cut string-trim-right <> #\/)
+                                             (cut string-append "./" <>))
+                                    preserve)))
+                 (file-system-fold
+                  (lambda (path stat result) ;enter
+                    (or (any (lambda (x)
+                               (or (string-prefix? path x)
+                                   (string-prefix? x path)))
+                             preserve)
+                        (begin
+                          (delete-file-recursively path)
+                          #f)))
+                  (lambda (path stat result) ;leaf (file)
+                    (unless (any (cut string-prefix? <> path) preserve)
+                      (delete-file path)))
+                  (const #t)                 ;down (directory)
+                  (const #t)                 ;up (directory)
+                  (lambda (path stat result) ;skip
+                    (when (file-exists? path)
+                      (error "could not enter unreadable directory" path)))
+                  (lambda (path stat errno result) ;error
+                    (error "error processing" path (strerror errno)))
+                  0
+                  ".")))
+
             ;; This is an allow-list of the shaders explicitly licensed as
             ;; free software.
-             (delete-all-but "."
+             (delete-all-but
              "anamorphic/shaders/anamorphic.slang" ;expat
              "anamorphic/anamorphic.slangp"
              "annotated_passthru.slang" ;public license
@@ -2955,7 +3011,16 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
             (commit (string-append "v" version))))
       (snippet
        #~(begin
-            (use-modules (guix build utils))
+            (use-modules (guix build utils)
+                         (ice-9 ftw)
+                         (srfi srfi-26))
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            (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))))
            ;; Remove as much bundled sources as possible, shaving off about
            ;; 65 MiB.
            (delete-all-but "deps"
@@ -3762,14 +3827,24 @@ de-interlacing patches for use with PCSX2.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0nr53cjifqwnz3icxsj01yd3aw1vfsfxga4zz5zi8aqr175mvq27"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
        #~(begin
            (substitute* "cmake/Pcsx2Utils.cmake"
              (("(PCSX2_GIT_REV \")Unknown" _ prefix)
               (string-append prefix #$version "-guix")))
            (delete-file "3rdparty/include/Packet32.h") ;"not open source"
-            (delete-all-but "3rdparty"
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            (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
+             "3rdparty"
             ;; asl2.0 and cc0
             "glad"                     ;Is tailored.
             ;; bsd-3
@@ -2730,7 +2730,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
 (define-public freecad
  (package
    (name "freecad")
-    (version "1.1.0")
+    (version "1.1.1")
    (source
     (origin
       (method git-fetch)
@@ -2740,7 +2740,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
             (recursive? #t)))          ;needed for the AddonManager
       (file-name (git-file-name name version))
       (sha256
-        (base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
+        (base32 "05dx7ifx33705mxb0vc82j0mzzkazakgadfgq5bws30qrxp49xgg"))
       (snippet
        #~(begin
            (use-modules (guix build utils))
@@ -148,6 +148,11 @@ client.")
     (list (search-path-specification
            (variable "FCITX_ADDON_DIRS")
            (files '("lib/fcitx5")))
+           (search-path-specification
+            (variable "GUIX_GTK2_IM_MODULE_FILE")
+            (file-type 'regular)
+            (separator #f)
+            (files '("lib/gtk-2.0/2.10.0/immodules-gtk2.cache")))
           (search-path-specification
            (variable "GUIX_GTK3_IM_MODULE_FILE")
            (file-type 'regular)
@@ -792,16 +792,16 @@ the freedesktop.org XDG Base Directory specification.")
 (define-public elogind
  (package
    (name "elogind")
-    (version "255.22")
+    (version "255.17")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/elogind/elogind")
-                    (commit (string-append "V" version))))
+                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0hnzks8f0jl2hkf954pqky5490zacqaipz20k38qvzl5g8i1if5l"))))
+                "0cb6p559281dzh24is91v6d4v4kz45yhyizibi4sfql9nign865h"))))
    (build-system meson-build-system)
    (arguments
     `(#:configure-flags
@@ -1182,9 +1182,17 @@ It is capable of creating games for SCUMM version 6 and partially version 7.")
       (sha256
        (base32
         "12f1d45995qf5sazjmmfdydllcd6alhqs1s4xwv3jiq1fw66hcy9"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
        '(begin
+           ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+           (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 "extlibs/headers"
                           "glad")))))  ;pre-generated headers
    (build-system cmake-build-system)
@@ -13508,8 +13508,8 @@ rules to solve permissions issues.")

 (define-public steam-devices-udev-rules
  ;; Last release from 2019-04-10
-  (let ((commit "13443480a64fe8f10676606bd57da6de89f8ccb1")
-        (revision "1"))
+  (let ((commit "7dde9ecb3c386363ecd9bd0a3b77e4756d200704")
+        (revision "2"))
    (package
      (name "steam-devices-udev-rules")
      (version (git-version "1.0.0.61" revision commit))
@@ -13521,7 +13521,7 @@ rules to solve permissions issues.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "0i086gmnk93q76sw1laa9br6b7zj2r6nrrw7d64y4q9wcrlxw2bi"))))
+                  "0w0xkgi9fpvdbpl57f8fy2nwy2icm6iag39b8ifpkijlxgclx1p3"))))
      (build-system copy-build-system)
      (arguments
       '(#:install-plan '(("./" "lib/udev/rules.d"
@@ -425,14 +425,29 @@ hierarchical hexagonal geospatial indexing system")
               (base32
                "00qdk9a4048pzfj2rhzkfw3lvm642znf6kr4x29i3d94494pxsnn"))))
    (build-system cmake-build-system)
-    (arguments `(#:phases
-                 (modify-phases %standard-phases
-                   (add-after
-                    'unpack 'patch-test-shebangs
-                    (lambda _
-                      (substitute* '("tests/xmltester/testrunner.sh"
-                                     "tests/xmltester/safe_to_xml.sh")
-                        (("/bin/sh") (which "sh"))))))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ,@(if (or (target-x86-32?) (target-arm32?))
+               '((add-after 'unpack 'disable-broken-tests
+                   (lambda _
+                     ;; This test fails due to limited accuracy.
+                     (delete-file "tests/xmltester/tests/general/TestCentroid.xml")
+                     (with-directory-excursion "tests/unit"
+                       ;; These also fail due to limited accuracy.
+                       (delete-file "algorithm/MinimumAreaRectangleTest.cpp")
+                       (delete-file "capi/GEOSMinimumRotatedRectangleTest.cpp")
+                       ;; It is unclear why these fail, but I'm guessing:
+                       ;; limited accuracy.
+                       (delete-file "linearref/LengthIndexedLineTest.cpp")
+                       (delete-file "math/DDTest.cpp")))))
+               '())
+         (add-after
+             'unpack 'patch-test-shebangs
+           (lambda _
+             (substitute* '("tests/xmltester/testrunner.sh"
+                            "tests/xmltester/safe_to_xml.sh")
+               (("/bin/sh") (which "sh"))))))))
    (inputs
     (list glib))
    (home-page "https://libgeos.org/")
@@ -955,6 +970,29 @@ hydrology and waste deposition.")
        (base32
         "03r6mspfv22fs4x4jcgv25v9gsj5k6zy8incvyf94qf50g47s2bc"))))
    (build-system cmake-build-system)
+    (arguments
+     (if (target-32bit?)
+         (list
+          #:phases
+          '(modify-phases %standard-phases
+             (add-after 'unpack 'patch-tests
+               (lambda _
+                 ;; These regression tests fail due to accuracy problems.
+                 (substitute* "test/unit/test_factory.cpp"
+                   (("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 (substitute* "test/unit/test_grids.cpp"
+                   (("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 (substitute* "test/unit/test_defmodel.cpp"
+                   (("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 ;; These regression tests fail due to accuracy problems.
+                 (substitute* "test/CMakeLists.txt"
+                   (("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
+                   (("proj_add_gie_test\\(\"Builtins\".+") "")
+                   (("proj_add_gie_test\\(\"peirce_q\".+") ""))))))
+         '()))
    (native-inputs (list googletest pkg-config))
    (propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc
    (home-page "https://proj.org/")
@@ -984,7 +1022,34 @@ lets developers use the functionality of Proj in their own software.")
                           version ".tar.gz"))
       (sha256
        (base32
-         "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))))
+         "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))
+    (arguments
+     (if (target-32bit?)
+         (list
+          #:phases
+          '(modify-phases %standard-phases
+             (add-after 'unpack 'patch-tests
+               (lambda _
+                 ;; These regression tests fail due to accuracy problems.
+                 (substitute* "test/unit/test_factory.cpp"
+                   (("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 (substitute* "test/unit/test_grids.cpp"
+                   (("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 (substitute* "test/unit/test_defmodel.cpp"
+                   (("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
+                    (string-append m "\nGTEST_SKIP();\n")))
+                 ;; These regression tests fail due to accuracy problems.
+                 (substitute* "test/CMakeLists.txt"
+                   (("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
+                   (("proj_add_gie_test\\(\"Builtins\".+") "")
+                   (("proj_add_gie_test\\(\"peirce_q\".+") "")
+                   (("proj_add_gie_test\\(\"adams_ws2\".+") ""))
+                 (substitute* "test/cli/CMakeLists.txt"
+                   (("proj_add_test_script_sh\\(\"testvarious\" CS2CS_BIN\\)") ""))))))
+         '()))))
+

 (define-public python-obspy
  (package
@@ -2598,6 +2598,92 @@ of Evince is to replace the multiple document viewers that exist
 on the GNOME Desktop with a single simple application.")
    (license license:gpl2+)))

+(define-public papers
+  (package
+    (name "papers")
+    (version "50.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/papers/"
+                                  (version-major version) "/"
+                                  "papers-" version ".tar.xz"))
+              (sha256
+               (base32 "01dws72fb19i9jwp3r0khr7ym2ns51fifdzafb5dcr5w8vmj06rh"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:glib-or-gtk? #t
+      #:configure-flags
+      #~(list (string-append "-Dc_link_args=-Wl,-rpath=" #$output "/lib"))
+      #:imported-modules `(,@%meson-build-system-modules
+                           ,@%cargo-build-system-modules)
+      #:modules `(((guix build cargo-build-system) #:prefix cargo:)
+                  (guix build meson-build-system)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'prepare-for-build
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false")
+                (("update_desktop_database: true")
+                 "update_desktop_database: false"))
+              (substitute* "meson.build"
+                (("'Cargo.lock',")
+                  ""))
+              (delete-file "Cargo.lock")))
+          (add-after 'configure 'prepare-cargo-build-system
+            (lambda args
+              (for-each
+               (lambda (phase)
+                 (format #t "Running cargo phase: ~a~%" phase)
+                 (apply (assoc-ref cargo:%standard-phases phase)
+                        #:vendor-dir "vendor"
+                        #:cargo-target #$(cargo-triplet)
+                        args))
+               '(unpack-rust-crates
+                 configure
+                 check-for-pregenerated-files
+                 patch-cargo-checksums))
+
+              (setenv "RUSTFLAGS"
+                      (string-append (or (getenv "RUSTFLAGS") "")
+                                     " -C link-arg=-Wl,-rpath,"
+                                     #$output "/lib")))))))
+    (native-inputs
+     (cons* blueprint-compiler
+            gettext-minimal
+            `(,glib "bin")
+            gobject-introspection
+            gi-docgen
+            itstool
+            pkg-config
+            rust
+            `(,rust "cargo")
+            (or (and=> (%current-target-system)
+                       (compose list make-rust-sysroot))
+                '())))
+    (inputs
+     (cons* appstream
+            djvulibre
+            exempi
+            gtk
+            libadwaita
+            libarchive
+            libspelling
+            libtiff
+            nautilus                    ; for nautilus extension
+            poppler-next
+            zlib
+            (cargo-inputs 'papers)))
+    (home-page "https://apps.gnome.org/Papers")
+    ;; TODO: drop “new” when updating to GNOME 49 or newer.
+    (synopsis "GNOME's new document viewer")
+    (description "Papers is a document viewer capable of displaying multiple
+and single page document formats like PDF and DejaVu.")
+    (license license:gpl2+)))
+
 (define-public gsettings-desktop-schemas
  (package
    (name "gsettings-desktop-schemas")
@@ -48,6 +48,34 @@
  #:use-module (gnu packages xml)
  #:use-module (ice-9 match))

+(define-public fsviewer
+  (package
+    (name "fsviewer")
+    (version "0.2.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/roblillack/fsviewer")
+              (commit (string-append "v" version))))
+       (sha256
+        (base32
+         "067fvbq7b4lbnn1flmwf8lm0vq4n6qz5yz6hhab30l4gksfk51cg"))
+       (file-name (git-file-name name version))))
+    (build-system cmake-build-system)
+    (arguments (list #:tests? #f))      ;no tests
+    (inputs
+     (list windowmaker libxmu libxpm))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://github.com/roblillack/fsviewer")
+    (synopsis "File viewer for Window Maker")
+    (description "FSViewer is a NeXT FileViewer lookalike for Window
+Maker supporting browser mode and list mode.  This version is a fork of
+FSViewer.app originally written by George Clernon (1998-99) and later
+maintained by Guido Scholz (2002-07).")
+    (license license:gpl2)))
+
 (define-public gnustep-make
  (package
    (name "gnustep-make")
@@ -1249,13 +1249,13 @@ testing.")
       (cpe-name . "firefox_esr")
       (cpe-version . ,(first (string-split version #\-)))))))

-(define %icedove-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-build-id "20260403000000") ;must be of the form YYYYMMDDhhmmss
 ;;; See <https://product-details.mozilla.org/1.0/thunderbird_versions.json>
 ;;; for the source of truth regarding Thunderbird releases.
 ;;; Please keep these version numbers in sync with icecat.
 ;;; Please also update thunderbird-comm-source and thunderbird-comm-l10n to
 ;;; the icedove version.
-(define %icedove-version "140.9.0")
+(define %icedove-version "140.9.1")

 ;; Provides the "comm" folder which is inserted into the icecat source.
 ;; Avoids the duplication of Icecat's source tarball.  Pick the changeset that
@@ -1267,11 +1267,11 @@ testing.")
    (method hg-fetch)
    (uri (hg-reference
          (url "https://hg.mozilla.org/releases/comm-esr140")
-          (changeset "8be9f2d3072c225a1e5f153745a18984c2babf8f")))
+          (changeset "427d792f23672fc4adbe9436ce7dddbb2bfb287a")))
    (file-name (string-append "thunderbird-" %icedove-version "-checkout"))
    (sha256
     (base32
-      "04j35957x03m5x7mhh8zxa86mwjy0is2vb614sr4inkvvz4rs2hg"))
+      "09fj375a0zb5kgvw94f13997zhcj67a4g5ylpdbjzfql0chh572p"))
    (patches (search-patches "icedove-observer-fix.patch"))))

 ;;; To regenerate, see the `format-locales' helper defined above.
@@ -192,9 +192,17 @@ definitions in Go programs.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0c1rxbj3v3m0fqb8q96xlbawxm9scyx6vvr8pddkiwp7zkx4ajym"))
-       (modules '((guix build utils)))
+       (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 "cmd" "godoc")
            (delete-all-but "." "cmd")))))
    (build-system go-build-system)
@@ -1535,9 +1535,17 @@ Go programming language.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0sjvngpahkb5x573i855fjlb1fdmr6n269nmb5xxnbabjb27mnvg"))
-       (modules '((guix build utils)))
+       (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 "go" "expect")
            (delete-all-but "." "go")))))
    (build-system go-build-system)
@@ -1567,9 +1575,17 @@ Go source code (including go.mod and go.work files) as test expectations.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0sjvngpahkb5x573i855fjlb1fdmr6n269nmb5xxnbabjb27mnvg"))
-       (modules '((guix build utils)))
+       (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 "go" "packages")
            (delete-all-but "go/packages" "packagestest")
            (delete-all-but "." "go")))))
@@ -1602,9 +1618,18 @@ tools on.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "1blk22apy424j9v58lfy4pxnrgh93yqchqhxsnf78dmx4vx5yi9r"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
-        #~(begin (delete-all-but "." "godoc")))))
+        #~(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 "." "godoc")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -1237,8 +1237,26 @@ may be interactive or produce standard formats such as SVG or PDF.")
         (file-name (git-file-name name version))
         (sha256
          (base32 "1np11if704xzyhsx9mqhz7djx23g6wnz62r1v9ra6xaz91yfic0n"))
-         (modules '((guix build utils)))
-         (snippet #~(delete-all-but "." "generate"))))
+         (modules '((guix build utils)
+                    (ice-9 ftw)
+                    (srfi srfi-26)))
+         (snippet
+          #~(begin
+              ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+              (define (delete-all-but directory . preserve)
+                (define (directory? x)
+                  (and=> (stat x #f)
+                         (compose (cut eq? 'directory <>) stat:type)))
+                (with-directory-excursion directory
+                  (let* ((pred
+                          (negate (cut member <> (append '("." "..") preserve))))
+                         (items (scandir "." pred)))
+                    (for-each (lambda (item)
+                                (if (directory? item)
+                                    (delete-file-recursively item)
+                                    (delete-file item)))
+                              items))))
+              (delete-all-but "." "generate")))))
      (build-system go-build-system)
      (arguments
       (list
@@ -4799,9 +4817,18 @@ and multi-selects with a focus on user experience and aesthetics.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "083zj3yqb48li8w389iabi1b1zklbw7cwam2grvvglcqrrsj3bsf"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
-        #~(begin (delete-all-but "." "ansi")))))
+        #~(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 "." "ansi")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -4838,7 +4865,14 @@ ECMA-48} specs.")
                  (ice-9 ftw)
                  (srfi srfi-26)))
       (snippet
-        #~(begin (delete-all-but "." "cellbuf")))))
+        #~(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 "." "cellbuf")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -4896,8 +4930,18 @@ ECMA-48} specs.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "088786ak8jsgvssbb5y16z066vfq9f6078sjc7iv766knfr2i0x2"))
-       (modules '((guix build utils)))
-       (snippet #~(delete-all-but "." "errors"))))
+       (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 "." "errors")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -5049,9 +5093,18 @@ package provides an API for comparing Golden files.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "1shw55110fnn4xz80wmgr18czmiil6z1j064m90iw8c7j9llfzn5"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
-        #~(begin (delete-all-but "." "term")))))
+        #~(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 "." "term")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -5139,8 +5192,21 @@ package provides an API for comparing Golden files.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0blpb8vpl7sc6pb43h0730wdcwrkvnhly6qhik6wljrzn2nqz5g2"))
-       (modules '((guix build utils)))
-       (snippet #~(delete-all-but "." "xpty"))))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet
+        #~(begin
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            ;; Consider implementing it as a reusable procedure in
+            ;; guix/build/utils or guix/build-system/go.
+            (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 "." "xpty")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -6178,8 +6244,21 @@ packages.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0afaljkkd388f6igr3f2vjnd14yr8h20fcfzglw8j5q1q7a1cvik"))
-       (modules '((guix build utils)))
-       (snippet #~(delete-all-but "." "pkg"))))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet
+        #~(begin
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            ;; Consider implementing it as a reusable procedure in
+            ;; guix/build/utils or guix/build-system/go.
+            (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")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -15101,9 +15180,18 @@ Twisted's manhole library} .")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0xj782ghf0iv8r2xxmg2vrh72b02h216y4yfyi60y9z0691lrsip"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
-        #~(begin (delete-all-but "." "tools")))))
+        #~(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 "." "tools")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -18707,9 +18795,18 @@ publish–subscribe pattern}.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0an8ypp8v9gfxbbb71mpimb1g9labl4v7lgazcphysn6c5smgmiw"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
-        #~(begin (delete-all-but "." "atomicwriter")))))
+        #~(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 "." "atomicwriter")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -18764,9 +18861,18 @@ https://github.com/syndtr/gocapability.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "1nh1disclgydvq7k10awzks6k8kw9cjj3q19f83ksi4b76p5l475"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
-        #~(begin (delete-all-but "." "mount")))))
+        #~(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 "." "mount")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -29509,8 +29615,21 @@ when they'd prefer a more familiar, loosely typed API.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "05i15278swdmpif3p6g18sy0sn7rnfdl3m2rj5p30cnyb0j29vig"))
-       (modules '((guix build utils)))
-       (snippet #~(delete-all-but "." "exp"))))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet
+        #~(begin
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            ;; Consider implementing it as a reusable procedure in
+            ;; guix/build/utils or guix/build-system/go.
+            (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 "." "exp")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -30909,9 +31028,18 @@ code.")
    (name "go-modernc-org-ccgo-v4")
    (source (origin
              (inherit (package-source go-modernc-org-ccgo-v3))
-              (modules '((guix build utils)))
+              (modules '((guix build utils)
+                         (ice-9 ftw)
+                         (srfi srfi-26)))
              (snippet
-               #~(begin (delete-all-but "." "v4")))))
+               #~(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 "." "v4")))))
    (arguments
     (substitute-keyword-arguments
         (package-arguments go-modernc-org-ccgo-v3)
@@ -31867,9 +31995,20 @@ unmarshaling functions based on @code{encoding/json} @code{Unmarshal()}.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "12n8ij4gisah5mvxcgq263iic61gjpxdj3ml03826zckzn7wlv46"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
        #~(begin
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            ;; Consider implementing it as a reusable procedure in
+            ;; guix/build/utils or guix/build-system/go.
+            (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 "." "cmd")
            (delete-all-but "cmd" "config")))))
    (build-system go-build-system)
@@ -47,13 +47,13 @@
 (define-public groff
  (package
   (name "groff")
-   (version "1.24.0")
+   (version "1.22.4")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/groff/groff-" version
                                ".tar.gz"))
            (sha256 (base32
-                     "0w3mf9jb5j1gbw1160lr5498q4ayl5i3jpf5g8721l1yzzcbr6z7"))))
+                     "14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7"))))
   (build-system gnu-build-system)
   (outputs '("out"
              "doc"))                    ;12MiB of PS, PDF, HTML, and examples
@@ -5790,7 +5790,7 @@ processing filters.")
 (define-public guile-pnm
  (package
    (name "guile-pnm")
-    (version "0.1.0")
+    (version "0.2.0")
    (source
     (origin
       (method git-fetch)
@@ -5799,7 +5799,7 @@ processing filters.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1yvsni4hll20g99zq4wl734f9i8gpjr1sqsnk3a93k2dd7b6ymac"))))
+        (base32 "06kgp1gh8hdj1j6w7i981prx93wfjpayrnjlydlzs7l5j04l4m3a"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -601,16 +601,24 @@ different data arrays similar to those available in the numdiff software.")
              (file-name (git-file-name name version))
              (snippet
               #~(begin
-                   (use-modules (guix build utils))
+                   (use-modules (guix build utils)
+                                (ice-9 ftw)
+                                (srfi srfi-26))
                   ;; Delete any bundled .jar files.
                   (for-each delete-file (find-files "." "\\.jar$"))
+                   (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 "3rdparty"
-                     "fastcv"           ;TODO: Unbundle these
-                     "libspng"
-                     "libtim-vx"
-                     "orbbecsdk"
-                     "quirc"
-                     "zlib-ng")))
+                                   "fastcv"     ;TODO: Unbundle these
+                                   "libspng"
+                                   "libtim-vx"
+                                   "orbbecsdk"
+                                   "quirc"
+                                   "zlib-ng")))
              (sha256
               (base32
                "15w4fqjqv5k1yw70jbjsnlgiky39mqpy05rvmm2fbyjrif4kbgkl"))))
@@ -1362,9 +1362,21 @@ code prior to it getting merged into @code{go-cid}.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "00lwizzdfdx6kynxddal3all6q9dhwqanpkw0d0vxlwik4nkvxa5"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
-        #~(begin (delete-all-but "." "ipfs")))))
+        #~(begin
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            ;; Consider to implement it as re-usable procedure in
+            ;; guix/build/utils or guix/build-system/go.
+            (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 "." "ipfs")))))
    (build-system go-build-system)
    (arguments
     (list
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2014-2019, 2021, 2026 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021, 2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017, 2022 Marius Bakke <marius@gnu.org>
@@ -226,6 +226,18 @@ JNI.")
             (setenv "JAVACMD" (search-input-file inputs "/bin/jamvm"))
             (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
             (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
+         ,@(if (target-x86-32?)
+               ;; XXX: On i686 isFile() always seems to return true.  Patching
+               ;; this here is very ugly, but the effects are limited.  None
+               ;; of these changes remain by the time we've built Icedtea and
+               ;; the other JDKs.
+               '((add-after 'unpack 'disable-isFile-checks
+                   (lambda _
+                     (substitute* "src/main/org/apache/tools/ant/util/ResourceUtils.java"
+                       (("destFile = \\(\\(FileProvider\\).*") ""))
+                     (substitute* "src/main/org/apache/tools/ant/taskdefs/Mkdir.java"
+                       (("dir.isFile\\(\\)") "false")))))
+               '())
         (replace 'build
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; Ant complains if this file doesn't exist.
@@ -36,7 +36,7 @@
 (define-public jemalloc
  (package
    (name "jemalloc")
-    (version "5.3.1")
+    (version "5.3.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -44,7 +44,7 @@
                    version "/jemalloc-" version ".tar.bz2"))
              (sha256
               (base32
-                "14kgf0hs864hp5xxqfqh37l1d8wwg57h7wv28rffs8ig4f0bq9iq"))))
+                "1apyxjd1ixy4g8xkr61p0ny8jiz8vyv1j0k4nxqkxpqrf4g2vf1d"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -33,6 +33,7 @@
  #:use-module (gnu packages libusb)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
  #:use-module (gnu packages swig)
  #:use-module (gnu packages textutils))

@@ -95,7 +96,7 @@
                                                 "/html"))))))
      #:tests? #f))                     ; tests fail without access to USB
    (native-inputs
-     (list doxygen graphviz pkg-config python swig-4.0))
+     (list doxygen graphviz pkg-config python python-setuptools swig))
    (inputs
     (list boost libconfuse))
    (propagated-inputs
@@ -87,7 +87,6 @@
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2025 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
-;;; Copyright © 2025 Dariqq <dariqq@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3203,45 +3202,57 @@ accepted as a quirk (ie AMD Vega 10).")
 (define-public linux-pam
  (package
    (name "linux-pam")
-    (version "1.7.2")
+    (version "1.5.2")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/linux-pam/linux-pam")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/linux-pam/linux-pam/releases/download/v"
+             version "/Linux-PAM-" version ".tar.xz"))
       (sha256
        (base32
-         "1z5apric696zsci28c7651spvdll0zrpfm9z574gcjf45mp22gmi"))
+         "0kgrsj2scv5mx6w925h9hxf11jnqqs9z8s22aw94b90xm4qp3v74"))
       (patches (search-patches "linux-pam-unix_chkpwd.patch"
                                "linux-pam-no-setfsuid.patch"))))
-    (build-system meson-build-system)
-    (outputs '("out" "doc")) ;; 0.8 MiB of html
+
+    (build-system gnu-build-system)
    (inputs (list libxcrypt))
    (native-inputs
-     (list gettext-minimal
-           flex bison
-           ;; manpages
-           libxslt
-           libxml2
-           docbook-xml
-           docbook-xsl))
+     (list flex
+           ;; TODO: optional dependencies
+           ;; ("cracklib" ,cracklib)
+           ))
    (arguments
     (list
-      #:configure-flags
-      #~(list
-         ;; lastlog is deprecated since 1.5.3
-         "-Dpam_lastlog=enabled"
-         (string-append "-Dvendordir=" #$output "/share/pam")
-         (string-append "-Ddocbook-rng="
-                        #$(let ((docbook-xml (this-package-native-input
-                                              "docbook-xml")))
-                            (file-append docbook-xml
-                                         "/xml/docbook/"
-                                         (package-version docbook-xml)
-                                         "/rng/docbookxi.rng")))
-         (string-append "-Dhtmldir=" #$output:doc "/share/doc/" #$name "/html"))
+      ;; Most users, such as `shadow', expect the headers to be under
+      ;; `security'.
+      #:configure-flags #~(list (string-append "--includedir="
+                                               (assoc-ref %outputs "out")
+                                               "/include/security")
+                                ;; explicit libdir for pkgconfig files
+                                ;; drop with 1.5.3, which fixes
+                                ;; https://github.com/linux-pam/linux-pam/issues/466
+                                (string-append "--libdir="
+                                               (assoc-ref %outputs "out")
+                                               "/lib")
+
+                                ;; XXX: <rpc/rpc.h> is missing from glibc when
+                                ;; cross-compiling, so we have to disable NIS
+                                ;; support altogether.
+                                #$@(if (%current-target-system)
+                                       #~("--disable-nis")
+                                       #~()))
+
+      #:phases (if (target-hurd?)
+                   #~(modify-phases %standard-phases
+                       (add-after 'unpack 'skip-pam-limits
+                         (lambda _
+                           ;; 'pam_limits.c' uses <sys/prctl.h>, which is
+                           ;; Linux-specific.  Skip it on GNU/Hurd.
+                           (substitute* "modules/Makefile.in"
+                             (("pam_limits") "")))))
+                   #~%standard-phases)
+
      ;; XXX: Tests won't run in chroot, presumably because /etc/pam.d
      ;; isn't available.
      #:tests? #f))
@@ -4903,7 +4914,7 @@ transparently through a bridge.")
 (define-public libnl
  (package
    (name "libnl")
-    (version "3.7.0")
+    (version "3.12.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -4912,7 +4923,7 @@ transparently through a bridge.")
                    "/libnl-" version ".tar.gz"))
              (sha256
               (base32
-                "0faryrbvp0x4s2zhg5d78vd5q4w34lrr736gpm9wcwpaxv5krr4z"))))
+                "066xq01y2mx0xi7bwa5y6ciw1ygla15qdlzzyvyzb8zijrqwllgw"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("bison" ,bison)
@@ -4927,7 +4938,7 @@ transparently through a bridge.")
                 (string-join (string-split version #\.) "_")
                 "/libnl-doc-" version ".tar.gz"))
           (sha256
-            (base32 "1ra8xdf06q9hlsrnc1yz67xkp4kd9sd27ff02mlixixnyyjp32sp"))))))
+            (base32 "18f14pdycghy6fcd27faqgh19zpam6b45s8bgsk85kb9wwzq3yd4"))))))
    (outputs `("out" "doc"))
    (arguments
     `(#:phases
@@ -780,10 +780,20 @@ operating systems.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "1sg6ifabci7xyp3zds1w906vx6jsmyjlfr6bqld7m7hj07by9ndd"))
-       (modules '((guix build utils)))
-       (snippet #~(delete-all-but "autosetup"
-                    "mutt-gettext.tcl"
-                    "mutt-iconv.tcl"))))
+       (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 "autosetup"
+              "mutt-gettext.tcl"
+              "mutt-iconv.tcl")))))
    (build-system gnu-build-system)
    (inputs
     (list cyrus-sasl
@@ -2475,6 +2475,9 @@ similar to MATLAB, GNU Octave or SciPy.")
                   ;; "--enable-doxygen"
                   "--enable-dot"
                   "--enable-netcdf-4"
+                   #$@(if (or (target-x86-32?) (target-arm32?))
+                          '("CFLAGS=-Wno-error=incompatible-pointer-types")
+                          '())
                   (string-append "--with-plugin-dir=" #$output "/lib/hdf5-plugins"))
           #:phases
           #~(modify-phases %standard-phases
@@ -2486,7 +2489,15 @@ similar to MATLAB, GNU Octave or SciPy.")
                     (("testurl.sh") ""))
                   (substitute* "nczarr_test/Makefile.in"
                     (("/bin/bash")
-                      (search-input-file inputs "bin/bash")))))
+                      (search-input-file inputs "bin/bash")))
+                   ;; This test fails on 32 bit platforms.
+                   #$@(if (or (target-x86-32?) (target-arm32?))
+                          '((substitute* '("ncdump/tst_netcdf4_4.sh"
+                                           "ncdump/tst_nccopy4.sh")
+                              (("#!/bin/sh" m) (string-append m "\nexit 0\n")))
+                            (substitute* "ncdump/Makefile.in"
+                              (("tst_netcdf4_4.log") "")))
+                          '())))
               (add-before 'configure 'fix-source-date
                 (lambda _
                   ;; As we ${SOURCE_DATE_EPOCH} evaluates to "1" in the build
@@ -428,9 +428,18 @@ software vendors, application developers and computer science researchers.")
       (uri (string-append "https://www.open-mpi.org/software/ompi/v"
                           (version-major+minor version)
                           "/downloads/openmpi-" version ".tar.bz2"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
        '(begin
+           ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+           (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 as many bundled libraries as permitted by the build
           ;; system.
           (delete-all-but "3rd-party" "treematch" "Makefile.in" "Makefile.am")
@@ -165,7 +165,11 @@ from the protocol files.")
    (arguments
     `(#:configure-flags '("--disable-static")))
    (native-inputs
-     (list autoconf automake gettext-minimal libtool pkg-config))
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gettext-minimal)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)))
    (inputs
     (list libtirpc))
    (synopsis "Public client interface for NIS(YP) and NIS+")
@@ -0,0 +1,43 @@
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -265,15 +265,11 @@
+ amal.flags     = -nc
+ amal.run       = TOPDIR="$(DIR.top)" $(SHELL.bash) $(bin.make-amal) --quiet
+ 
+ libfossil.c: $(amal.deps)
+ 	$(amal.run) $(amal.flags)
+-libfossil.h: libfossil.c
+-all: libfossil.c
+ @if ENABLE_CXX
+-libfossil.hpp: libfossil.c
+-libfossil.c++: libfossil.c
+ amal.flags += -c++
+ @endif
+ 
+ .PHONY: amal
+ amal: libfossil.c
+@@ -287,19 +283,16 @@
+ 	fossil uv sync
+ @endif
+ @endif
+ 
+ install: install-headers
+-install-headers: libfossil.h $(install-dir.include)
+-	$(INSTALL.noexec) libfossil.h $(install-dir.include)
+install-headers: include/libfossil.h $(install-dir.include)
+	$(INSTALL.noexec) $< $(install-dir.include)
+ @if ENABLE_CXX
+-libfossil++.hpp: libfossil.h
+-libfossil++.cpp: libfossil++.hpp
+-all: libfossil++.cpp
+ install-headers: install-headers++
+-install-headers++: libfossil++.hpp $(install-dir.include)
+-	$(INSTALL.noexec) libfossil++.hpp $(install-dir.include)
+install-headers++: include/libfossil.hpp $(install-dir.include)
+	$(INSTALL.noexec) $< $(install-dir.include)
+ @endif # ENABLE_CXX
+ clean: clean-amalgamation
+ clean-amalgamation:
+ 	rm -f libfossil.c libfossil.h libfossil++.cpp libfossil++.hpp
+ 	rm -f libfossil-config.h libfossil-amalgamation.zip VERSION.h
+
@@ -2,14 +2,8 @@ unix_chkpwd is designed to have a suid bit, but it's not possible to set it
 for files in the store.  This patch tells unix_pam.so to look for
 unix_chkpwd in setuid program directory on Guix System.

--- a/modules/module-meson.build
-+++ b/modules/module-meson.build
-@@ -114,7 +114,7 @@ if module == 'pam_unix'
-   if enable_nis
-     pam_module_src += ['yppasswd_xdr.c']
-   endif
-  pam_module_c_args += ['-DCHKPWD_HELPER="@0@"'.format(sbindir / 'unix_chkpwd'),
-+  pam_module_c_args += ['-DCHKPWD_HELPER="@0@"'.format('/run/privileged/bin' / 'unix_chkpwd'),
-                         '-DUPDATE_HELPER="@0@"'.format(sbindir / 'unix_update')]
-   pam_module_deps += [libcrypt, libselinux, libtirpc, libnsl]
- endif
+--- a/modules/pam_unix/Makefile.in
+++ b/modules/pam_unix/Makefile.in
+@@ -651,1 +651,1 @@
+-	-DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \
+	-DCHKPWD_HELPER=\"/run/setuid-programs/unix_chkpwd\" \
@@ -0,0 +1,29 @@
+Fix test_command_error for neovim 0.12.x.
+
+In neovim 0.12.0, the error message for an invalid cursor position changed from
+"Cursor position outside buffer" to "Invalid cursor line: out of range".  Update
+the test to accept both messages.
+
+Taken from upstream commit d89b62ed622976c8d6dbc7733a99dac371b01cbf.
+
+diff --git a/test/test_vim.py b/test/test_vim.py
+index 8a76f5e..26e2fce 100644
+--- a/test/test_vim.py
+++ b/test/test_vim.py
+@@ -1,6 +1,7 @@
+ """Tests interaction with neovim via Nvim API (with child process)."""
+ 
+ import os
+import re
+ import sys
+ import tempfile
+ from pathlib import Path
+@@ -50,7 +51,7 @@ def test_command_output(vim: Nvim) -> None:
+ def test_command_error(vim: Nvim) -> None:
+     with pytest.raises(vim.error) as excinfo:
+         vim.current.window.cursor = -1, -1
+-    assert excinfo.value.args == ('Cursor position outside buffer',)
+    assert re.search(r"Cursor position outside buffer|Invalid cursor line", excinfo.value.args[0])
+ 
+ 
+ def test_eval(vim: Nvim) -> None:
@@ -0,0 +1,299 @@
+From 7a372a6914e9d9d6f0c914a1ca8cdff592c40593 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Thu, 12 Mar 2026 11:57:11 +1000
+Subject: [PATCH] Update compiler patch for M147 beta
+
+Signed-off-by: Matt Jolly <kangie@gentoo.org>
+--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
+@@ -367,9 +367,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":rustc_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+     ":compiler_deterministic",
+     ":clang_warning_suppression",
+@@ -1690,43 +1687,6 @@ config("compiler_deterministic") {
+     }
+   }
+ 
+-  # Makes builds independent of absolute file path.
+-  if (is_clang && strip_absolute_paths_from_debug_symbols) {
+-    # If debug option is given, clang includes $cwd in debug info by default.
+-    # For such build, this flag generates reproducible obj files even we use
+-    # different build directory like "out/feature_a" and "out/feature_b" if
+-    # we build same files with same compile flag.
+-    # Other paths are already given in relative, no need to normalize them.
+-
+-    # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-    # and -fcoverage-compilation-dir=.
+-    cflags += [ "-ffile-compilation-dir=." ]
+-
+-    # Convert absolute paths to relative paths. Expands to, for example:
+-    #   -file-prefix-map /path/to/chromium/src=../..
+-    swiftflags += [
+-      "-file-prefix-map",
+-      rebase_path("//.", "") + "=" + rebase_path("//.", root_build_dir),
+-    ]
+-    if (!is_win) {
+-      # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+-      asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+-    }
+-
+-    if (is_win && use_lld) {
+-      if (symbol_level == 2 || (is_clang && using_sanitizer)) {
+-        # Absolutize source file paths for PDB. Pass the real build directory
+-        # if the pdb contains source-level debug information and if linker
+-        # reproducibility is not critical.
+-        ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
+-      } else {
+-        # Use a fake fixed base directory for paths in the pdb to make the pdb
+-        # output fully deterministic and independent of the build directory.
+-        ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
+-      }
+-    }
+-  }
+-
+   # Tells the compiler not to use absolute paths when passing the default
+   # paths to the tools it invokes. We don't want this because we don't
+   # really need it and it can mess up the RBE cache entries.
+@@ -1759,88 +1719,6 @@ config("compiler_deterministic") {
+   }
+ }
+ 
+-config("clang_revision") {
+-  if (is_clang && clang_base_path == default_clang_base_path &&
+-      current_os != "zos") {
+-    _perform_consistency_checks = current_toolchain == default_toolchain
+-    if (llvm_force_head_revision) {
+-      _head_revision_stamp_path = "//third_party/llvm-build/force_head_revision"
+-      _head_revision = ""
+-      if (path_exists(_head_revision_stamp_path)) {
+-        _head_revision = read_file(_head_revision_stamp_path, "trim string")
+-      }
+-      assert(
+-          _head_revision != "",
+-          "llvm_force_head_revision=true, but no locally built version was detected.")
+-      _clang_revision = _head_revision
+-    } else {
+-      _clang_revision = read_file(
+-              "//third_party/llvm-build/Release+Asserts/cr_build_revision",
+-              "trim string")
+-
+-      # Ensure that the synced clang version matches what's in git.
+-      if (_perform_consistency_checks) {
+-        # Parse the clang version from the Python script.
+-        _clang_version_lines = filter_include(
+-                read_file("//tools/clang/scripts/update.py", "list lines"),
+-                [ "CLANG_*REVISION = *" ])
+-        _py_revision =
+-            string_replace(_clang_version_lines[0], "CLANG_REVISION = '", "")
+-        _py_revision = string_replace(_py_revision, "'", "")
+-        _py_subrevision =
+-            string_replace(_clang_version_lines[1], "CLANG_SUB_REVISION = ", "")
+-        _expected_clang_revision = "$_py_revision-$_py_subrevision"
+-
+-        # TODO(agrieve): Change filter_include to _clang_revision ==
+-        # _expected_clang_revision once angle & webrtc use a GCS DEPS entry
+-        # rather than a update.py runhook.
+-        assert(
+-            filter_include([ _clang_revision ],
+-                           [
+-                             _expected_clang_revision,
+-                             "$_expected_clang_revision,*",
+-                           ]) != [],
+-            "clang_revision=\"$_clang_revision\" but update.py expected \"$_expected_clang_revision\". Did you forget to gclient sync?")
+-      }
+-    }
+-
+-    if (_perform_consistency_checks) {
+-      # Ensure that the revision matches the version major expected by GN.
+-      _versions_match = filter_include([ _clang_revision ],
+-                                       [ "llvmorg-$clang_version-*" ]) != []
+-      assert(
+-          _versions_match,
+-          "clang_revision=\"$_clang_revision\" but clang_version=\"$clang_version\". clang_version in build/toolchain/toolchain.gni is likely outdated.")
+-    }
+-
+-    if (toolchain_has_rust && _perform_consistency_checks &&
+-        !rust_force_head_revision) {
+-      # Ensure that the synced rust version matches what's in git.
+-      _rust_revision_lines =
+-          filter_include(read_file("//tools/rust/update_rust.py", "list lines"),
+-                         [ "RUST_*REVISION = *" ])
+-      _py_revision =
+-          string_replace(_rust_revision_lines[0], "RUST_REVISION = '", "")
+-      _py_revision = string_replace(_py_revision, "'", "")
+-      _py_subrevision =
+-          string_replace(_rust_revision_lines[1], "RUST_SUB_REVISION = ", "")
+-      _expected_rust_revision = "$_py_revision-$_py_subrevision"
+-
+-      # Ensure the rust version matches the clang version.
+-      assert(
+-          filter_include([ rustc_revision ],
+-                         [ "*-$_expected_rust_revision-*" ]) != [],
+-          "rustc_revision=\"$rustc_revision\" but update_rust.py expected \"$_expected_rust_revision\". Run \"gclient sync\"?")
+-    }
+-
+-    # This is here so that all files get recompiled after a clang roll and
+-    # when turning clang on or off. (defines are passed via the command line,
+-    # and build system rebuild things when their commandline changes). Nothing
+-    # should ever read this define.
+-    defines = [ "CR_CLANG_REVISION=\"$_clang_revision\"" ]
+-  }
+-}
+-
+ # Controls the usage of a warning suppression mapping (WSM) file to suppress
+ # warnings based on the path of the file they come from. It's controlled by the
+ # `clang_warning_suppression_file` gn argument , which points to a text file
+@@ -1896,18 +1774,6 @@ config("sanitize_c_array_bounds") {
+   }
+ }
+ 
+-config("rustc_revision") {
+-  if (rustc_revision != "") {
+-    # Similar to the `clang_revision` config, this is here so that all `.rs`
+-    # sources get recompiled after a rustc roll. Nothing should ever read this
+-    # cfg. This will not be set if a custom toolchain is used.
+-    rustflags = [
+-      "--cfg",
+-      "cr_rustc_revision=\"$rustc_revision\"",
+-    ]
+-  }
+-}
+-
+ config("compiler_arm_fpu") {
+   if (current_cpu == "arm" && !is_ios) {
+     cflags = [ "-mfpu=neon" ]
+@@ -2386,11 +2252,7 @@ config("chromium_code") {
+       defines = [ "_HAS_NODISCARD" ]
+     }
+   } else {
+-    cflags = [ "-Wall" ]
+-    if (is_clang) {
+-      # Enable extra warnings for chromium_code when we control the compiler.
+-      cflags += [ "-Wextra" ]
+-    }
+    cflags = []
+ 
+     # In Chromium code, we define __STDC_foo_MACROS in order to get the
+     # C99 macros on Mac and Linux.
+@@ -2399,32 +2261,6 @@ config("chromium_code") {
+       "__STDC_FORMAT_MACROS",
+     ]
+ 
+-    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
+-        current_cpu != "ppc64" && current_cpu != "mips" &&
+-        current_cpu != "mips64" && current_cpu != "riscv64" &&
+-        current_cpu != "loong64") {
+-      # Non-chromium code is not guaranteed to compile cleanly with
+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+-      # disabled, so only do that for Release build.
+-      fortify_level = "2"
+-
+-      # ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
+-      # implementation with a few custom glibc patches. Use that if it's
+-      # available.
+-      if (is_chromeos_device) {
+-        fortify_level = "3"
+-      }
+-
+-      # _FORTIFY_SOURCE=3 is available in glibc 2.34+. Enable it when building
+-      # with the sysroot where support is guaranteed. Clang is also required since
+-      # the system gcc is often patched to add _FORTIFY_SOURCE=2 which would conflict
+-      # with our definition.
+-      if (use_sysroot && is_clang) {
+-        fortify_level = "3"
+-      }
+-      defines += [ "_FORTIFY_SOURCE=" + fortify_level ]
+-    }
+-
+     if (is_apple) {
+       cflags_objc = [ "-Wimplicit-retain-self" ]
+       cflags_objcc = [ "-Wimplicit-retain-self" ]
+@@ -2848,7 +2684,8 @@ config("default_stack_frames") {
+ # [0]: https://pinpoint-dot-chromeperf.appspot.com/job/147634a8be0000
+ # [1]: https://pinpoint-dot-chromeperf.appspot.com/job/132bc772be0000
+ # [2]: https://crrev.com/c/5447532
+-config("optimize") {
+config("optimize") { }
+config("xoptimize") {
+   if (is_win) {
+     # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
+     # consistency with the other platforms.
+@@ -2897,7 +2734,8 @@ config("optimize") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
+config("no_optimize") { }
+config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -2932,7 +2770,8 @@ config("no_optimize") {
+ # Turns up the optimization level. Used to explicitly enable -O2 instead of
+ # -Os for select targets on platforms that use optimize_for_size. No-op
+ # elsewhere.
+-config("optimize_max") {
+config("optimize_max") { }
+config("xoptimize_max") {
+   ldflags = common_optimize_on_ldflags
+   if (is_win) {
+     # Favor speed over size, /O2 must be before the common flags.
+@@ -2953,7 +2792,8 @@ config("optimize_max") {
+ #
+ # TODO(crbug.com/41259697) - rework how all of these configs are related
+ # so that we don't need this disclaimer.
+-config("optimize_speed") {
+config("optimize_speed") { }
+config("xoptimize_speed") {
+   ldflags = common_optimize_on_ldflags
+   if (is_win) {
+     # Favor speed over size, /O2 must be before the common flags.
+@@ -2970,7 +2810,8 @@ config("optimize_speed") {
+   rustflags = [ "-Copt-level=3" ]
+ }
+ 
+-config("optimize_fuzzing") {
+config("optimize_fuzzing") { }
+config("xoptimize_fuzzing") {
+   cflags = [ "-O1" ] + common_optimize_on_cflags
+   rustflags = [ "-Copt-level=1" ]
+   ldflags = common_optimize_on_ldflags
+@@ -3115,7 +2956,8 @@ config("split_dwarf") {
+ }
+ 
+ # Full symbols.
+-config("symbols") {
+config("symbols") { }
+config("xsymbols") {
+   rustflags = []
+   configs = []
+   if (is_win) {
+@@ -3275,7 +3117,8 @@ config("symbols") {
+ # Minimal symbols.
+ # This config guarantees to hold symbol for stack trace which are shown to user
+ # when crash happens in unittests running on buildbot.
+-config("minimal_symbols") {
+config("minimal_symbols") { }
+config("xminimal_symbols") {
+   configs = []
+   rustflags = []
+   if (is_win) {
+@@ -3355,7 +3198,8 @@ config("minimal_symbols") {
+ # This configuration contains function names only. That is, the compiler is
+ # told to not generate debug information and the linker then just puts function
+ # names in the final debug information.
+-config("no_symbols") {
+config("no_symbols") { }
+config("xno_symbols") {
+   if (is_win) {
+     ldflags = [ "/DEBUG" ]
+ 
+-- 
+2.52.0
+
@@ -0,0 +1,46 @@
+From da37bd781c0371e02ffc4877c3ac1b5f2020c207 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Tue, 17 Feb 2026 15:45:01 +1000
+Subject: [PATCH] Handle case where `parsed_rustc_args.cfg` is empty
+
+This may occur when (for example) using the unbundle toolchain
+
+Signed-off-by: Matt Jolly <kangie@gentoo.org>
+--- a/third_party/rust/cxx/chromium_integration/run_cxxbridge.py
+++ b/third_party/rust/cxx/chromium_integration/run_cxxbridge.py
+@@ -44,18 +44,20 @@ def calculate_cxxbridge_args(unrecognized_script_args, rustc_print_cfg_path):
+   parser.add_argument("--cfg", action="append"),
+   parsed_rustc_args, _other_args = parser.parse_known_args(
+       args=unrecognized_script_args[:rustflags_separator])
+-  for cfg_arg in parsed_rustc_args.cfg:
+-    if "=" not in cfg_arg:  # `buildflag_header.gni` only supports bool flags.
+-      # TODO(https://crbug.com/436606652): Stop using `_BUILDFLAG_NOT_SET_`
+-      # prefix and instead use `--check-cfg` in `run_cxxbridge.py` to
+-      # detect buildflag names.
+-      FALSE_PREFIX = "_BUILDFLAG_NOT_SET_"
+-      if cfg_arg.startswith(FALSE_PREFIX):
+-        flagname = cfg_arg[len(FALSE_PREFIX):]
+-        cxxbridge_args.append(f"--cfg={flagname}=false")
+-      else:
+-        flagname = cfg_arg
+-        cxxbridge_args.append(f"--cfg={flagname}=true")
+  # Unbundled toolchain may not have any `--cfg` flags
+  if parsed_rustc_args.cfg:
+    for cfg_arg in parsed_rustc_args.cfg:
+      if "=" not in cfg_arg:  # `buildflag_header.gni` only supports bool flags.
+        # TODO(https://crbug.com/436606652): Stop using `_BUILDFLAG_NOT_SET_`
+        # prefix and instead use `--check-cfg` in `run_cxxbridge.py` to
+        # detect buildflag names.
+        FALSE_PREFIX = "_BUILDFLAG_NOT_SET_"
+        if cfg_arg.startswith(FALSE_PREFIX):
+          flagname = cfg_arg[len(FALSE_PREFIX):]
+          cxxbridge_args.append(f"--cfg={flagname}=false")
+        else:
+          flagname = cfg_arg
+          cxxbridge_args.append(f"--cfg={flagname}=true")
+ 
+   with open(rustc_print_cfg_path, 'r') as file:
+     for line in file:
+-- 
+2.52.0
+
@@ -1,21 +0,0 @@
-From a665875b4013eed997bd042326a038e24f3296e7 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Thu, 10 Oct 2024 14:36:51 +1000
-Subject: [PATCH] unbundle: add missing icu target
-
--- a/build/linux/unbundle/icu.gn
-+++ b/build/linux/unbundle/icu.gn
-@@ -65,6 +65,10 @@ group("icuuc_public") {
-   public_deps = [ ":icuuc" ]
- }
- 
-+group("icui18n_hidden_visibility") {
-+  public_deps = [ ":icuuc" ]
-+}
-+
- shim_headers("icui18n_shim") {
-   root_path = "source/i18n"
-   headers = [
-- 
-2.46.2
-
@@ -472,6 +472,34 @@ Poppler gives access to the following binary programs:
   (license license:gpl2+)
   (home-page "https://poppler.freedesktop.org/")))

+(define-public poppler-next
+  (package
+    (inherit poppler)
+    (name "poppler-next")
+    (version "26.04.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://poppler.freedesktop.org/poppler-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "14q69q6ipy3m4ywdhlr48qlscwzrv8jcns3g2306pyaa25im35dh"))))
+    (arguments (substitute-keyword-arguments arguments
+                 ((#:configure-flags flags)
+                  #~(cons*
+                     "-DENABLE_GPGME=OFF"
+                     "-DENABLE_QT5=OFF"
+                     "-DENABLE_QT6=OFF"
+                     #$flags))
+                 ((#:phases phases)
+                  #~(modify-phases #$phases
+                      (add-after 'install 'sanitize-pkg-config-files
+                        (lambda _
+                          (substitute* (find-files #$output "\\.pc$")
+                            (("^Requires.private:.*" all)
+                             (string-append "# " all)))))))))
+    (inputs (modify-inputs inputs (prepend curl)))))
+
 (define-public poppler-data
  (package
    (name "poppler-data")
@@ -108,9 +108,24 @@ data in motion, or as a file format for data at rest.")
       (uri (git-reference
              (url "https://github.com/protocolbuffers/protobuf/")
              (commit (string-append "v" version))))
-       (modules '((guix build utils)))
-       ;; "utf8_range" development now takes place in main protobuf repository.
-       (snippet #~(delete-all-but "third_party" "utf8_range"))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet
+        #~(begin
+            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+            (define (delete-all-but directory . preserve)
+              (define (directory? x)
+                (and=> (stat x #f)
+                       (compose (cut eq? 'directory <>) stat:type)))
+              (with-directory-excursion directory
+                (let* ((pred
+                        (negate (cut member <> (append '("." "..") preserve))))
+                       (items (scandir "." pred)))
+                  (for-each delete-file-recursively items))))
+            ;; "utf8_range" development now takes place in main protobuf
+            ;; repository.
+            (delete-all-but "third_party" "utf8_range")))
       (file-name (git-file-name name version))
       (sha256
        (base32 "1rdxm75bqwjj4qd3hz4vlydra6bw5dq391kwln2q0pjfx9gbrjhk"))))
@@ -7883,7 +7883,7 @@ basic TCP/IP protocols.")
 (define-public python-geventhttpclient
  (package
    (name "python-geventhttpclient")
-    (version "2.3.3")
+    (version "2.3.9")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -7893,7 +7893,7 @@ basic TCP/IP protocols.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1ya0i0fbx054mfx5d1k75fcf64xzp7vva8lkwwzan41xbnc56nyj"))))
+                "1diq6n9sr92rsqbpxlbhbn1d22hrlzp6swykz9bfzh7sxpywa6j8"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -10497,33 +10497,6 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.")
 errors when data is invalid.")
    (license license:expat)))

-(define-public python-pydantic-1
-  (package
-    (inherit python-pydantic)
-    (name "python-pydantic")
-    (version "1.10.19")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/samuelcolvin/pydantic")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0swcpfq1y0h5dcj82idls8k5la4xh4c0vz47y7jci2qass8gjffc"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; One test fails with  not equal assertion.
-      #~(list "--deselect=tests/test_validators.py::test_assert_raises_validation_error")))
-    (native-inputs
-     (list python-pytest
-           python-pytest-mock
-           python-setuptools))
-    (propagated-inputs
-     (list python-typing-extensions))))
-
 ;; It may be removed after 2026-01-05.
 (define-deprecated/public-alias python-pydantic-2 python-pydantic)

@@ -23082,16 +23055,21 @@ completes.")
 (define-public python-asyncinject
  (package
    (name "python-asyncinject")
-    (version "0.6")
+    (version "0.6.1")
    (source
     (origin
-       (method url-fetch)
-       (uri (pypi-uri "asyncinject" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/simonw/asyncinject")
+              (commit version)))
+       (file-name (git-file-name name version))
       (sha256
-        (base32 "0x57idiy19lzyn32klgm06r223z8gr2aqqk91gysbshq7jg8g3pf"))))
+        (base32 "127ahb32x2qqjk17a667adrvrl63ima8khifq6dfm0q3vlfslxnn"))))
    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-pytest-asyncio
-                         python-setuptools python-wheel))
+    (native-inputs
+     (list python-pytest
+           python-pytest-asyncio
+           python-setuptools))
    (home-page "https://github.com/simonw/asyncinject")
    (synopsis
     "Run async workflows using pytest-fixtures-style dependency injection")
@@ -893,7 +893,7 @@ A @code{andglob} program is also provided along with s.")
 (define-public oksh
  (package
    (name "oksh")
-    (version "7.8")
+    (version "7.5")
    (source
     (origin
       (method url-fetch)
@@ -902,7 +902,7 @@ A @code{andglob} program is also provided along with s.")
             version "/oksh-" version ".tar.gz"))
       (sha256
        (base32
-         "0l59x9mm6nbixcpz3zf3iplqili2gyw8l382rj89b0iv32hxac1v"))))
+         "0pgdxvy8jgydsyzk7vcc93pm09bihqvrn3i35gz1ncg9z31rbf20"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f   ; there are no tests available
@@ -46,11 +46,19 @@
       (file-name (git-file-name name version))
       (sha256
        (base32 "17iqvqs7w3z5c4acnjc6mixqkqz4rff2c7flfpnlwgfjgqy1a2zw"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
        ;; XXX: Keep just some portion with valulable data and no license
        ;; issues.
        #~(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 "."
                            "allsky"
                            "coordinates"
@@ -2051,7 +2051,10 @@ colours), kitty keyboard protocol, editorconfig support, amongst other features.
                        "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"))))
+                        "zed-0.225.10-use-mock-livekit-on-linux.patch"))
+       (snippet
+        #~(begin (delete-file
+                   "crates/zed/resources/windows/bin/x64/OpenConsole.exe")))))
    (build-system cargo-build-system)
    (arguments
     (list #:install-source? #f
@@ -191,7 +191,7 @@ libenca and several charset conversion libraries and tools.")
  (hidden-package
   (package
     (name "utf8proc-bootstrap")
-     (version "2.11.3")
+     (version "2.10.0")
     (source
      (origin
        (method git-fetch)
@@ -200,7 +200,7 @@ libenca and several charset conversion libraries and tools.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-         (base32 "1ssix4zf3lac1afzlw2gbfg3n52gmggip8lv224gywqf3zyvyp8c"))))
+         (base32 "1n1k67x39sk8xnza4w1xkbgbvgb1g7w2a7j2qrqzqaw1lyilqsy2"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f                 ;To break dependency cycle.
@@ -223,7 +223,7 @@ case-folding, and other operations for data in the UTF-8 encoding.")
    (inherit utf8proc-bootstrap)
    (name "utf8proc")
    (native-inputs
-     (let ((UNICODE_VERSION "17.0.0"))  ; defined in data/Makefile
+     (let ((UNICODE_VERSION "16.0.0"))  ; defined in data/Makefile
       ;; Only if the tests will be run should these be added.
       (if (and (%current-system)
                (supported-package? julia))
@@ -235,7 +235,7 @@ case-folding, and other operations for data in the UTF-8 encoding.")
                         UNICODE_VERSION "/ucd/NormalizationTest.txt"))
                   (sha256
                    (base32
-                     "1nw7i89q42r0plwlc8qj6qm18brk23hc0jf800cp86km63azy6ah")))
+                     "1cffwlxgn6sawxb627xqaw3shnnfxq0v7cbgsld5w1z7aca9f4fq")))
                 (origin
                   (method url-fetch)
                   (uri (string-append
@@ -243,7 +243,7 @@ case-folding, and other operations for data in the UTF-8 encoding.")
                         UNICODE_VERSION "/ucd/auxiliary/GraphemeBreakTest.txt"))
                   (sha256
                    (base32
-                     "1v4k2x52bzwgqxw89hdf3wdgwm8q3ianmfrya37bl699qp939lg2")))
+                     "1d9w6vdfxakjpp38qjvhgvbl2qx0zv5655ph54dhdb3hs9a96azf")))
                 (origin
                   (method url-fetch)
                   (uri (string-append
@@ -251,7 +251,7 @@ case-folding, and other operations for data in the UTF-8 encoding.")
                         UNICODE_VERSION "/ucd/DerivedCoreProperties.txt"))
                   (sha256
                    (base32
-                     "021clafsjmjblsxcszp0dpxy2phwhbmyghfmxym2yj2w378zxir4")))
+                     "1gfsq4vdmzi803i2s8ih7mm4fgs907kvkg88kvv9fi4my9hm3lrr")))
                 ;; For tests.
                 julia
                 perl
@@ -68,6 +68,7 @@
 ;;; Copyright © 2025 Matthew Elwin <elwin@northwestern.edu>
 ;;; Copyright © 2025 Roman Scherer <roman@burningswell.com>
 ;;; Copyright © 2026 Ingar <ingar@onionmail.info>
+;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -91,6 +92,7 @@
  #:use-module (guix deprecation)
  #:use-module (guix gexp)
  #:use-module (guix download)
+  #:use-module (guix fossil-download)
  #:use-module (guix git-download)
  #:use-module (guix hg-download)
  #:use-module (guix build-system cargo)
@@ -111,6 +113,7 @@
  #: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 check)
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
@@ -3519,6 +3522,74 @@ output of the @code{git} command.")
 modification time.")
    (license license:bsd-2)))

+(define-public libfossil
+  (let ((ci "914ed6dcaff13bf7209c9f27ccfb77c2d8fdf36b8d2133aa1590258b0708f035")
+        (revision "0"))
+    (package
+      (name "libfossil")
+      (version (fossil-version "0.6.0" revision ci))
+      (source
+       (origin
+         (method fossil-fetch)
+         (uri (fossil-reference
+               (uri "https://fossil.wanderinghorse.net/r/libfossil")
+               (check-in ci)))
+         (file-name (fossil-file-name name version))
+         (sha256
+          (base32 "0a0ycnnba2izmiqjj8hgvjgjdwhpn0x36lhy3vmw4j7bhny0df52"))
+         (patches (search-patches "libfossil-skip-amalgamation.patch"))
+         (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 "autosetup" "proj.tcl" "wh-common.tcl")
+              (delete-file-recursively "extsrc")
+              ;; Re-create Fossil check-out manifests,
+              ;; whose content does not affect in semantics.
+              (for-each
+                (lambda (file)
+                  (call-with-output-file file (const #t)))
+                '("manifest" "manifest.uuid"))))))
+      (build-system gnu-build-system)
+      (arguments
+       (list #:configure-flags
+             #~(list "--no-debug" "--no-fnc" ;TODO: C++ and Tcl binding?
+                     (string-append "--with-sqlite="
+                                    #$(this-package-input "sqlite"))
+                     (string-append "--soname=libfossil.so"))
+             #:phases
+             #~(modify-phases %standard-phases
+                 (replace 'configure
+                   (lambda* (#:key configure-flags #:allow-other-keys)
+                     (apply invoke "autosetup"
+                            (string-append "--prefix=" #$output)
+                            configure-flags)))
+                 (replace 'check
+                   (lambda* (#:key tests? #:allow-other-keys)
+                     (when tests?
+                       (substitute* "sanity-checks.sh"
+                         ;; FIXME: these tests requires a Fossil checkout.
+                         (("\\./f-sanity.*") "")
+                         (("\\./f-parseparty.*") ""))
+                       (setenv "LD_LIBRARY_PATH" (getcwd))
+                       (invoke "./sanity-checks.sh")))))))
+      (native-inputs (list autosetup))
+      (inputs (list sqlite-next zlib))
+      (home-page "https://fossil.wanderinghorse.net/r/libfossil")
+      (synopsis "Unofficial Fossil SCM Library API")
+      (description
+       "@code{libfossil} is an alternative interface into Fossil repositories,
+as opposed to a replacement for the core fossil application,
+intended for new ways to access and manipulate fossil repositories.")
+      (license license:bsd-2))))
+
 (define-public fnc
  (package
    (name "fnc")
@@ -1469,10 +1469,10 @@ designed to encode video or images into an H.265 / HEVC encoded bitstream.")
    (native-inputs
     (list pkg-config nasm))
    (propagated-inputs
-     (list freetype
-           fribidi
-           fontconfig
-           harfbuzz))
+     `(("freetype" ,freetype)
+       ("fribidi" ,fribidi)
+       ("fontconfig" ,fontconfig)
+       ("harfbuzz" ,harfbuzz)))
    (home-page "https://github.com/libass/libass")
    (synopsis "Subtitle rendering library for the ASS/SSA format")
    (description "libass is a subtitle rendering library for the
@@ -5194,14 +5194,14 @@ specifications.")
 (define-public libaacs
  (package
    (name "libaacs")
-    (version "0.11.1")
+    (version "0.11.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/"
                           version "/libaacs-" version ".tar.bz2"))
       (sha256
-        (base32 "0f8ax9dp49mrm1484bl2df659b34xyrjmngzmvvpg2n9wkms12m8"))))
+        (base32 "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"))))
    (inputs
     (list libgcrypt))
    (native-inputs
@@ -6250,30 +6250,32 @@ spec for MP4), which can be obtained from the ISO or found online.")
    (license license:expat)))

 (define-public vidstab
-  (package
-    (name "vidstab")
-    (version "1.1.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/georgmartius/vid.stab")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "19k822bwsnw58ikbfh4fhh97zpn89ji9k1gdvh9r2ljy82g52md7"))))
-    (build-system cmake-build-system)
-    (arguments
-     '(#:tests? #f)) ; tests are not run as part of standard build process
-    (home-page "http://public.hronopik.de/vid.stab/")
-    (synopsis "Video stabilization library")
-    (description "Vidstab is a video stabilization library which can be used
+  (let ((commit "aeabc8daa7904f9edf7441a11f293965a5ef53b8")
+        (revision "0"))
+    (package
+      (name "vidstab")
+      (version (git-version "1.1.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/georgmartius/vid.stab")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "042iy0f3khwzr68djzvqgn301sy21ljvkf52rnc2c73q7ircnzzn"))))
+      (build-system cmake-build-system)
+      (arguments
+       '(#:tests? #f)) ; tests are not run as part of standard build process
+      (home-page "http://public.hronopik.de/vid.stab/")
+      (synopsis "Video stabilization library")
+      (description "Vidstab is a video stabilization library which can be used
 with FFmpeg.  A video acquired using a hand-held camera or a camera mounted on a
 vehicle typically suffers from undesirable shakes and jitters.  Activities such
 as surfing, skiing, riding and walking while shooting videos are especially
 prone to erratic camera shakes.  Vidstab targets these video contents to help
 create smoother and stable videos.")
-    (license license:gpl2+)))
+      (license license:gpl2+))))

 (define-public libopenshot
  (package
@@ -792,7 +792,7 @@ is based on Vim's builtin plugin support.")
 (define-public neovim
  (package
    (name "neovim")
-    (version "0.11.5")
+    (version "0.12.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -801,7 +801,7 @@ is based on Vim's builtin plugin support.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1b524vi44gkcsyy8w4jggvprwdsgy0gjprgxpyhh0dmqm47c0c48"))
+                "1lydhvm4abh2y3336nyqqbwiszllnw63c98wdna2mrhi44gfh2jf"))
              (patches (search-patches "neovim-tree-sitter-grammar-path.patch"))))
    (build-system cmake-build-system)
    (arguments
@@ -1017,7 +1017,10 @@ With the package comes a plugin to use vifm as a vim file selector.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0k98c0i14z3adx6l4ncf2zmzk9aykqkdnws6qw4m0yj5z61zh6av"))))
+        (base32 "0k98c0i14z3adx6l4ncf2zmzk9aykqkdnws6qw4m0yj5z61zh6av"))
+       ;; This patch can be removed when the next pynvim version after 0.6.0 is
+       ;; released.
+       (patches (search-patches "python-pynvim-fix-test-command-error.patch"))))
    (build-system pyproject-build-system)
    (native-inputs
     (list neovim
@@ -183,7 +183,9 @@ RDP, VNC, SPICE, NX, XDMCP, SSH and EXEC network protocols are supported.")
       (uri (git-reference
              (url "https://github.com/TurboVNC/turbovnc")
              (commit version)))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
       (snippet
        #~(begin
            ;; There are a few bundled Java libraries, such as jsch and jzlib,
@@ -191,6 +193,12 @@ RDP, VNC, SPICE, NX, XDMCP, SSH and EXEC network protocols are supported.")
            ;; bundled under java/org.  These are used by the 'vncviewer'
            ;; program.  The jsch copy is modified and integrates changes from
            ;; https://github.com/mwiede/jsch, so cannot easily be un-bundled.
+            (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))))

            ;; d3des, rfb (headers) and turbojpeg-jni are small and not
            ;; packaged in Guix, so preserve them.
@@ -75,7 +75,7 @@
 ;;; Copyright © 2025 Remco van 't Veer <remco@remworks.net>"
 ;;; Copyright © 2025 Daniel Khodabakhsh <d@niel.khodabakh.sh>
 ;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
-;;; Copyright © 2025, 2026 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
 ;;; Copyright © 2025 pinoaffe <pinoaffe@gmail.com>
 ;;; Copyright © 2025, 2026 gemmaro <gemmaro.dev@gmail.com>
@@ -1472,7 +1472,7 @@ used to train large language models, and poisoning the collected data.")
 (define-public jansson
  (package
    (name "jansson")
-    (version "2.15.0")
+    (version "2.14")
    (source (origin
             (method url-fetch)
             (uri (string-append "https://github.com/akheron/jansson"
@@ -1480,7 +1480,7 @@ used to train large language models, and poisoning the collected data.")
                                 "/jansson-" version ".tar.bz2"))
             (sha256
              (base32
-               "0m49glsr5v376jpyj2y0xyr11703pr4bfgipz5jk2dq0a1vcgsm7"))))
+               "1fdgji964mrrz19glx0zh91asji542fvybymvzk6rrbagkr5dagv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -9041,7 +9041,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
 (define-public nghttp2
  (package
    (name "nghttp2")
-    (version "1.68.1")
+    (version "1.58.0")
    (source
     (origin
       (method url-fetch)
@@ -9050,7 +9050,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
                           "nghttp2-" version ".tar.xz"))
       (sha256
        (base32
-         "1cph2j688zxxxl3944g5grjma15qbv4b6z252ichsn7ilyq7mgba"))))
+         "1q4ps8acr7nyia7mf2z11m0yh3fn1imhyv855j3xjbx91l2a6s2a"))))
    (build-system gnu-build-system)
    (outputs (list "out"
                   "lib"))              ; only libnghttp2
@@ -1480,7 +1480,8 @@ treat it as part of their software base when porting.")
    (inputs
      (list libxt xorgproto libxext))
    (native-inputs
-     (list gettext-minimal pkg-config))
+     `(("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
    (home-page "https://www.x.org/wiki/")
    (synopsis "Xorg XPM library")
    (description "XPM (X Pixmap) image file format library.")
@@ -895,16 +895,18 @@ requirements.
 If @var{config} contains SMB mounts, adds samba-nmbd and samba-winbindd to the
 service requirements.
 "
-  (delete-duplicates
-   (fold
-    (lambda (fs-type acc)
-      (cond
-       ((string= "nfs" fs-type)
-        (append acc '(rpc.statd)))
-       ((string= "smb" fs-type)
-        (append acc '(samba-nmbd samba-winbindd)))))
-    '()
-    (map autofs-map-entry-type (autofs-configuration->raw-entries config)))))
+  (fold
+   (lambda (fs-type acc)
+     (cond
+      ((string= "nfs" fs-type)
+       (append acc '(rpc.statd)))
+      ((string= "smb" fs-type)
+       (append acc '(samba-nmbd samba-winbindd)))
+      (else acc)))
+   '()
+   (delete-duplicates
+    (map autofs-map-entry-type
+         (autofs-configuration->raw-entries config)))))

 (define (autofs-shepherd-service config)
  (match-record config <autofs-configuration> (autofs timeout)
@@ -0,0 +1,59 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2025 Nguyễn Gia Phong <cnx@loang.net>
+;;;
+;;; 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/>.
+;;;
+;;; Commentary:
+;;;
+;;; This is the build-side support code of (guix fossil-download).
+;;; It allows a Fossil repository to be opened at a specific revision.
+;;;
+;;; Code:
+
+(define-module (guix build fossil)
+  #:use-module (guix build utils)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
+  #:use-module (web uri)
+  #:export (fossil-fetch))
+
+(define* (fossil-fetch uri check-in file #:key (fossil-command "fossil"))
+  "Fetch CHECK-IN from URI into DIRECTORY.  CHECK-IN must be a valid
+Fossil check-in name.  Return #t on success, else raise an exception."
+  (setenv "FOSSIL_HOME" "/tmp")
+  (invoke fossil-command
+    "tarball" check-in file "-R"
+    (case (uri-scheme (string->uri-reference uri))
+      ((file https)                     ;clone the repository first
+       (match-let ((repository (simple-format #f "/tmp/~a.fossil"
+                                 (basename file ".tar.gz")))
+                   ((input . output) (pipe)))
+         ;; Trust the TLS certificate of the server,
+         ;; since we'll later verify the tarball's checksum.
+         (display "y" output)
+         (close-port output)
+         (with-input-from-port input
+           (cut invoke fossil-command "clone"
+                "--no-open" "--once" uri repository))
+         (close-port input)
+         repository))
+      ((ssh)                            ;TODO: authentication for SSH
+       (let ((message (string-append "fetching a Fossil repository through SSH"
+                                     " is not supported: " uri)))
+         (raise (condition (&message (message message))))))
+      ((#f) uri))))                     ;local file
@@ -77,7 +77,6 @@
            make-file-writable
            copy-recursively
            delete-file-recursively
-            delete-all-but
            file-name-predicate
            find-files
            false-if-file-not-found
@@ -523,14 +522,6 @@ errors."
                      ;; Don't follow symlinks.
                      lstat)))

-(define (delete-all-but directory . preserve)
-  "Delete DIRECTORY recursively except for the files in PRESERVE immediately
-found under it."
-  (with-directory-excursion directory
-    (let* ((pred (negate (cut member <> (cons* "." ".." preserve))))
-           (items (scandir "." pred)))
-      (for-each (cut delete-file-recursively <>) items))))
-
 (define (file-name-predicate regexp)
  "Return a predicate that returns true when passed a file name whose base
 name matches REGEXP."
@@ -0,0 +1,125 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2025 Nguyễn Gia Phong <cnx@loang.net>
+;;;
+;;; 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/>.
+;;;
+;;; Commentary:
+;;;
+;;; An <origin> method that open Fossil checkout at a specific version.
+;;; The repository URI and version are specified
+;;; with a <fossil-reference> object.
+;;;
+;;; Code:
+
+(define-module (guix fossil-download)
+  #:use-module (guix build-system)
+  #:use-module (guix gexp)
+  #:use-module (guix modules)
+  #:use-module (guix monads)
+  #:use-module (guix packages)
+  #:use-module (guix records)
+  #:use-module (guix store)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
+  #:use-module (web uri)
+  #:export (fossil-reference
+            fossil-reference?
+            fossil-reference-uri
+            fossil-reference-check-in
+
+            fossil-fetch
+            fossil-version
+            fossil-file-name))
+
+(define-record-type* <fossil-reference>
+  fossil-reference make-fossil-reference fossil-reference?
+  (uri      fossil-reference-uri)
+  (check-in fossil-reference-check-in))
+
+(define (fossil-version version revision check-in)
+  "Return the version string for packages using fossil-download."
+  ;; fossil-version is almost exclusively executed while modules
+  ;; are being loaded, leading to any errors hiding their backtrace.
+  ;; Avoid the mysterious error "Value out of range 0 to N: 10"
+  ;; when the check-in ID is too short, which can happen, for example,
+  ;; when the user swapped the revision and check-in arguments by mistake.
+  (when (< (string-length check-in) 10)
+    (raise
+      (condition
+       (&message (message "fossil-version: check-in ID unexpectedly short")))))
+  (string-append version "-" revision "." (string-take check-in 10)))
+
+(define (fossil-file-name name version)
+  "Return the file-name for packages using fossil-download."
+  (string-append name "-" version ".tar.gz"))
+
+(define* (fossil-fetch ref hash-algo hash
+                       #:optional name
+                       #:key (system (%current-system))
+                             (guile (default-guile))
+                             (fossil (@* (gnu packages version-control)
+                                         fossil)))
+  "Return a fixed-output derivation that fetches REF, a <fossil-reference>
+object.  The output is expected to have recursive hash HASH of type
+HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
+  (let* ((modules (source-module-closure '((guix build fossil)
+                                           (guix build download)
+                                           (guix build download-nar))))
+         (uri (fossil-reference-uri ref))
+         (scheme-of-uri (uri-scheme (string->uri-reference uri)))
+         (check-in (fossil-reference-check-in ref))
+         (tarball-name (or name (fossil-file-name (basename uri) check-in)))
+         (tarball-url (and (eq? 'https scheme-of-uri)
+                           (simple-format #f "~a/tarball/~a/~a"
+                             uri check-in tarball-name)))
+         (guile-json (@* (gnu packages guile) guile-json-4))
+         (gnutls (@* (gnu packages tls) guile-gnutls))
+         (guile-lzlib (@* (gnu packages guile) guile-lzlib))
+         (build
+          (with-imported-modules modules
+            (with-extensions (list guile-json gnutls ;for (guix swh)
+                                   guile-lzlib)
+              #~(begin
+                  (use-modules (guix build fossil)
+                               ((guix build download)
+                                #:select (download-method-enabled? url-fetch))
+                               (guix build download-nar))
+                  (or (and (download-method-enabled? 'upstream)
+                           (or (and #$tarball-url
+                                    (url-fetch #$tarball-url #$output))
+                               (fossil-fetch
+                                #$(if scheme-of-uri uri (local-file uri))
+                                #$check-in
+                                #$output
+                                #:fossil-command
+                                #+(file-append fossil "/bin/fossil"))))
+                      (and (download-method-enabled? 'nar)
+                           (download-nar #$output))))))))
+    (mlet %store-monad ((guile (package->derivation guile system)))
+      (gexp->derivation tarball-name build
+                        #:leaked-env-vars '("http_proxy" "https_proxy"
+                                            "COLUMNS" "USER")
+                        #:env-vars (match (getenv "GUIX_DOWNLOAD_METHODS")
+                                     (#f '())
+                                     (value
+                                      `(("GUIX_DOWNLOAD_METHODS" . ,value))))
+                        #:system system
+                        #:hash-algo hash-algo
+                        #:hash hash
+                        #:recursive? #t
+                        #:guile-for-build guile
+                        #:local-build? #t))))
@@ -2,6 +2,7 @@
 ;;; Copyright © 2012-2013, 2015-2020, 2022, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Remco van 't Veer <remco@remworks.net>
+;;; Copyright © 2026 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -140,6 +141,9 @@ current one."

        (option '("vacuum-database") #f #f
                (lambda args
+                  (unless (zero? (getuid))
+                    (leave
+                      (G_ "vacuuming the database can only be used by root~%")))
                  (vacuum-database)
                  (exit 0)))