gnu: googletest: Drop input labels.

* gnu/packages/check.scm (googletest)[native-inputs]: Drop input labels. Change-Id: I588976a404ebeb2613ccc13d52b9a4d5b1de5903 Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 13:13:12 +09:00
40 changed files with 380 additions and 1940 deletions
@@ -68,7 +68,6 @@ 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
@@ -485,7 +484,6 @@ 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,7 +104,6 @@ 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					\
@@ -237,7 +236,6 @@ 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,9 +20,6 @@ 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,52 +8737,6 @@ 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,7 +565,6 @@ 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"
@@ -1215,7 +1214,6 @@ 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,7 +1698,6 @@ 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	\
@@ -2115,7 +2114,6 @@ 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	\
@@ -2523,11 +2521,10 @@ 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	\
@@ -62,7 +62,6 @@
 ;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;; Copyright © 2026 Noé Lopez <noelopez@free.fr>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
-;;; Copyright © 2026 Daniel Martins <email@danielfm.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3704,44 +3703,6 @@ compensation, (de)interleaving, and byte-swapping
    ;; original developer.
    (license license:expat)))

-(define-public rtcqs
-  (package
-    (name "rtcqs")
-    (version "0.6.7")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/rtcqs/rtcqs")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1kc3niyaq4m8di68832pgfb1b0m54q5gm68dwlzwwilgxi61ifzc"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f ;no test suite
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-gui
-            (lambda _
-              (substitute* "pyproject.toml"
-                (("\"FreeSimpleGUI\",?")
-                 "")
-                (("rtcqs_gui = \"rtcqs\\.rtcqs_gui:main\"")
-                 ""))
-              (delete-file "src/rtcqs/rtcqs_gui.py")
-              (delete-file "src/rtcqs/rtcqs_qt_gui.py"))))))
-    (native-inputs (list python-setuptools))
-    (home-page "https://codeberg.org/rtcqs/rtcqs")
-    (synopsis "Linux audio real-time performance analyzer")
-    (description
-     "rtcqs analyzes a Linux system to detect possible bottlenecks that could
-have a negative impact on real-time audio performance.  It checks kernel
-configuration, IRQ priorities, CPU governor, swappiness, and other settings
-relevant to low-latency audio work.")
-    (license license:expat)))
-
 (define-public rtosc
  (package
    (name "rtosc")
@@ -345,8 +345,8 @@ programs and other files depend.")
    (license license:bsd-3)))

 (define-public gn
-  (let ((commit "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a")
-        (revision "2354"))            ;as returned by `git describe`, used below
+  (let ((commit "ee5b7e32b961a9da1933e9f46a018ba6cac8ef60")
+        (revision "2277"))            ;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
-                  "0yz38czmbc72q1hkiv3cwxqh2i8ji2vkkvvk5ws2cjplmn2vj0x9"))
+                  "19kkvwxl66vlzlfppbq03fmi59i5g8a1yc71fsfgwqqmx4wywd6w"))
                (file-name (git-file-name name version))))
      (build-system gnu-build-system)
      (arguments
@@ -366,8 +366,7 @@ programs and other files depend.")
                   (lambda _
                     (setenv "CC" "gcc")
                     (setenv "CXX" "g++")
-                     (setenv "CXXFLAGS"
-                             "-g -O2 -Wno-error=redundant-move -Wno-error=comment")
+                     (setenv "CXXFLAGS" "-g -O2 -Wno-error=redundant-move")
                     (setenv "AR" "ar")))
                 (replace 'configure
                   (lambda _
@@ -1140,8 +1140,7 @@ Anything Protocol} compliant programs can also be executed through Kyua.")
    (arguments
     `(#:tests? #f
       #:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
-    (native-inputs
-     `(("python" ,python-wrapper)))
+    (native-inputs (list python-wrapper))
    (home-page "https://github.com/google/googletest/")
    (synopsis "Test discovery and XUnit test framework")
    (description "Google Test features an XUnit test framework, automated test
@@ -79,13 +79,11 @@
  '("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
@@ -106,11 +104,8 @@
    "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
@@ -125,12 +120,19 @@
    "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
+    "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
    "third_party/crc32c" ;BSD-3
    "third_party/cros_system_api" ;BSD-3
    "third_party/dav1d" ;BSD-2
@@ -138,25 +140,19 @@
    ;; 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
@@ -168,12 +164,10 @@
    "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

@@ -185,7 +179,6 @@
    "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
@@ -194,9 +187,7 @@
    "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
@@ -205,9 +196,6 @@
    "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
@@ -220,14 +208,12 @@
    "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
@@ -241,15 +227,11 @@
    "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
@@ -262,7 +244,6 @@
    "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
@@ -270,20 +251,14 @@
    "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
@@ -293,7 +268,6 @@
    "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
@@ -305,14 +279,11 @@
    "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/include/third_party/vulkan" ;BSD-3
+    "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
    "third_party/smhasher" ;Expat, public domain

    ;; FIXME: the snappy "replacement" shim (see replace_gn_files.py below) does
@@ -367,6 +338,7 @@
    "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
@@ -400,7 +372,7 @@
  ;; run the Blink performance tests, just remove everything to save ~70MiB.
  '("third_party/blink/perf_tests"))

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

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

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

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

 (define %debian-patches
  (map debian-patch
-       '("bookworm/foreach.patch"
-         "debianization/safe-libcxx.patch"
-         "disable/enterprise-tests.patch"
+       '("bookworm/clang19.patch"
+         "bookworm/foreach.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"
-         "trixie/cookie-string-view.patch"
-         "trixie/nodejs-main.patch")))
+         ;; Remove after rust is past
+         ;; <https://github.com/rust-lang/rust/pull/141061>.
+         "trixie/rust-no-alloc-shim.patch")))

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

 (define opus+custom
  (package/inherit opus
@@ -570,7 +531,7 @@
                                  %chromium-version "-lite.tar.xz"))
              (sha256
               (base32
-                "1salvlw5sykx3zmsbp7cgmf7y8yy6jlgb4b4zswzsbjrprk4jnap"))
+                "09iwglswnr6d45zz3zsjw7jpm1xlwwkxlz9h5nlhqxyd933a04fq"))
              (modules '((guix build utils)))
              (snippet (force ungoogled-chromium-snippet))))
    (build-system gnu-build-system)
@@ -587,7 +548,6 @@
      ;; 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"
@@ -595,7 +555,6 @@
              "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"
@@ -613,10 +572,12 @@
              "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"
-              "fatal_linker_warnings=false"
+              ;; Disable type-checking for the Web UI to avoid a Java dependency.
+              "enable_js_type_check=false"
              ;; Disable code using TensorFlow until it has been scrutinized
              ;; by the ungoogled project.
              "build_with_tflite_lib=false"
@@ -628,11 +589,6 @@
              "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=\"\""

@@ -641,8 +597,6 @@
              "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
@@ -674,10 +628,26 @@
                             ;; 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=false"
+              "use_system_icu=true"
              "use_system_lcms2=true"
              "use_system_libffi=true"
              "use_system_libjpeg=true"
@@ -743,9 +713,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"
@@ -762,19 +732,16 @@
                  (("include \"third_party/curl")
                   "include \"curl"))

-                ;; Our clang libs and rustfmt are not under bindgen root directory.
-                (substitute* '("build/rust/rust_bindgen_generator.gni"
-                               "build/rust/rust_bindgen.gni")
+                ;; 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"
                  (("(_libclang_path = )rust_bindgen_root" _ libclang)
-                   (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
+                   (string-append libclang "clang_base_path"))))))
+          (add-after 'patch-stuff '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
@@ -796,22 +763,13 @@
          (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".  Also clang is
-            ;; unable to find gcc's bits/c++config.h which is machine
-            ;; dependent.
+            ;; "fatal error: 'format' file not found".
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
-              (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"))))))
+              (setenv "CPLUS_INCLUDE_PATH"
+                      (string-append
+                       (search-input-directory inputs
+                                               "/include/c++/v1")
+                       ":" (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)
@@ -997,7 +955,7 @@
           glib
           gtk+
           harfbuzz
-           icu4c-77
+           icu4c
           lcms
           libcxx
           libffi
@@ -42,24 +42,20 @@
  #: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 %coreboot-version)
-    (source %coreboot-origin)
+    (version "25.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://review.coreboot.org/coreboot")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -130,8 +126,17 @@ It also comes with example files generated by bincfg.")
 (define-public ifdtool
  (package
    (name "ifdtool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
+    (version "25.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://review.coreboot.org/coreboot")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -155,8 +160,16 @@ dump Intel Firmware Descriptor data of an image file.")
 (define-public intelmetool
  (package
    (name "intelmetool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
+    (version "25.09")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://review.coreboot.org/coreboot")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -188,8 +201,17 @@ Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
 (define-public nvramtool
  (package
    (name "nvramtool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
+    (version "25.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://review.coreboot.org/coreboot")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -276,17 +276,18 @@ Ed448-Goldilocks and Curve448, using the Decaf encoding.")
 (define-public libsodium
  (package
    (name "libsodium")
-    (version "1.0.21")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/jedisct1/libsodium")
-              (commit (string-append version "-RELEASE"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1l6pc3m8zl1sip9ib91bjsb2z2zr7xa7bhblwwmyn9x4nkwqj17n"))))
+    (version "1.0.18")
+    (source (origin
+            (method url-fetch)
+            (uri (list (string-append
+                        "https://download.libsodium.org/libsodium/"
+                        "releases/libsodium-" version ".tar.gz")
+                       (string-append
+                        "https://download.libsodium.org/libsodium/"
+                        "releases/old/libsodium-" version ".tar.gz")))
+            (sha256
+             (base32
+              "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"))))
    (build-system gnu-build-system)
    (synopsis "Portable NaCl-based crypto library")
    (description
@@ -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 "2026-02-08")
+    (version "2025-07-06")
    (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 "1m9l4if3a9i6r76v370gh6azgj2lwqcnpavfv2bkvm9ad56f3pa8"))))
+        (base32 "1b25k66nn4qa4ryhm8mzc53qvsvhgjzdngisw28cpdh109627iz3"))))
    (build-system emacs-build-system)
    (arguments
     (list #:tests? #f)) ;No tests found in source.
@@ -24580,13 +24580,6 @@ 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"
@@ -24594,7 +24587,6 @@ 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")
@@ -35420,199 +35412,12 @@ 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
-             #: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))))))))
+             #:tests? #f))              ; no tests
      (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")
@@ -5521,7 +5521,7 @@ falling, themeable graphics and sounds, and replays.")
    (name "wesnoth")
    ;; Even-numbered minor versions indicate stable versions:
    ;; https://wiki.wesnoth.org/ReleasingWesnoth#Version_numbering
-    (version "1.18.7")
+    (version "1.18.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -5530,7 +5530,7 @@ falling, themeable graphics and sounds, and replays.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0hdrp4xm9d8kj8id2g5q0wwdwykx4a0f1cs8a7fghmv0czryfv7f"))))
+                "0cdlczxczqgzdaqwydb9gfgi7d9jc39li72p2rb5nk1rlgfff79s"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                  ;no test target
@@ -13508,8 +13508,8 @@ rules to solve permissions issues.")

 (define-public steam-devices-udev-rules
  ;; Last release from 2019-04-10
-  (let ((commit "7dde9ecb3c386363ecd9bd0a3b77e4756d200704")
-        (revision "2"))
+  (let ((commit "13443480a64fe8f10676606bd57da6de89f8ccb1")
+        (revision "1"))
    (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
-                  "0w0xkgi9fpvdbpl57f8fy2nwy2icm6iag39b8ifpkijlxgclx1p3"))))
+                  "0i086gmnk93q76sw1laa9br6b7zj2r6nrrw7d64y4q9wcrlxw2bi"))))
      (build-system copy-build-system)
      (arguments
       '(#:install-plan '(("./" "lib/udev/rules.d"
@@ -19,12 +19,10 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gkrellm)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
-  #:use-module (guix utils)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages pkg-config)
@@ -33,27 +31,32 @@
 (define-public gkrellm
  (package
    (name "gkrellm")
-    (version "2.5.1")
+    (version "2.3.11")
    (source
     (origin
-       (method url-fetch)
-       (uri (string-append "https://gkrellm.srcbox.net/releases/gkrellm-"
-                           version ".tar.bz2"))
-       (sha256
-        (base32 "0qvy2xmwmfy5f0g09yn9lr262shnx82ba04r5il2wj4qscg3r7h8"))))
+      (method url-fetch)
+      (uri (string-append "http://gkrellm.srcbox.net/releases/gkrellm-"
+                          version ".tar.bz2"))
+      (sha256
+       (base32 "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"))))
    (build-system gnu-build-system)
-    (inputs (list gtk+-2 libsm))
-    (native-inputs (list gettext-minimal pkg-config))
+    (inputs
+     `(("gettext" ,gettext-minimal)
+       ("gtk+" ,gtk+-2)
+       ("libice" ,libice)
+       ("libsm" ,libsm)))
+    (native-inputs
+     (list pkg-config))
    (arguments
-     (list
-      #:tests? #f ;there is no check target
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)) ;no configure script
-      #:make-flags
-      #~(list (string-append "INSTALLROOT=" #$output)
-              (string-append "CC=" #$(cc-for-target)))))
-    (home-page "https://gkrellm.srcbox.net/")
+     `(#:tests? #f                      ; there is no check target
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))           ; no configure script
+       #:make-flags
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "INSTALLROOT=" out)
+               "CC=gcc"))))
+    (home-page "http://gkrellm.srcbox.net/")
    (synopsis "System monitors")
    (description
     "GKrellM is a single process stack of system monitors which supports
@@ -2598,92 +2598,6 @@ 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")
@@ -165,14 +165,14 @@ tool to extract metadata from a file and print the results.")
 (define-public libmicrohttpd
  (package
   (name "libmicrohttpd")
-   (version "1.0.3")
+   (version "1.0.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
                                version ".tar.gz"))
            (sha256
             (base32
-              "0shj6kk4xp3k45vv696bzgx4s2jzpvhp11syck1zb70rmrxba5kq"))))
+              "1ix843yqhcl8d5gh5652pw2scx4p5n836ca80ymms5rl136lycnz"))))
   (build-system gnu-build-system)
   (arguments
    (list #:configure-flags
@@ -48,34 +48,6 @@
  #: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 "20260403000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-build-id "20260324000000") ;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.1")
+(define %icedove-version "140.9.0")

 ;; 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 "427d792f23672fc4adbe9436ce7dddbb2bfb287a")))
+          (changeset "8be9f2d3072c225a1e5f153745a18984c2babf8f")))
    (file-name (string-append "thunderbird-" %icedove-version "-checkout"))
    (sha256
     (base32
-      "09fj375a0zb5kgvw94f13997zhcj67a4g5ylpdbjzfql0chh572p"))
+      "04j35957x03m5x7mhh8zxa86mwjy0is2vb614sr4inkvvz4rs2hg"))
    (patches (search-patches "icedove-observer-fix.patch"))))

 ;;; To regenerate, see the `format-locales' helper defined above.
@@ -5790,7 +5790,7 @@ processing filters.")
 (define-public guile-pnm
  (package
    (name "guile-pnm")
-    (version "0.2.0")
+    (version "0.1.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 "06kgp1gh8hdj1j6w7i981prx93wfjpayrnjlydlzs7l5j04l4m3a"))))
+        (base32 "1yvsni4hll20g99zq4wl734f9i8gpjr1sqsnk3a93k2dd7b6ymac"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -4914,7 +4914,7 @@ transparently through a bridge.")
 (define-public libnl
  (package
    (name "libnl")
-    (version "3.12.0")
+    (version "3.7.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -4923,7 +4923,7 @@ transparently through a bridge.")
                    "/libnl-" version ".tar.gz"))
              (sha256
               (base32
-                "066xq01y2mx0xi7bwa5y6ciw1ygla15qdlzzyvyzb8zijrqwllgw"))))
+                "0faryrbvp0x4s2zhg5d78vd5q4w34lrr736gpm9wcwpaxv5krr4z"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("bison" ,bison)
@@ -4938,7 +4938,7 @@ transparently through a bridge.")
                 (string-join (string-split version #\.) "_")
                 "/libnl-doc-" version ".tar.gz"))
           (sha256
-            (base32 "18f14pdycghy6fcd27faqgh19zpam6b45s8bgsk85kb9wwzq3yd4"))))))
+            (base32 "1ra8xdf06q9hlsrnc1yz67xkp4kd9sd27ff02mlixixnyyjp32sp"))))))
    (outputs `("out" "doc"))
    (arguments
     `(#:phases
@@ -1,43 +0,0 @@
--- 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
-
@@ -1,29 +0,0 @@
-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:
@@ -1,299 +0,0 @@
-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
-
@@ -1,46 +0,0 @@
-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
-
@@ -0,0 +1,21 @@
+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,34 +472,6 @@ 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")
@@ -7883,7 +7883,7 @@ basic TCP/IP protocols.")
 (define-public python-geventhttpclient
  (package
    (name "python-geventhttpclient")
-    (version "2.3.9")
+    (version "2.3.3")
    (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
-                "1diq6n9sr92rsqbpxlbhbn1d22hrlzp6swykz9bfzh7sxpywa6j8"))))
+                "1ya0i0fbx054mfx5d1k75fcf64xzp7vva8lkwwzan41xbnc56nyj"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -10497,6 +10497,33 @@ 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)

@@ -19,7 +19,7 @@
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2023 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2024, 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Ghislain Vaillant <ghislain.vaillant@inria.fr>
 ;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
@@ -237,7 +237,7 @@ a server that supports the SSH-2 protocol.")
 (define-public openssh
  (package
   (name "openssh")
-   (version "10.3p1")
+   (version "10.2p1")
   (source
    (origin
      (method url-fetch)
@@ -245,7 +245,7 @@ a server that supports the SSH-2 protocol.")
                          "openssh-" version ".tar.gz"))
      (patches (search-patches "openssh-trust-guix-store-directory.patch"))
      (sha256
-       (base32 "1x25iv8yfcfpf3b1ap72indbfna0wz48xz8ny2sg9p4jpcv2ls2n"))))
+       (base32 "1clqyxh6mrbwjg964df0hjwmd361mxnx3nx17wk5jyck3422ri6c"))))
   (build-system gnu-build-system)
   (arguments
    (list
@@ -2051,10 +2051,7 @@ 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"))
-       (snippet
-        #~(begin (delete-file
-                   "crates/zed/resources/windows/bin/x64/OpenConsole.exe")))))
+                        "zed-0.225.10-use-mock-livekit-on-linux.patch"))))
    (build-system cargo-build-system)
    (arguments
     (list #:install-source? #f
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012-2017, 2019-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
-;;; Copyright © 2013, 2015, 2026 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner <efraim@flashner.co.il>
@@ -98,7 +98,7 @@
 (define-public libtasn1
  (package
    (name "libtasn1")
-    (version "4.21.0")
+    (version "4.20.0")
    (source
     (origin
      (method url-fetch)
@@ -106,7 +106,7 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "11ywcy8n115c8b3vmf7hmgkdhlfy4phlcwvp8114di9w495492hx"))))
+        "0v57hwsv4wijb0fvfp6s9jx35izhhgfjssq3fvpaxm029jyy7q4j"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags '("--disable-static")))
@@ -430,7 +430,7 @@ OpenSSL for TARGET."
 (define-public openssl-1.1
  (package
    (name "openssl")
-    (version "1.1.1w")
+    (version "1.1.1u")
    (source (origin
              (method url-fetch)
              (uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -443,7 +443,7 @@ OpenSSL for TARGET."
              (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
              (sha256
               (base32
-                "1j3anw4554lk3m9cvjngvh1c2gbdkhgiz160jnnm7n5l1jarhc6g"))))
+                "1ipbcdlqyxbj5lagasrq2p6gn0036wq6hqp7gdnd1v1ya95xiy72"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"        ;6.8 MiB of man3 pages and full HTML documentation
@@ -452,11 +452,14 @@ OpenSSL for TARGET."
    (arguments
     (list
      #:make-flags
-      (if (or (target-arm?) (target-riscv64?))
-          ;; 'test_afalg' seems to be dependent on kernel features:
-          ;; <https://github.com/openssl/openssl/issues/12242>.
-           #~(list "TESTS=-test_afalg")
-           #~(list))
+      ;; 'test_ssl_new.t' in 1.1.1n and 3.0.3 fails due to an expired
+      ;; certificate: <https://github.com/openssl/openssl/issues/18441>.  Skip
+      ;; it.
+      #~(list #$@(if (or (target-arm?) (target-riscv64?))
+                     ;; 'test_afalg' seems to be dependent on kernel features:
+                     ;; <https://github.com/openssl/openssl/issues/12242>.
+                     #~("TESTS=-test_afalg -tls_ssl_new")
+                     #~("TESTS=-test_ssl_new")))
      #:test-target "test"
      ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure,
      ;; so we explicitly disallow it here.
@@ -547,11 +550,10 @@ OpenSSL for TARGET."
    (license license:openssl)
    (home-page "https://www.openssl.org/")))

-(define-public openssl-3.5
-  ;; LTS series with EOL 2030-04-08
+(define-public openssl-3.0
  (package
-    (name "openssl")
-    (version "3.5.5")
+    (inherit openssl-1.1)
+    (version "3.0.8")
    (source (origin
              (method url-fetch)
              (uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -564,136 +566,38 @@ OpenSSL for TARGET."
              (patches (search-patches "openssl-3.0-c-rehash-in.patch"))
              (sha256
               (base32
-                "129aphl9yy5xd67cwacf000llkhpi1s8phmlhgws2rcb599r335j"))))
-    (build-system gnu-build-system)
-    (outputs '("out"
-               "doc"
-               "static"))
+                "0gjb7qjl2jnzs1liz3rrccrddxbk6q3lg8z27jn1xwzx72zx44vc"))))
    (arguments
-     (list
-      #:parallel-tests? #f
-      #:make-flags
-      (if (or (target-arm?) (target-riscv64?))
-          ;; 'test_afalg' seems to be dependent on kernel features:
-          ;; <https://github.com/openssl/openssl/issues/12242>.
-           #~(list "TESTS=-test_afalg")
-           #~(list))
-      #:test-target "test"
-      #:configure-flags
-        (if (system-hurd?)
-            (if (target-hurd64?)
-                #~(list "hurd-x86_64")
-                #~(list "hurd-x86"))
-            #~(list))
-      ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure,
-      ;; so we explicitly disallow it here.
-      #:disallowed-references (list (this-package-native-input "perl"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'configure
-            (lambda* (#:key configure-flags native-inputs inputs target #:allow-other-keys)
-              ;; It's not a shebang so patch-source-shebangs misses it.
-              (substitute* "config"
-                (("/usr/bin/env")
-                 (which "env")))
-              #$@(if (%current-target-system)
-                     #~((setenv "CROSS_COMPILE" (string-append target "-"))
-                        (setenv "CONFIGURE_TARGET_ARCH"
-                                #$(target->openssl-target
-                                   this-package
-                                   (%current-target-system))))
-                     #~())
-              ;; Configure PERL.
-              (setenv "HASHBANGPERL"
-                      (search-input-file (or native-inputs inputs)
-                                         "/bin/perl"))
-              (apply
-               invoke #$@(if (%current-target-system)
-                             #~("./Configure")
-                             #~("./config"))
-               "shared"                 ;build shared libraries
-               "--libdir=lib"
-
-               ;; The default for this catch-all directory is
-               ;; PREFIX/ssl.  Change that to something more
-               ;; conventional.
-               (string-append "--openssldir=" #$output
-                              "/share/openssl-"
-                              #$(package-version this-package))
-
-               (string-append "--prefix=" #$output)
-               (string-append "-Wl,-rpath," (string-append #$output "/lib"))
-               #$@(if (%current-target-system)
-                      #~((getenv "CONFIGURE_TARGET_ARCH"))
-                      #~())
-               configure-flags)
-              ;; Output the configure variables.
-              (invoke "perl" "configdata.pm" "--dump")))
-          (add-after 'install 'move-static-libraries
-            (lambda _
-              ;; Move static libraries to the "static" output.
-              (let* ((lib    (string-append #$output "/lib"))
-                     (slib   (string-append #$output:static "/lib")))
-                (for-each (lambda (file)
-                            (install-file file slib)
-                            (delete-file file))
-                          (find-files
-                           lib
-                           #$(if (target-mingw?)
-                                 '(lambda (filename _)
-                                    (and (string-suffix? ".a" filename)
-                                         (not (string-suffix? ".dll.a"
-                                                              filename))))
-                                 "\\.a$"))))))
-          (add-after 'install 'move-extra-documentation
-            (lambda _
-              ;; Move man pages and full HTML documentation to "doc".
-              (let* ((man    (string-append #$output "/share/man"))
-                     (html   (string-append #$output "/share/doc/openssl"))
-                     (man-target (string-append #$output:doc "/share/man"))
-                     (html-target (string-append
-                                   #$output:doc "/share/doc/openssl")))
-                (mkdir-p (dirname man-target))
-                (mkdir-p (dirname html-target))
-                (rename-file man man-target)
-                (rename-file html html-target))))
-          (add-after 'install 'remove-miscellany
-            (lambda _
-              ;; The 'misc' directory contains random undocumented shell and
-              ;; Perl scripts.  Remove them to avoid retaining a reference on
-              ;; Perl.
-              (delete-file-recursively
-               (string-append #$output "/share/openssl-"
-                              #$(package-version this-package) "/misc")))))))
-    (native-inputs (list perl))
-    (native-search-paths
-     (list $SSL_CERT_DIR $SSL_CERT_FILE))
-    (home-page "https://www.openssl.org/")
-    (synopsis "SSL/TLS implementation")
-    (description "OpenSSL is an implementation of SSL/TLS.")
+     (substitute-keyword-arguments (package-arguments openssl-1.1)
+       ((#:phases phases '%standard-phases)
+        #~(modify-phases #$phases
+            (add-before 'configure 'configure-perl
+              (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                (setenv "HASHBANGPERL"
+                        (search-input-file (or native-inputs inputs)
+                                           "/bin/perl"))))
+            #$@(if (target-hurd?)
+                   #~((delete 'patch-configure))
+                   #~())
+            #$@(if (target-hurd64?)
+                   #~((add-after 'unpack 'apply-hurd-patch
+                        (lambda _
+                          (let ((patch-file
+                                 #$(local-file
+                                    (search-patch "openssl-hurd64.patch"))))
+                            (invoke "patch" "--force" "-p1" "-i"
+                                    patch-file)))))
+                   #~())))
+       ((#:configure-flags flags #~'())
+        (if (system-hurd?)              ;must not be used when
+            #~(append #$flags           ;cross-compiling!
+                      #$(if (target-hurd64?)
+                            #~'("hurd-x86_64")
+                            #~'("hurd-x86")))
+            flags))))
    (license license:asl2.0)))

-(define-public openssl-3.0
-  ;; LTS series with EOL 2026-09-07
-  (package
-    (inherit openssl-3.5)
-    (version "3.0.19")
-    (source (origin
-              (method url-fetch)
-              (uri (list (string-append "https://www.openssl.org/source/openssl-"
-                                        version ".tar.gz")
-                         (string-append "ftp://ftp.openssl.org/source/"
-                                        "openssl-" version ".tar.gz")
-                         (string-append "ftp://ftp.openssl.org/source/old/"
-                                        (string-trim-right version char-set:letter)
-                                        "/openssl-" version ".tar.gz")))
-              (patches (search-patches "openssl-3.0-c-rehash-in.patch"
-                                       "openssl-hurd64.patch"))
-              (sha256
-               (base32
-                "0wihnr5bjdc3v0r4viwb1d1lf1rfkbrcmwzj7vjqpqdap11l2nps"))))))
-
-(define-public openssl openssl-3.5)
+(define-public openssl openssl-3.0)

 (define-public bearssl
  (package
@@ -917,7 +821,7 @@ certificates for free.")
                "0pfrpi77964cg15dm6y0w03l64xs0k2nqc15qh2xmv8vdnjyhywx"))
              (patches (search-patches "perl-net-ssleay-colon-parsing.patch"))))
    (build-system perl-build-system)
-    (inputs (list openssl-3.0))
+    (inputs (list openssl))
    (arguments
     `(#:phases
       (modify-phases %standard-phases
@@ -68,7 +68,6 @@
 ;;; 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.
 ;;;
@@ -92,7 +91,6 @@
  #: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)
@@ -113,7 +111,6 @@
  #:use-module (gnu packages bash)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages boost)
-  #:use-module (gnu packages build-tools)
  #:use-module (gnu packages check)
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
@@ -3522,74 +3519,6 @@ 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")
@@ -792,7 +792,7 @@ is based on Vim's builtin plugin support.")
 (define-public neovim
  (package
    (name "neovim")
-    (version "0.12.1")
+    (version "0.11.5")
    (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
-                "1lydhvm4abh2y3336nyqqbwiszllnw63c98wdna2mrhi44gfh2jf"))
+                "1b524vi44gkcsyy8w4jggvprwdsgy0gjprgxpyhh0dmqm47c0c48"))
              (patches (search-patches "neovim-tree-sitter-grammar-path.patch"))))
    (build-system cmake-build-system)
    (arguments
@@ -1017,10 +1017,7 @@ 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"))
-       ;; 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"))))
+        (base32 "0k98c0i14z3adx6l4ncf2zmzk9aykqkdnws6qw4m0yj5z61zh6av"))))
    (build-system pyproject-build-system)
    (native-inputs
     (list neovim
@@ -3863,7 +3863,7 @@ using @command{dmenu}.")
 (define-public fuzzel
  (package
    (name "fuzzel")
-    (version "1.14.1")
+    (version "1.14.0")
    (home-page "https://codeberg.org/dnkl/fuzzel")
    (source (origin
              (method git-fetch)
@@ -3871,7 +3871,7 @@ using @command{dmenu}.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1bk49fq66a0fr9danpj7vnq3dcfmrw1hdcc2ygqkld9z5lv1h5an"))))
+                "1fx1y430iwdjzba1rb6m56k3phvjn8di5v7d6rnxdqvm30085vpl"))))
    (build-system meson-build-system)
    (arguments
     (list #:build-type "release"
@@ -895,18 +895,16 @@ requirements.
 If @var{config} contains SMB mounts, adds samba-nmbd and samba-winbindd to the
 service requirements.
 "
-  (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)))))
+  (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)))))

 (define (autofs-shepherd-service config)
  (match-record config <autofs-configuration> (autofs timeout)
@@ -1,59 +0,0 @@
-;;; 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
@@ -1,125 +0,0 @@
-;;; 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,7 +2,6 @@
 ;;; 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.
 ;;;
@@ -141,9 +140,6 @@ 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)))