gnu: libgc: Add static output.

* gnu/packages/bdw-gc.scm (libgc)[arguments]<#:configure-flags>: Add
--enable-static.
<#:phases>: Add move-static-library phase.
[outputs]: Add static.

* gnu/packages/bdw-gc.scm (libgc/static-libs): Use define-deprecated/public-alias.
* gnu/packages/make-bootstrap.scm (make-guile-static): Use libgc:static.

Change-Id: If793d090dd34272a489f6175ac34fbc2c033072a

.forgejo/pull_request_template.md

@@ -28,13 +28,7 @@ Tick a box by changing it from [ ] to [x].
   - [ ] i586-gnu
 
 - Package **update**
-  - Closure size increase.
-```console
-$ guix size PACKAGE | tail -n1 # before
-total: ...
-$ ./pre-inst-env guix size PACKAGE | tail -n1 # after
-total: ...
-```
+  - Closure size increase after update (`./pre-inst-env guix size PACKAGE`).
   - Build status of direct dependents (`./pre-inst-env guix build -k -P1 PACKAGE ...`):
 ```text
 

.guix-authorizations

@@ -23,8 +23,6 @@
    (name "cbaines"))
   ("3CE4 6455 8A84 FDC6 9DB4  0CFB 090B 1199 3D9A EBB5"
    (name "civodul"))
-  ("838A FE0D 55DC 074E 360F  943A 84B6 9CE6 F3F6 B767"
-   (name "cnx"))
   ("CCB8 1842 F9D7 058E CD67  377A BF5C DF4D F6BF 6682"
    (name "csantosb"))
   ("510A 8628 E2A7 7678 8F8C  709C 4BC0 2592 5FF8 F4D3"

CODEOWNERS

@@ -347,6 +347,7 @@ guix/scripts/import/pypi\.scm                      @guix/python
 tests/import/pypi\.scm                             @guix/python
 tests/toml\.scm                                    @guix/python
 
+gnu/ci\.scm                                        @guix/qa-packages
 gnu/packages/benchmark\.scm                        @guix/qa-packages
 gnu/packages/check\.scm                            @guix/qa-packages
 gnu/packages/ci\.scm                               @guix/qa-packages

NEWS

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

doc/guix-cookbook.texi

@@ -1276,7 +1276,9 @@ definition in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm}:
   ;; Standard build phases, as a list of symbol/procedure pairs.
   (let-syntax ((phases (syntax-rules ()
                          ((_ p ...) `((p . ,p) ...)))))
-    (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack
+    (phases separate-from-pid1
+            set-GUIX_GCC_MANGLE_PREFIX_MAP set-SOURCE-DATE-EPOCH
+            set-paths install-locale unpack
             bootstrap
             patch-usr-bin-file
             patch-source-shebangs configure patch-generated-file-shebangs
@@ -1298,7 +1300,7 @@ Or from the REPL:
 (add-to-load-path "/path/to/guix/checkout")
 ,use (guix build gnu-build-system)
 (map car %standard-phases)
-@result{} (set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files make-dynamic-linker-cache install-license-files reset-gzip-timestamps compress-documentation)
+@result{} (separate-from-pid1 set-GUIX_GCC_MANGLE_PREFIX_MAP set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files make-dynamic-linker-cache install-license-files reset-gzip-timestamps compress-documentation)
 @end lisp
 
 If you want to know more about what happens during those phases, consult the

doc/guix.texi

@@ -2658,11 +2658,9 @@ bootloaders.
 
 Once you are done partitioning the target hard disk drive, you have to
 create a file system on the relevant partition(s)@footnote{Currently
-Guix System supports only ext4, btrfs, bcachefs, JFS, F2FS, and XFS
-file systems.  In particular, code that reads file system UUIDs and
-labels works only for these file system types.  For bcachefs, also add
-the @code{bcachefs-linux-module} to your @code{operating-system}'s
-@code{initrd-modules}.}.  For the ESP, if you have one and assuming it is
+Guix System only supports ext4, btrfs, JFS, F2FS, and XFS file systems.  In
+particular, code that reads file system UUIDs and labels only works for these
+file system types.}.  For the ESP, if you have one and assuming it is
 @file{/dev/sda1}, run:
 
 @example
@@ -27017,32 +27015,6 @@ Deprecated option.
 @end deftp
 
 
-@c %end of fragment
-
-@defvar gardenhostd-service-type
-Type for the service that runs gardenhostd, a partial implementation of
-the systemd-hostnamed daemon.  It provides the org.freedesktop.hostname1
-D-Bus interface, which helps applications like gnome-control-center
-retrieve and modify the system’s hostname, as well as set a pretty
-hostname for display.
-
-The value for this service is a @code{<gardenhostd-configuration>} object.
-@end defvar
-
-@c %start of fragment
-
-@deftp {Data Type} gardenhostd-configuration
-Available @code{gardenhostd-configuration} fields are:
-
-@table @asis
-@item @code{gardenhostd} (default: @code{gardenhostd}) (type: package)
-The gardenhostd package to use.
-
-@end table
-
-@end deftp
-
-
 @c %end of fragment
 
 @defvar accountsservice-service-type
@@ -36589,14 +36561,13 @@ in @code{Nginx}.  It is used to generate cat avatar from a seed, for instance
 the hash of a user's email address.
 
 @deffn {Procedure} cat-avatar-generator-service @
-       [#:cache-dir "/var/cache/cat-avatar-generator/"] @
+       [#:cache-dir "/var/cache/cat-avatar-generator"] @
        [#:package cat-avatar-generator] @
        [#:configuration (nginx-server-configuration)]
 Returns an nginx-server-configuration that inherits @code{configuration}.  It
 extends the nginx configuration to add a server block that serves @code{package},
 a version of cat-avatar-generator.  During execution, cat-avatar-generator will
-be able to use @code{cache-dir} as its cache directory, which must end
-with a slash, be created manually, and be writable by php-fpm.
+be able to use @code{cache-dir} as its cache directory.
 @end deffn
 
 A simple setup for cat-avatar-generator can look like this:
@@ -44272,11 +44243,10 @@ behind a reverse proxy and serve repositories from a custom location.
 (service fossil-service-type
          (fossil-configuration
           (repository "/srv/museum")
-          (list-repositories? #t)
+          (repo-list? #t)
           (base-url "https://museum.example")
-          (compress? #f)
-          (https? #t)
-          (socket-file "/var/run/fossil.sock")))
+          (socket-file "/var/run/fossil.sock")
+          (compress? #f)))
 @end lisp
 
 @deftp {Data Type} fossil-configuration

etc/news.scm

@@ -46,8 +46,7 @@
  (entry (commit "a7c8e68dc51144a6d3981b770aca9c4897fc7c0c")
         (title
          (en "Records can refer to inherited values of thunked fields")
-         (de "Vererbung in Verbundsobjekten erlaubt Verweise auf geerbte Werte verzögert ausgewerteter Felder")
-         (pt "Registros podem referir-se a valores herdados de campos ainda não evaluados (thunks)"))
+         (de "Vererbung in Verbundsobjekten erlaubt Verweise auf geerbte Werte verzögert ausgewerteter Felder"))
         (body
          (en "A new feature has been added to records—the facility used when
 defining packages, services, operating systems, and many other things—that,
@@ -115,42 +114,7 @@ Verbundstypen aus, die mit @code{define-record-type*} erstellt wurden:
 und so weiter.
 
 Hinweis: das ist eine inkompatible Änderung. Die neu eingeführte Bindung –
-@code{inputs} im obigen Beispiel – kann gleichnamige Bindungen überschatten.")
-         (pt "Um novo recurso foi adicionado aos registros - a ferramenta
-usada quando se definem pacotes, serviços, sistemas operacionais, e muitas
-outras coisas - que, quando herdados de outro registro, te permitem referir
-aos valores de campos herdados.  Durante a definição de variantes de pacotes,
-você pode encontrar este padrão:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs (package-inputs gdb)
-            (delete \"guile\"))))
-@end lisp
-
-Agora isto pode ser escrito desta forma:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs inputs ;<- Note a modificação
-            (delete \"guile\"))))
-@end lisp
-
-Dentro do corpo de @code{inputs}, o identificador @code{inputs} agora está
-atrelado ao @dfn{valor herdado} - id est, ap valor que este campo herda de
-@code{gdb}.  O mesmo mecanismo pode ser empregado ao modificar outros campos
-da entrada ou ao campo @code{arguments}.  É menos verboso mas também
-@uref{https://issues.guix.gnu.org/50335, é mais preciso}.
-
-Esta mudança se aplica aos campos \"thunk-ados\" de todos os tipos de registro
-produzidos por @code{define-record-type*}: @code{package}, @code{origin},
-@code{operating-system}, @code{home-environment}, e assim por diante.
-
-Note que esta é uma modificação incompatível: as ligações introduzidas
-recentemente - @code{inputs} no exemplo acima - podem sombrear ligações de
-mesmo nome.")))
+@code{inputs} im obigen Beispiel – kann gleichnamige Bindungen überschatten.")))
 
  (entry (commit "b52ce9041ad58aeababd2d50d3e72bc23dffff60")
         (title

etc/teams.scm

@@ -991,7 +991,8 @@ perl-build-system as well as the rakudo-build-system."
         #:description
         "Quality assurance software (CI/CD, testing, analysis;
 no direct relation to Guix's QA)."
-        #:scope (list "gnu/packages/benchmark.scm"
+        #:scope (list "gnu/ci.scm"
+                      "gnu/packages/benchmark.scm"
                       "gnu/packages/check.scm"
                       "gnu/packages/ci.scm"
                       "gnu/packages/code.scm"

gnu/build/file-systems.scm

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2018, 2020-2022, 2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@@ -1455,14 +1455,9 @@ corresponds to the symbols listed in FLAGS."
                (raise c)))
             ((system-error? c)
              (format (current-error-port)
-                     "could not mount partition '~a': ~a~%"
+                     "could not mount partition ~a: ~a~%"
                      (file-system-device fs)
-                     (string-trim-both
-                      (call-with-output-string
-                        (lambda (port)
-                          (print-exception port #f
-                                           (exception-kind c)
-                                           (exception-args c))))))
+                     (exception-message c))
              (unless (file-system-mount-may-fail? fs)
                (raise c))))
       (let* ((type    (file-system-type fs))

gnu/home/services/niri.scm

@@ -19,7 +19,6 @@
 (define-module (gnu home services niri)
   #:use-module (gnu home services)
   #:use-module (gnu home services shepherd)
-  #:use-module (gnu home services desktop)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
@@ -41,15 +40,14 @@
 
 (define (home-niri-shepherd-service config)
   "Return a shepherd service that runs Niri, a scrollable tiling Wayland
-compositor.  The service starts Niri with appropriate environment variables
-set for a Wayland desktop session."
+compositor.  The service starts Niri in a DBus session with appropriate
+environment variables set for a Wayland desktop session."
   (list (shepherd-service
           (documentation "Run Niri scrollable tiling Wayland compositor.")
           (provision '(niri))
-          (requirement '(dbus))
           (start #~(make-forkexec-constructor
                     (list #$(file-append bash "/bin/bash") "-l"
-                          "-c" "exec niri --session")
+                          "-c" "exec dbus-run-session niri --session")
                     #:environment-variables
                     (append (list #$@(niri-configuration-environment-variables config))
                             '("DESKTOP_SESSION=niri"
@@ -68,8 +66,6 @@ set for a Wayland desktop session."
    (extensions
     (list (service-extension home-shepherd-service-type
                              home-niri-shepherd-service)
-          (service-extension home-dbus-service-type
-                             (const '()))
           (service-extension home-profile-service-type
                              (lambda (config)
                                (list dbus

gnu/local.mk

@@ -75,6 +75,7 @@
 # Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 # Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 # Copyright © 2025 bdunahu <bdunahu@operationnull.com>
+# Copyright © 2025 Nikita Mitasov <me@ch4og.com>
 #
 # This file is part of GNU Guix.
 #
@@ -1063,6 +1064,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/binutils-loongson-workaround.patch	\
   %D%/packages/patches/binutils-mingw-w64-deterministic.patch	\
   %D%/packages/patches/binutils-2.41-fix-cross.patch		\
+  %D%/packages/patches/binutils-reproducible-tar.patch		\
   %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch	\
   %D%/packages/patches/bmake-run-check-separately.patch	\
   %D%/packages/patches/boolector-find-googletest.patch	\
@@ -1318,6 +1320,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/flatpak-fix-fonts-icons.patch	\
   %D%/packages/patches/flatpak-fix-icon-validation.patch	\
   %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch	\
+  %D%/packages/patches/flex-fix-make-dependencies.patch         \
   %D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch	\
   %D%/packages/patches/fluxbox-1.3.7-gcc.patch			\
   %D%/packages/patches/fmt-9-overspecified-tests.patch	\
@@ -1375,6 +1378,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gcc-fix-texi2pod.patch			\
   %D%/packages/patches/gcc-hurd-split-stack.patch 		\
   %D%/packages/patches/gcc-libstdc++-newer-gcc.patch		\
+  %D%/packages/patches/gcc-mangle-guix-store.patch		\
   %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch		\
   %D%/packages/patches/gcc-4.9-inline.patch		\
   %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch		\
@@ -1442,7 +1446,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghc-basement-fix-32-bit.patch		\
   %D%/packages/patches/ghc-testsuite-dlopen-pie.patch		\
   %D%/packages/patches/ghc-testsuite-grep-compat.patch		\
-  %D%/packages/patches/ghc-testsuite-recomp015-execstack.patch	\
   %D%/packages/patches/ghc-aeson-encodeDouble.patch		\
   %D%/packages/patches/ghc-basement-fix-32bit.patch		\
   %D%/packages/patches/ghc-bytestring-handle-ghc9.patch	\
@@ -1484,6 +1487,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/glibc-cross-objdump.patch		\
   %D%/packages/patches/glibc-dl-cache.patch			\
   %D%/packages/patches/glibc-guix-locpath.patch			\
+  %D%/packages/patches/glibc-fix-path-attribute-in-getconf.patch \
   %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch	\
   %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch	\
   %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch	\
@@ -1754,7 +1758,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
   %D%/packages/patches/laby-make-install.patch			\
   %D%/packages/patches/laby-use-tmpdir-from-runtime.patch	\
-  %D%/packages/patches/ldc-i686-int128-alignment.patch 		\
   %D%/packages/patches/ldns-drill-examples.patch		\
   %D%/packages/patches/leela-zero-gtest.patch			\
   %D%/packages/patches/less-hurd-path-max.patch			\
@@ -1825,8 +1828,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/libtiff-CVE-2022-34526.patch		\
   %D%/packages/patches/libtirpc-CVE-2021-46828.patch		\
   %D%/packages/patches/libtirpc-hurd.patch			\
-  %D%/packages/patches/libtool-grep-compat.patch		\
-  %D%/packages/patches/libtool-skip-tests2.patch		\
   %D%/packages/patches/libtree-fix-check-non-x86.patch		\
   %D%/packages/patches/libusb-0.1-disable-tests.patch		\
   %D%/packages/patches/libusb-for-axoloti.patch			\
@@ -1976,7 +1977,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/netsurf-y2038-tests.patch		\
   %D%/packages/patches/netsurf-longer-test-timeout.patch	\
   %D%/packages/patches/nhc98-c-update.patch			\
-  %D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch	\
   %D%/packages/patches/nix-dont-build-html-doc.diff		\
   %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch	\
   %D%/packages/patches/network-manager-plugin-ownership.patch	\
@@ -2469,7 +2469,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/t4k-common-libpng16.patch		\
   %D%/packages/patches/tao-add-missing-headers.patch		\
   %D%/packages/patches/tao-fix-parser-types.patch		\
-  %D%/packages/patches/tao-synth-include-string-you-use.patch		\
   %D%/packages/patches/tar-remove-wholesparse-check.patch	\
   %D%/packages/patches/tar-skip-unreliable-tests.patch		\
   %D%/packages/patches/taskwarrior-link-taskchampion-cpp-with-sqlite3.patch \

gnu/packages.scm

@@ -518,9 +518,8 @@ return its return value."
                 (location->string (package-location pkg))))
      (match (package-superseded pkg)
        ((? package? new)
-        (unless (assoc-ref (package-properties pkg) 'supress-supersession-info?)
-          (info (G_ "package '~a' has been superseded by '~a'~%")
-                (package-name pkg) (package-name new)))
+        (info (G_ "package '~a' has been superseded by '~a'~%")
+              (package-name pkg) (package-name new))
         new)
        (#f
         pkg)))

gnu/packages/acl.scm

@@ -43,7 +43,7 @@
 (define-public acl
   (package
     (name "acl")
-    (version "2.3.1")
+    (version "2.3.2")
     (source
      (origin
       (method url-fetch)
@@ -51,7 +51,7 @@
                           version ".tar.gz"))
       (sha256
        (base32
-        "1bqi7hj0xkpivwg7lx5cv3yvs9ks1i6azvpgbvfpzcq1i736233n"))))
+        "0z1gi82zc2xcbchfagd7apn2s7camaagj8y6hmysl1wpcanxnasz"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((ice-9 ftw)

gnu/packages/admin.scm

@@ -4988,16 +4988,16 @@ Python loading in HPC environments.")
   (let ((real-name "inxi"))
     (package
       (name "inxi-minimal")
-      (version "3.3.40-1")
+      (version "3.3.31-2")
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://codeberg.org/smxi/inxi")
+               (url "https://github.com/smxi/inxi")
                (commit version)))
          (file-name (git-file-name real-name version))
          (sha256
-          (base32 "0ivj0dcx7d2hmmkhyql156sb08385rzw640z9kyq4cv1n8ndz58s"))))
+          (base32 "1fca5minalpmizbxh5kmjiv8xrl7k6g91zn8d84fxmbhsk8vn3kk"))))
       (build-system trivial-build-system)
       (inputs
        (list bash-minimal
@@ -5023,8 +5023,8 @@ Python loading in HPC environments.")
            (copy-recursively (assoc-ref %build-inputs "source")
                              ,(string-append real-name "-" version))
            (with-directory-excursion ,(string-append real-name "-" version)
-             (patch-shebang "inxi" (list (dirname (search-input-file
-                                                    %build-inputs "bin/perl"))))
+             (with-fluids ((%default-port-encoding #f))
+               (substitute* "inxi" (("/usr/bin/env perl") (which "perl"))))
              (let ((bin (string-append %output "/bin")))
                (install-file "inxi" bin)
                (wrap-program (string-append bin "/inxi")
@@ -5039,8 +5039,7 @@ Python loading in HPC environments.")
                                    ((member name '("util-linux"))
                                     (string-append (store-append "/bin") ":"
                                                    (store-append "/sbin")))
-                                   ((member name '("dmidecode" "iproute2" "lvm2"
-                                                   "mdadm"))
+                                   ((member name '("dmidecode" "iproute2"))
                                     (store-append "/sbin"))
                                    (else (store-append "/bin")))))))
                            %build-inputs)))
@@ -5068,7 +5067,6 @@ support forum.  It runs with the @code{/exec} command in most IRC clients.")
     (name "inxi")
     (inputs
      `(("dmidecode" ,dmidecode)
-       ("eudev" ,eudev)
        ("file" ,file)
        ("bind:utils" ,isc-bind "utils") ; dig
        ("gzip" ,gzip)
@@ -5094,14 +5092,11 @@ support forum.  It runs with the @code{/exec} command in most IRC clients.")
        ("perl-time-hires" ,perl-time-hires)
        ("lvm2" ,lvm2)                   ; lvs
        ("mdadm" ,mdadm)
-       ("wayland-utils" ,wayland-utils)
        ;; TODO: Add more inputs:
        ;; ipmi-sensors
        ;; hddtemp
        ;; perl-xml-dumper
        ;; ipmitool
-       ;; wlr-randr
-       ;; vulkan-tools
        ,@(package-inputs inxi-minimal)))))
 
 (define-public pscircle
@@ -5607,61 +5602,69 @@ representation to stdout.")
 (define-public hosts
   (package
     (name "hosts")
-    (version "3.6.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/xwmx/hosts")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1kzd4lxlflam87dhbx1jx7bj6v6sa4f2024mfxj2768kp9qapraj"))))
-    (build-system copy-build-system)
-    (native-inputs
-     (list bats)) ;for tests
+    (version "3.6.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/xwmx/hosts")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1ni4z89kxzgwm26hhx908g04f2h0fypy7lgfa0rvsz8d0wslgcsn"))))
+    (build-system trivial-build-system)
     (inputs
-     (list gawk
-           bash-minimal
-           coreutils
-           diffutils
-           grep
-           ncurses ;for tput
-           sed))
+     `(("bats" ,bats) ;for test
+       ("awk" ,gawk)
+       ("bash" ,bash)
+       ("coreutils" ,coreutils)
+       ("diffutils" ,diffutils)
+       ("grep" ,grep)
+       ("ncurses" ,ncurses) ;tput
+       ("sed" ,sed)))
     (arguments
-     (list
-      #:install-plan
-      #~'(("hosts" "bin/hosts")
-          ("etc/hosts-completion.bash" "/etc/bash_completion.d/hosts")
-          ("etc/hosts-completion.zsh" "/share/zsh/site-functions/_hosts")
-          ("README.md"
-           #$(string-append "/share/doc/" name "-" version "/README.md")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-hosts
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "test/test_helper.bash"
-                (("export _HOSTS=.*")
-                 (string-append "export _HOSTS=" #$output "/bin/hosts")))
-              (substitute* (cons* "hosts"
-                            ;; *.bash and *.bats.
-                            (find-files "test" "\\.bat?sh?.*$"))
-                (("\\btput\\b") (search-input-file inputs "bin/tput"))
-                (("\\bsed\\b") (search-input-file inputs "bin/sed"))
-                (("\\bawk\\b") (search-input-file inputs "bin/awk"))
-                (("\\bgrep\\b") (search-input-file inputs "bin/grep"))
-                (("\\bdiff\\b") (search-input-file inputs "bin/diff"))
-                (("\\bcp\\b") (search-input-file inputs "bin/cp"))
-                (("\\bchmod\\b") (search-input-file inputs "bin/chmod")))))
-          (add-after 'install 'check
-            (lambda* (#:key tests? inputs #:allow-other-keys)
-              (if tests?
-                  (begin
-                    (delete-file "hosts") ;Ensure installed hosts is checked.
-                    (setenv "PATH" "") ;Ensure substitutions were correct.
-                    (setenv "TERM" "linux") ;Set to tty for test.
-                    (invoke (search-input-file inputs "/bin/bats")
-                            "test"))))))))
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         ;; copy source
+         (copy-recursively (assoc-ref %build-inputs "source") ".")
+         ;; patch-shebang phase
+         (setenv "PATH"
+                 (string-append (assoc-ref %build-inputs "bash") "/bin"
+                                ":" (assoc-ref %build-inputs "awk") "/bin"
+                                ":" (assoc-ref %build-inputs "coreutils") "/bin"
+                                ":" (assoc-ref %build-inputs "diffutils") "/bin"
+                                ":" (assoc-ref %build-inputs "grep") "/bin"
+                                ":" (assoc-ref %build-inputs "ncurses") "/bin"
+                                ":" (assoc-ref %build-inputs "sed") "/bin"
+                                ":" "/run/privileged/bin"
+                                ":" (getenv "PATH")))
+         (substitute* "hosts"
+           (("#!/usr/bin/env bash")
+            (string-append "#!" (which "bash")
+                           "\nPATH=" (getenv "PATH"))))
+         ;; check phase
+         (setenv "TERM" "linux") ;set to tty for test
+         (invoke (search-input-file %build-inputs "/bin/bats")
+                 "test")
+         ;; install phase
+         (install-file "hosts" (string-append %output "/bin"))
+         (let ((bash-completion
+                (string-append %output "/etc/bash_completion.d")))
+           (mkdir-p bash-completion)
+           (copy-file "etc/hosts-completion.bash"
+                      (string-append bash-completion "/hosts")))
+         (let ((zsh-completion
+                (string-append %output "/share/zsh/site-functions")))
+           (mkdir-p zsh-completion)
+           (copy-file "etc/hosts-completion.zsh"
+                      (string-append zsh-completion "/_hosts")))
+         (let ((doc (string-append %output "/share/doc/" ,name "-" ,version)))
+           (mkdir-p doc)
+           (install-file "LICENSE" doc)
+           (install-file "README.md" doc))
+         #t)))
     (home-page "https://github.com/xwmx/hosts/")
     (synopsis "Script for editing a foreign distro's @file{/etc/hosts} file")
     (description "Hosts is a command line program for managing

gnu/packages/adns.scm

@@ -4,7 +4,6 @@
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,51 +21,49 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages adns)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages m4)
-  #:use-module (gnu packages pkg-config)
+  #:use-module (guix gexp)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix utils))
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages pkg-config))
 
 (define-public adns
   (package
     (name "adns")
     (version "1.6.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
-              (commit (string-append "adns-" version))))
-       (sha256
-        (base32
-         "0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
+    (source (origin
+              (method url-fetch)
+              (uri (list (string-append "mirror://gnu/adns/adns-"
+                                        version ".tar.gz")
+                         (string-append
+                           "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-"
+                           version ".tar.gz")))
+              (sha256
+               (base32
+                "1k81sjf0yzv6xj35vcxp0ccajxrhhmyly7a57xlbs1kmkdwb6f3i"))))
     (build-system gnu-build-system)
     (arguments
-     (list
-      ;; INFO: Tests expect real name resolution to work.
-      #:tests? #f
-      #:configure-flags
-      #~(list
-         ;; Make sure the programs under bin/ find libadns.so.
-         (string-append "LDFLAGS=-Wl,-rpath -Wl,"
-                        #$output:out
-                        "/lib"))))
+     ;; Make sure the programs under bin/ fine libadns.so.
+     '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
+                                              (assoc-ref %outputs "out")
+                                              "/lib"))
+
+       ;; XXX: Tests expect real name resolution to work.
+       #:tests? #f))
     (native-inputs
      (list m4))
     (home-page "https://www.gnu.org/software/adns/")
     (synopsis "Asynchronous DNS client library and utilities")
     (description
-     "GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
-Name System} resolution functionality.  The library is asynchronous, allowing
-several concurrent calls.  The package also includes several command-line
-utilities for use in scripts.")
-    (license license:gpl3+)))
+     "GNU adns is a C library that provides easy-to-use DNS resolution
+functionality.  The library is asynchronous, allowing several concurrent
+calls.  The package also includes several command-line utilities for use in
+scripts.")
+    (license gpl3+)))
 
 (define-public c-ares
   (package
@@ -149,7 +146,7 @@ asynchronously.  It is intended for applications which need to perform DNS
 queries without blocking, or need to perform multiple DNS queries in parallel.
 The primary examples of such applications are servers which communicate with
 multiple clients and programs with graphical user interfaces.")
-    (license (license:x11-style "https://c-ares.haxx.se/license.html"))))
+    (license (x11-style "https://c-ares.haxx.se/license.html"))))
 
 (define-public c-ares-for-node-lts
   (hidden-package c-ares))

gnu/packages/audio.scm

@@ -42,7 +42,7 @@
 ;;; Copyright © 2022 Andy Tai <atai@atai.org>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
 ;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
-;;; Copyright © 2023, 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com>
@@ -2316,13 +2316,13 @@ object library.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1jds2l3cb96b02jxd7lmrjjl9s7mylnrvg6fpw0j8c141bk8vyg3"))
-                (patches
-                 (search-patches "tao-synth-include-string-you-use.patch"))))
+                  "1jds2l3cb96b02jxd7lmrjjl9s7mylnrvg6fpw0j8c141bk8vyg3"))))
       (build-system cmake-build-system)
       (arguments (list #:tests? #false))  ;there are no tests
       (inputs
        (list glfw freeglut))
+      (native-inputs
+       (list gcc-7))
       (home-page "https://github.com/lucasw/tao_synth")
       (synopsis "Sound synthesis with physical models")
       (description "Tao is a software package for sound synthesis using physical
@@ -6358,59 +6358,6 @@ It is currently fairly complete for PCM devices, and has some support for
 mixers.")
     (license license:psfl)))
 
-(define-public python-pyo
-  (package
-    (name "python-pyo")
-    (version "1.0.6")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/belangeo/pyo")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1igz75kv94dav28rzz19gckgfgdli05q5ghadlvm03ia7xd9l5zm"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-     ;; TODO: collecting ... Fatal Python error: Segmentation fault
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'sanity-check 'set-HOME
-            (lambda _
-              (setenv "HOME" "/tmp"))))))
-    (native-inputs
-     (list python-pytest
-           python-setuptools))
-    (inputs
-     (list liblo
-           libsndfile
-           portaudio
-           portmidi))
-    (propagated-inputs
-     (list python-wxpython))
-    (home-page "https://github.com/belangeo/pyo")
-    (synopsis "Python module to build digital signal processing program")
-    (description
-     "pyo is a Python module containing classes for a wide variety of audio
-signal processing types.
-
-With pyo, user will be able to include signal processing chains directly in
-Python scripts or projects, and to manipulate them in real time through the
-interpreter.  Tools in pyo module offer primitives, like mathematical
-operations on audio signal, basic signal processing (filters, delays,
-synthesis generators, etc.), but also complex algorithms to create sound
-granulation and others creative audio manipulations.
-
-pyo supports OSC protocol (Open Sound Control), to ease communications between
-softwares, and MIDI protocol, for generating sound events and controlling
-process parameters.  pyo allows creation of sophisticated signal processing
-chains with all the benefits of a mature, and widely used, general programming
-language.")
-    (license license:lgpl3+)))
-
 (define-public ldacbt
   (package
     (name "ldacbt")
@@ -8173,7 +8120,7 @@ and DSD streams.")
 (define-public qpwgraph
   (package
     (name "qpwgraph")
-    (version "1.0.0")
+    (version "0.9.9")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -8182,7 +8129,7 @@ and DSD streams.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0l3fflfpwkqy4iif8ifzzr3yy39ahzqdixx5g3rhj3zzbaysj73h"))))
+                "03001pvcbvr206k00751232gm50x1icf086z8c5hiakl2ym79gwl"))))
     (build-system cmake-build-system)
     (arguments
      (list #:tests? #f))                ; no tests

gnu/packages/autotools.scm

@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2012-2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2018, 2020-2022, 2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org>
@@ -157,7 +157,7 @@ know anything about Autoconf or M4.")
        (base32
         "0niz4852fgyavfh3gr4h4kzalk01nk70v6vfsja6r3ap349mr25s"))))))
 
-(define-public autoconf autoconf-2.69)
+(define-public autoconf autoconf-2.72)
 
 (define-public autoconf-2.68
   (package (inherit autoconf)
@@ -438,14 +438,14 @@ Makefile, simplifying the entire process for the developer.")
 (define-public automake
   (package/inherit automake-1.16.5
     (name "automake")
-    (version "1.17")
+    (version "1.18.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/automake/automake-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "146rkdcwri2dkwn3pjrjs9v0wm4xyav9vvq4yw5vj4qy87yc2849"))
+                "11v8ckqx7z8hv4mq9dnhg58cwnssaa7l9136yndbhlc34xis72hn"))
               (patches
                (search-patches "automake-skip-amhello-tests.patch"))))
     (arguments
@@ -483,16 +483,14 @@ Makefile, simplifying the entire process for the developer.")
 (define-public libtool
   (package
     (name "libtool")
-    (version "2.4.7")
+    (version "2.5.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/libtool/libtool-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0pb3l4x37k6fj1lwnpzws55gi3pxl0hx56jm4bzmbrkw0mzj2zsg"))
-              (patches (search-patches "libtool-skip-tests2.patch"
-                                       "libtool-grep-compat.patch"))))
+                "0xb64rhambx6mhxwr613xgyad7ybs5hgmpmd9gccf2vbcrh5h7zq"))))
     (build-system gnu-build-system)
     (propagated-inputs (list m4))
     (native-inputs
@@ -506,43 +504,59 @@ Makefile, simplifying the entire process for the developer.")
            autoconf-wrapper))   ; others on 'autom4te'
 
     (arguments
-     `(;; Libltdl is provided as a separate package, so don't install it here.
-       #:configure-flags '("--disable-ltdl-install")
+     (list ;; Libltdl is provided as a separate package, so don't install it here.
+           #:configure-flags #~'("--disable-ltdl-install")
 
-       ;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
-       ;; <http://hydra.gnu.org/build/181662>.
-       ;; Also, do not run tests when cross compiling
-       #:tests? ,(not (or (%current-target-system)
-                          (string-prefix? "mips64"
-                                          (%current-system))))
+           ;; The 'libtool' script refers to the toolchain; tolerate it.
+           #:disallowed-references '()
 
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'pre-check
-           (lambda* (#:key inputs native-inputs parallel-tests? #:allow-other-keys)
-             ;; Run the test suite in parallel, if possible.
-             (setenv "TESTSUITEFLAGS"
-                     (string-append
-                      "-j"
-                      (if parallel-tests?
-                        (number->string (parallel-job-count))
-                        "1")))
-           ;; Patch references to /bin/sh.
-           (let ((/bin/sh (search-input-file (or native-inputs inputs) "bin/sh")))
-             (substitute* "tests/testsuite"
-               (("/bin/sh") /bin/sh)))))
-         ;; These files may be copied into source trees by libtoolize,
-         ;; therefore they must not point to store file names that would be
-         ;; leaked with tarballs generated by make dist.
-         (add-after 'install 'restore-build-aux-shebang
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (dir (string-append out "/share/libtool/build-aux")))
-               (for-each (lambda (file)
-                           (format #t "restoring shebang on `~a'~%" file)
-                           (substitute* file
-                             (("^#!.*/bin/sh") "#!/bin/sh")))
-                         (find-files dir))))))))
+           ;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
+           ;; <http://hydra.gnu.org/build/181662>.
+           ;; Also, do not run tests when cross compiling
+           #:tests? (not (or (%current-target-system)
+                             (string-prefix? "mips64"
+                                             (%current-system))))
+
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'skip-some-tests-on-extra-archs
+                 (lambda _
+                   (with-directory-excursion "tests"
+                     (substitute* '("demo.at" "testsuite")
+                       (("hppa\\*\\|amd64\\*\\|x86_64\\*\\|s390\\*"
+                         all)
+                        (string-append all "|arm*|mips*|riscv*"))))))
+               (add-before 'check 'pre-check
+                 (lambda* (#:key inputs native-inputs parallel-tests?
+                           #:allow-other-keys)
+                   ;; Run the test suite in parallel, if possible.
+                   (setenv "TESTSUITEFLAGS"
+                           (string-append
+                            "-j"
+                            (if parallel-tests?
+                                (number->string (parallel-job-count))
+                                "1")))
+                   ;; Patch references to /bin/sh.
+                   (let ((/bin/sh (search-input-file (or native-inputs inputs)
+                                                     "bin/sh")))
+                     (substitute* "tests/testsuite"
+                       (("/bin/sh")
+                        /bin/sh)))))
+               ;; These files may be copied into source trees by libtoolize,
+               ;; therefore they must not point to store file names that would be
+               ;; leaked with tarballs generated by make dist.
+               (add-after 'install 'restore-build-aux-shebang
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out"))
+                          (dir (string-append out
+                                              "/share/libtool/build-aux")))
+                     (for-each (lambda (file)
+                                 (format #t "restoring shebang on `~a'~%"
+                                         file)
+                                 (substitute* file
+                                   (("^#!.*/bin/sh")
+                                    "#!/bin/sh")))
+                               (find-files dir))))))))
 
     (synopsis "Generic shared library support tools")
     (description

gnu/packages/base.scm

@@ -24,6 +24,7 @@
 ;;; Copyright © 2022, 2026 John Kehayias <john@guixotic.coop>
 ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
 ;;; Copyright © 2024, 2025 Zheng Junjie <z572@z572.online>
+;;; Copyright © 2025 Nikita Mitasov <me@ch4og.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -119,14 +120,14 @@ command-line arguments, multiple languages, and so on.")
 (define-public grep
   (package
    (name "grep")
-   (version "3.11")
+   (version "3.12")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/grep/grep-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "1avf4x8skxbqrjp5j2qr9sp5vlf8jkw2i5bdn51fl3cxx3fsxchx"))
+              "1f87i907dzw31xy1xr8xjj6z9979qq3bwmypvkm35rlh1ryb4j96"))
             (patches (search-patches "grep-timing-sensitive-test.patch"))))
    (build-system gnu-build-system)
    (native-inputs (list perl))                   ;some of the tests require it
@@ -247,47 +248,49 @@ implementation offers several extensions over the standard utility.")
    (build-system gnu-build-system)
    ;; Note: test suite requires ~1GiB of disk space.
    (arguments
-    `(,@(cond
-          ((target-hurd?)
-           '(#:make-flags
-             (list (string-append
-                     "TESTSUITEFLAGS= -k '"
-                     "!sparse"
-                     ",!renamed dirs in incrementals"
-                     ",!--exclude-tag option in incremental pass"
-                     ",!incremental dumps with -C"
-                     ",!incremental dumps of nested directories"
-                     ",!incremental restores with -C"
-                     ",!concatenated incremental archives (renames)"
-                     ",!renamed directory containing subdirectories"
-                     ",!renamed subdirectories"
-                     ",!chained renames"
-                     ",!Directory"
-                     "'"))))
-          ;; 'storing sparse files > 8G' fails on powerpc-linux, likely
-          ;; due to the small HDD and RAM present on these devices.
-          ((target-ppc32?)
-           '(#:make-flags (list (string-append "TESTSUITEFLAGS= -k "
-                                               "'!tricky time stamps"
-                                               ",!storing sparse files > 8G'"))))
-          ;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
-          ;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
-          ;; skipping the test for this release on 32-bit systems.
-          ((target-32bit?)
-           '(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
-          (else '()))
-      ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
-      ,@(if (target-hurd32?)
-            (list #:configure-flags ''("--disable-year2038"))
-            '())
-      #:phases (modify-phases %standard-phases
-                 (add-before 'build 'set-shell-file-name
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     ;; Do not use "/bin/sh" to run programs.
-                     (let ((bash (assoc-ref inputs "bash")))
-                       (substitute* "src/system.c"
-                         (("/bin/sh")
-                          (string-append bash "/bin/sh")))))))))
+    (append
+     (cond
+      ((target-hurd?)
+       '(#:make-flags
+         (list (string-append
+                "TESTSUITEFLAGS= -k '"
+                "!sparse"
+                ",!renamed dirs in incrementals"
+                ",!--exclude-tag option in incremental pass"
+                ",!incremental dumps with -C"
+                ",!incremental dumps of nested directories"
+                ",!incremental restores with -C"
+                ",!concatenated incremental archives (renames)"
+                ",!renamed directory containing subdirectories"
+                ",!renamed subdirectories"
+                ",!chained renames"
+                ",!Directory"
+                "'"))))
+      ;; 'storing sparse files > 8G' fails on powerpc-linux, likely
+      ;; due to the small HDD and RAM present on these devices.
+      ((target-ppc32?)
+       '(#:make-flags (list (string-append "TESTSUITEFLAGS= -k "
+                                           "'!tricky time stamps"
+                                           ",!storing sparse files > 8G'"))))
+      ;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
+      ;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
+      ;; skipping the test for this release on 32-bit systems.
+      ((not (target-64bit?))
+       '(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
+      (else '()))
+     ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
+     (if (target-hurd32?)
+         (list #:configure-flags #~(list "--disable-year2038"))
+         '())
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'set-shell-file-name
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Do not use "/bin/sh" to run programs.
+              (substitute* "src/system.c"
+                (("/bin/sh")
+                 (search-input-file inputs "bin/sh")))))))))
 
    ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able
    ;; to refer to the target Bash.
@@ -306,41 +309,8 @@ standard utility.")
    (license gpl3+)
    (home-page "https://www.gnu.org/software/tar/")))
 
-;;; TODO: Replace/merge with 'patch' on core-updates.
-(define-public patch/pinned
-  (hidden-package
-   (package
-     (name "patch")
-     (version "2.7.6")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append "mirror://gnu/patch/patch-"
-                                   version ".tar.xz"))
-               (sha256
-                (base32
-                 "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"))
-               (patches (search-patches "patch-hurd-path-max.patch"))))
-     (build-system gnu-build-system)
-     (arguments
-      ;; Work around a cross-compilation bug whereby libpatch.a would provide
-      ;; '__mktime_internal', which conflicts with the one in libc.a.
-      (if (%current-target-system)
-          `(#:configure-flags '("gl_cv_func_working_mktime=yes"))
-          '()))
-     (native-inputs (list ed))
-     (synopsis "Apply differences to originals, with optional backups")
-     (description
-      "Patch is a program that applies changes to files based on differences
-laid out as by the program \"diff\".  The changes may be applied to one or more
-files depending on the contents of the diff file.  It accepts several
-different diff formats.  It may also be used to revert previously applied
-differences.")
-     (license gpl3+)
-     (home-page "https://savannah.gnu.org/projects/patch/"))))
-
 (define-public patch
   (package
-    (inherit patch/pinned)
     (name "patch")
     (version "2.8")
     (source (origin
@@ -350,13 +320,27 @@ differences.")
               (sha256
                (base32
                 "1qssgwgy3mfahkpgg99a35gl38vamlqb15m3c2zzrd62xrlywz7q"))))
+    (build-system gnu-build-system)
     (arguments
-     (substitute-keyword-arguments (package-arguments patch/pinned)
-       ((#:configure-flags flags #~'())
-        (if (target-hurd32?)
-            #~(cons* "--disable-year2038"
-                     #$flags)
-            flags))))
+     (list
+      #:configure-flags
+      #~(append
+         (if #$(%current-target-system)
+             (list "gl_cv_func_working_mktime=yes")
+             '())
+         (if #$(target-hurd32?)
+             (list "--disable-year2038")
+             '()))))
+    (native-inputs (list ed))
+    (synopsis "Apply differences to originals, with optional backups")
+    (description
+     "Patch is a program that applies changes to files based on differences
+laid out as by the program \"diff\".  The changes may be applied to one or more
+files depending on the contents of the diff file.  It accepts several
+different diff formats.  It may also be used to revert previously applied
+differences.")
+    (license gpl3+)
+    (home-page "https://savannah.gnu.org/projects/patch/")
     (properties '())))
 
 (define-public diffutils
@@ -447,6 +431,14 @@ interactive means to merge two files.")
                                  "gnulib-tests/test-strerror_r.c"
                                (("(^| )main *\\(.*" all)
                                 (string-append all "{\n  exit (77);//"))))))
+                       '())
+                 ,@(if (string=? "riscv64-linux" (%current-system))
+                       ;; Unmodified test-lock will fail or crash riscv64
+                       '((add-before 'check 'modify-test-lock
+                           (lambda _
+                             (substitute* "gnulib-tests/test-lock.c"
+                               (("#define DO_TEST_RWLOCK 1")
+                                "#define DO_TEST_RWLOCK 0")))))
                        '()))))
    (synopsis "Operating on files matching given criteria")
    (description
@@ -515,6 +507,14 @@ used to apply commands with arbitrarily long arguments.")
                        (("/bin/sh") (which "sh")))
                      (substitute* (find-files "tests" "\\.sh$")
                        (("#!/bin/sh") (string-append "#!" (which "sh"))))))
+                 ,@(if (string=? "riscv64-linux" (%current-system))
+                       ;; Unmodified test-lock will fail or crash riscv64
+                       '((add-before 'check 'modify-test-lock
+                           (lambda _
+                             (substitute* "gnulib-tests/test-lock.c"
+                               (("#define DO_TEST_RWLOCK 1")
+                                "#define DO_TEST_RWLOCK 0")))))
+                       '())
                  (add-after 'unpack 'remove-tests
                    (lambda _
                      ,@(if (system-hurd?)
@@ -632,20 +632,21 @@ standard.")
    (inputs (list guile-3.0))
    (outputs '("out" "debug"))
    (arguments
-    `(,@(if (target-hurd?)
-            '(#:configure-flags '("CFLAGS=-D__alloca=alloca"
-                                  "ac_cv_func_posix_spawn=no"))
-            '())
+    (append
+     (if (target-hurd?)
+         (list #:configure-flags #~(list "CFLAGS=-D__alloca=alloca"
+                                         "ac_cv_func_posix_spawn=no"))
+         (list))
+     (list
       #:phases
-      (modify-phases %standard-phases
-        (add-before 'build 'set-default-shell
-          (lambda* (#:key inputs #:allow-other-keys)
-            ;; Change the default shell from /bin/sh.
-            (let ((bash (assoc-ref inputs "bash")))
+      #~(modify-phases %standard-phases
+          (add-before 'build 'set-default-shell
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Change the default shell from /bin/sh.
               (substitute* "src/job.c"
                 (("default_shell =.*$")
-                 (format #f "default_shell = \"~a/bin/sh\";\n"
-                         bash)))))))))
+                 (format #f "default_shell = \"~a\";\n"
+                         (search-input-file inputs "/bin/sh"))))))))))
    (synopsis "Remake files automatically")
    (description
     "Make is a program that is used to control the production of
@@ -669,17 +670,17 @@ change.  GNU make offers many powerful extensions over the standard utility.")
                (base32
                 "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"))))
     (arguments
-     `(#:configure-flags '("CFLAGS=-D__alloca=alloca -D__stat=stat")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'set-default-shell
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; Change the default shell from /bin/sh.
-             (let ((bash (assoc-ref inputs "bash")))
-               (substitute* "job.c"
-                 (("default_shell =.*$")
-                  (format #f "default_shell = \"~a/bin/sh\";\n"
-                          bash)))))))))))
+     (list
+      #:configure-flags #~(list "CFLAGS=-D__alloca=alloca -D__stat=stat")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'set-default-shell
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Change the default shell from /bin/sh.
+              (substitute* "job.c"
+                (("default_shell =.*$")
+                 (format #f "default_shell = \"~a\";\n"
+                         (search-input-file inputs "/bin/sh")))))))))))
 
 (define-public binutils
   (package
@@ -693,6 +694,7 @@ change.  GNU make offers many powerful extensions over the standard utility.")
       (sha256
        (base32 "0fnwaasfglbphqzvz5n25js9gl695p7pjbmb1z81g8gsc6k90qzn"))
       (patches (search-patches
+                "binutils-reproducible-tar.patch"
                 "binutils-2.41-fix-cross.patch"
                 "binutils-loongson-workaround.patch"))))
    (build-system gnu-build-system)
@@ -728,7 +730,8 @@ change.  GNU make offers many powerful extensions over the standard utility.")
           ;; For some reason, the build machinery insists on rebuilding .info
           ;; files, even though they're already provided by the tarball.
           #:make-flags #~'("MAKEINFO=true")))
-   (native-inputs (list bison))                   ;needed to build 'gprofng'
+   (native-inputs (list bison  ;needed to build 'gprofng'
+                        perl)) ;needed to build the man pages (pod2man)
    (synopsis "Binary utilities: bfd gas gprof ld")
    (description
     "GNU Binutils is a collection of tools for working with binary files.
@@ -908,6 +911,7 @@ the store.")
   (list "glibc-ldd-powerpc.patch"
         "glibc-2.41-ldd-x86_64.patch"
         "glibc-2.40-dl-cache.patch"
+        "glibc-fix-path-attribute-in-getconf.patch"
         "glibc-2.37-versioned-locpath.patch"
         ;; "glibc-allow-kernel-2.6.32.patch"
         "glibc-guix-locpath.patch"
@@ -957,247 +961,259 @@ the store.")
               "static"))                          ;9 MiB of .a files
 
    (arguments
-    `(#:out-of-source? #t
+    (list
+     #:out-of-source? #t
 
-      ;; The libraries have an empty RUNPATH, but some, such as the versioned
-      ;; libraries (libdl-2.24.so, etc.) have ld.so marked as NEEDED.  Since
-      ;; these libraries are always going to be found anyway, just skip
-      ;; RUNPATH checks.
-      #:validate-runpath? #f
+     ;; The libraries have an empty RUNPATH, but some, such as the versioned
+     ;; libraries (libdl-2.24.so, etc.) have ld.so marked as NEEDED.  Since
+     ;; these libraries are always going to be found anyway, just skip
+     ;; RUNPATH checks.
+     #:validate-runpath? #f
 
-      #:modules ((ice-9 ftw)
+     #:modules `((ice-9 ftw)
+                 (ice-9 match)
                  (srfi srfi-1)
                  (srfi srfi-26)
+                 (guix build gremlin)
                  (guix build utils)
                  (guix build gnu-build-system))
 
-      ;; Strip binaries but preserve the symbol table needed by Valgrind:
-      ;; <https://lists.gnu.org/archive/html/help-guix/2022-03/msg00036.html>.
-      #:strip-flags '("--strip-debug")
+     ;; Strip binaries but preserve the symbol table needed by Valgrind:
+     ;; <https://lists.gnu.org/archive/html/help-guix/2022-03/msg00036.html>.
+     #:strip-flags #~'("--strip-debug")
 
-      #:configure-flags
-      (list "--sysconfdir=/etc"
+     #:configure-flags
+     #~(list "--sysconfdir=/etc"
 
-            ;; Installing a locale archive with all the locales is to
-            ;; expensive (~100 MiB), so we rely on users to install the
-            ;; locales they really want.
-            ;;
-            ;; Set the default locale path.  In practice, $LOCPATH may be
-            ;; defined to point whatever locales users want.  However, setuid
-            ;; binaries don't honor $LOCPATH, so they'll instead look into
-            ;; $libc_cv_complocaledir; we choose /run/current-system/locale/X.Y,
-            ;; with the idea that it is going to be populated by the sysadmin.
-            ;; The "X.Y" sub-directory is because locale data formats are
-            ;; incompatible across libc versions; see
-            ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>.
-            ;;
-            ;; `--localedir' is not honored, so work around it.
-            ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
-            (string-append "libc_cv_complocaledir=/run/current-system/locale/"
-                           ,(version-major+minor version))
+             ;; Installing a locale archive with all the locales is to
+             ;; expensive (~100 MiB), so we rely on users to install the
+             ;; locales they really want.
+             ;;
+             ;; Set the default locale path.  In practice, $LOCPATH may be
+             ;; defined to point whatever locales users want.  However, setuid
+             ;; binaries don't honor $LOCPATH, so they'll instead look into
+             ;; $libc_cv_complocaledir; we choose /run/current-system/locale/X.Y,
+             ;; with the idea that it is going to be populated by the sysadmin.
+             ;; The "X.Y" sub-directory is because locale data formats are
+             ;; incompatible across libc versions; see
+             ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>.
+             ;;
+             ;; `--localedir' is not honored, so work around it.
+             ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
+             (string-append "libc_cv_complocaledir=/run/current-system/locale/"
+                            #$(version-major+minor version))
 
-            (string-append "--with-headers="
-                           (assoc-ref ,(if (%current-target-system)
-                                           '%build-target-inputs
-                                           '%build-inputs)
-                                      "kernel-headers")
-                           "/include")
+             ;; Here we need to refer to kernel headers and not glibc-mesboot
+             (string-append
+              "--with-headers="
+              (and=>
+               (find
+                (match-lambda
+                  ((label . input)
+                   (and (directory-exists?
+                         (string-append input "/include/" #$(if (system-hurd?)
+                                                                "mach"
+                                                                "linux")))
+                        ;; Ensure we're not refering to another libc.
+                        (not (file-exists?
+                              (string-append input "/include/locale.h"))))))
+                #$(if (%current-target-system)
+                      #~%build-target-inputs
+                      #~%build-inputs))
+               cdr) "/include")
 
-            ;; This is the default for most architectures as of GNU libc 2.26,
-            ;; but we specify it explicitly for clarity and consistency.  See
-            ;; "kernel-features.h" in the GNU libc for details.
-            "--enable-kernel=3.2.0"
+             ;; This is the default for most architectures as of GNU libc 2.26,
+             ;; but we specify it explicitly for clarity and consistency.  See
+             ;; "kernel-features.h" in the GNU libc for details.
+             "--enable-kernel=3.2.0"
 
-            ;; Use our Bash instead of /bin/sh.
-            (string-append "BASH_SHELL="
-                           (assoc-ref %build-inputs "bash")
-                           "/bin/bash")
+             ;; Use our Bash instead of /bin/sh.
+             (string-append "BASH_SHELL="
+                            (search-input-file %build-inputs "/bin/bash"))
 
-            ;; On GNU/Hurd we get discarded-qualifiers warnings for
-            ;; 'device_write_inband' among other things.  Ignore them.
-            ,@(if (target-hurd?)
-                  `("--disable-werror")
-                  '()))
+             ;; On GNU/Hurd we get discarded-qualifiers warnings for
+             ;; 'device_write_inband' among other things.  Ignore them.
+             #$@(if (target-hurd?)
+                    #~("--disable-werror")
+                    #~()))
 
-      #:tests? #f                                 ; XXX
-      #:phases (modify-phases %standard-phases
-                 (add-before
-                  'configure 'pre-configure
-                  (lambda* (#:key inputs native-inputs outputs
-                                  #:allow-other-keys)
-                    (let* ((out  (assoc-ref outputs "out"))
-                           (bin  (string-append out "/bin"))
-                           ;; FIXME: Normally we would look it up only in INPUTS
-                           ;; but cross-base uses it as a native input.
-                           (bash (or (assoc-ref inputs "static-bash")
-                                     (assoc-ref native-inputs "static-bash"))))
-                      ;; Install the rpc data base file under `$out/etc/rpc'.
-                      (substitute* "inet/Makefile"
-                        (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
-                         (string-append out "/etc/rpc" suffix "\n"))
-                        (("^install-others =.*$")
-                         (string-append "install-others = " out "/etc/rpc\n")))
+     #:tests? #f ; XXX
+     #:phases
+     #~(modify-phases %standard-phases
+         (add-before 'configure 'pre-configure
+           (lambda* (#:key inputs native-inputs #:allow-other-keys)
+             (let* ((bin (string-append #$output "/bin"))
+                    (bash (find
+                           (match-lambda
+                             ((label . input)
+                              (let ((sh (string-append input "/bin/sh")))
+                                (and (file-exists? sh)
+                                     ;; Is it bash-static specifically? The
+                                     ;; label can't be used because of
+                                     ;; bash-mesboot during the bootstrap.
+                                     (not (file-dynamic-info sh))))))
+                           inputs))
+                    (bash (and=> bash cdr)))
+               ;; Install the rpc data base file under `$out/etc/rpc'.
+               (substitute* "inet/Makefile"
+                 (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
+                  (string-append #$output "/etc/rpc" suffix "\n"))
+                 (("^install-others =.*$")
+                  (string-append "install-others = " #$output "/etc/rpc\n")))
 
-                      (substitute* "Makeconfig"
-                        ;; According to
-                        ;; <http://www.linuxfromscratch.org/lfs/view/stable/chapter05/glibc.html>,
-                        ;; linking against libgcc_s is not needed with GCC
-                        ;; 4.7.1.
-                        ((" -lgcc_s") ""))
+               (substitute* "Makeconfig"
+                 ;; According to
+                 ;; <http://www.linuxfromscratch.org/lfs/view/stable/chapter05/glibc.html>,
+                 ;; linking against libgcc_s is not needed with GCC
+                 ;; 4.7.1.
+                 ((" -lgcc_s") ""))
 
-                      ;; Tell the ld.so cache code where the store is.
-                      (substitute* "elf/dl-cache.c"
-                        (("@STORE_DIRECTORY@")
-                         (string-append "\"" (%store-directory) "\"")))
+               ;; Tell the ld.so cache code where the store is.
+               (substitute* "elf/dl-cache.c"
+                 (("@STORE_DIRECTORY@")
+                  (string-append "\"" (%store-directory) "\"")))
 
-                      ;; Have `system' use that Bash.
-                      (substitute* "sysdeps/posix/system.c"
-                        (("#define[[:blank:]]+SHELL_PATH.*$")
-                         (format #f "#define SHELL_PATH \"~a/bin/bash\"\n"
-                                 bash)))
+               ;; Have `system' use that Bash.
+               (substitute* "sysdeps/posix/system.c"
+                 (("#define[[:blank:]]+SHELL_PATH.*$")
+                  (format #f "#define SHELL_PATH \"~a/bin/bash\"\n" bash)))
 
-                      ;; Same for `popen'.
-                      (substitute* "libio/iopopen.c"
-                        (("/bin/sh")
-                         (string-append bash "/bin/sh")))
+               ;; Same for `popen'.
+               (substitute* "libio/iopopen.c"
+                 (("/bin/sh")
+                  (string-append bash "/bin/sh")))
 
-                      ;; Same for the shell used by the 'exec' functions for
-                      ;; scripts that lack a shebang.
-                      (substitute* (find-files "." "^paths\\.h$")
-                        (("#define[[:blank:]]+_PATH_BSHELL[[:blank:]].*$")
-                         (string-append "#define _PATH_BSHELL \""
-                                        bash "/bin/sh\"\n")))
+               ;; Same for the shell used by the 'exec' functions for
+               ;; scripts that lack a shebang.
+               (substitute* (find-files "." "^paths\\.h$")
+                 (("#define[[:blank:]]+_PATH_BSHELL[[:blank:]].*$")
+                  (string-append "#define _PATH_BSHELL \""
+                                 bash "/bin/sh\"\n")))
 
-                      ;; Make sure we don't retain a reference to the
-                      ;; bootstrap Perl.
-                      (substitute* "malloc/mtrace.pl"
-                        (("^#!.*")
-                         ;; The shebang can be omitted, because there's the
-                         ;; "bilingual" eval/exec magic at the top of the file.
-                         "")
-                        (("exec @PERL@")
-                         "exec perl")))))
+               ;; Make sure we don't retain a reference to the
+               ;; bootstrap Perl.
+               (substitute* "malloc/mtrace.pl"
+                 (("^#!.*")
+                  ;; The shebang can be omitted, because there's the
+                  ;; "bilingual" eval/exec magic at the top of the file.
+                  "")
+                 (("exec @PERL@")
+                  "exec perl")))))
 
-                 (add-after 'install 'move-static-libs
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     ;; Move static libraries to the "static" output.
-                     ;; Note: As of GNU libc 2.34, the contents of some ".a"
-                     ;; files have been moved into "libc.so", and *both* empty
-                     ;; ".so" and ".a" files have been introduced to avoid
-                     ;; breaking existing executables and existing builds
-                     ;; respectively.  The intent of the seemingly redundant
-                     ;; empty ".a" files is to avoid newly-compiled executables
-                     ;; from having dependencies on the empty shared libraries,
-                     ;; and as such, it is useful to have these ".a" files in
-                     ;; OUT in addition to STATIC.
+         (add-after 'install 'move-static-libs
+           (lambda _
+             ;; Move static libraries to the "static" output.
+             ;; Note: As of GNU libc 2.34, the contents of some ".a"
+             ;; files have been moved into "libc.so", and *both* empty
+             ;; ".so" and ".a" files have been introduced to avoid
+             ;; breaking existing executables and existing builds
+             ;; respectively.  The intent of the seemingly redundant
+             ;; empty ".a" files is to avoid newly-compiled executables
+             ;; from having dependencies on the empty shared libraries,
+             ;; and as such, it is useful to have these ".a" files in
+             ;; OUT in addition to STATIC.
 
-                     (define (empty-static-library? file)
-                       ;; Return true if FILE is an 'ar' archive with nothing
-                       ;; beyond the header.
-                       (let ((file (string-append (assoc-ref outputs "out")
-                                                  "/lib/" file)))
-                         (and (ar-file? file)
-                              (= (stat:size (stat file)) 8))))
+             (define (empty-static-library? file)
+               ;; Return true if FILE is an 'ar' archive with nothing
+               ;; beyond the header.
+               (let ((file (string-append #$output "/lib/" file)))
+                 (and (ar-file? file)
+                      (= (stat:size (stat file)) 8))))
 
-                     (define (static-library? file)
-                       ;; Return true if FILE is a static library.  The
-                       ;; "_nonshared.a" files are referred to by libc.so,
-                       ;; libpthread.so, etc., which are in fact linker
-                       ;; scripts.
-                       (and (string-suffix? ".a" file)
-                            (not (string-contains file "_nonshared"))
-                            (not (empty-static-library? file))))
+             (define (static-library? file)
+               ;; Return true if FILE is a static library.  The
+               ;; "_nonshared.a" files are referred to by libc.so,
+               ;; libpthread.so, etc., which are in fact linker
+               ;; scripts.
+               (and (string-suffix? ".a" file)
+                    (not (string-contains file "_nonshared"))
+                    (not (empty-static-library? file))))
 
-                     (define (linker-script? file)
-                       ;; Guess whether FILE, a ".a" file, is actually a
-                       ;; linker script.
-                       (and (not (ar-file? file))
-                            (not (elf-file? file))))
+             (define (linker-script? file)
+               ;; Guess whether FILE, a ".a" file, is actually a
+               ;; linker script.
+               (and (not (ar-file? file))
+                    (not (elf-file? file))))
 
-                     (let* ((out    (assoc-ref outputs "out"))
-                            (lib    (string-append out "/lib"))
-                            (files  (scandir lib static-library?))
-                            (empty  (scandir lib empty-static-library?))
-                            (static (assoc-ref outputs "static"))
-                            (slib   (string-append static "/lib")))
-                       (mkdir-p slib)
-                       (for-each (lambda (base)
-                                   (rename-file (string-append lib "/" base)
-                                                (string-append slib "/" base)))
-                                 files)
-                       (for-each (lambda (base)
-                                   (copy-file (string-append lib "/" base)
-                                              (string-append slib "/" base)))
-                                 empty)
+             (let* ((lib (string-append #$output "/lib"))
+                    (files (scandir lib static-library?))
+                    (empty (scandir lib empty-static-library?))
+                    (slib (string-append #$output:static "/lib")))
+               (mkdir-p slib)
+               (for-each (lambda (base)
+                           (rename-file (string-append lib "/" base)
+                                        (string-append slib "/" base)))
+                         files)
+               (for-each (lambda (base)
+                           (copy-file (string-append lib "/" base)
+                                      (string-append slib "/" base)))
+                         empty)
 
-                       ;; Usually libm.a is a linker script so we need to
-                       ;; change the file names in there to refer to STATIC
-                       ;; instead of OUT.
-                       (for-each (lambda (ld-script)
-                                   (substitute* ld-script
-                                     ((out) static)))
-                                 (filter linker-script?
-                                         (map (cut string-append slib "/" <>)
-                                              files))))))
+               ;; Usually libm.a is a linker script so we need to
+               ;; change the file names in there to refer to STATIC
+               ;; instead of OUT.
+               (for-each (lambda (ld-script)
+                           (substitute* ld-script
+                             ((#$output)
+                              #$output:static)))
+                         (filter linker-script?
+                                 (map (cut string-append slib "/" <>)
+                                      files))))))
 
-                 (add-after 'install 'install-utf8-c-locale
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     ;; Install the C.UTF-8 locale so there's always a UTF-8
-                     ;; locale around.
-                     (let* ((out (assoc-ref outputs "out"))
-                            (bin (string-append out "/bin"))
-                            (locale (string-append out "/lib/locale/"
-                                                   ,(package-version
-                                                     this-package))))
-                       (mkdir-p locale)
+         (add-after 'install 'install-utf8-c-locale
+           (lambda _
+             ;; Install the C.UTF-8 locale so there's always a UTF-8
+             ;; locale around.
+             (let ((bin (string-append #$output "/bin"))
+                   (locale (string-append #$output "/lib/locale/"
+                                          #$(package-version
+                                             this-package))))
+               (mkdir-p locale)
 
-                       ;; FIXME: When cross-compiling, attempt to use
-                       ;; 'localedef' from the same libc version.
-                       (invoke ,(if (%current-target-system)
-                                    "true"
-                                    '(string-append bin "/localedef"))
-                               "--no-archive" "--prefix" locale
-                               "-i" "C" "-f" "UTF-8"
-                               (string-append locale "/C.UTF-8")))))
+               ;; FIXME: When cross-compiling, attempt to use
+               ;; 'localedef' from the same libc version.
+               (invoke #$(if (%current-target-system)
+                             "true"
+                             #~(string-append bin "/localedef"))
+                       "--no-archive" "--prefix" locale
+                       "-i" "C" "-f" "UTF-8"
+                       (string-append locale "/C.UTF-8")))))
 
-                 ,@(if (target-hurd?)
-                       `((add-after 'install 'augment-libc.so
-                           (lambda* (#:key outputs #:allow-other-keys)
-                             (let ((out (assoc-ref outputs "out")))
-                               (substitute* (string-append out "/lib/libc.so")
-                                 (("/[^ ]+/lib/libc.so.0.3")
-                                  (string-append out "/lib/libc.so.0.3"
-                                                 " libmachuser.so libhurduser.so"))))))
-                         (add-after 'install 'create-machine-symlink
-                           (lambda* (#:key outputs #:allow-other-keys)
-                             (let* ((out (assoc-ref outputs "out"))
-                                    (cpu ,(match (or (%current-target-system)
-                                                     (%current-system))
-                                            ((? target-x86-32?)
-                                             "i386")
-                                            ((? target-x86-64?)
-                                             "x86_64")))
-                                    (machine (string-append
-                                              out "/include/mach/machine")))
-                               (unless (file-exists? machine)
-                                 (symlink cpu machine))))))
-                       '()))))
+         #$@(if (target-hurd?)
+                #~((add-after 'install 'augment-libc.so
+                     (lambda _
+                       (substitute* (string-append #$output "/lib/libc.so")
+                         (("/[^ ]+/lib/libc.so.0.3")
+                          (string-append #$output "/lib/libc.so.0.3"
+                                         " libmachuser.so libhurduser.so")))))
+                   (add-after 'install 'create-machine-symlink
+                     (lambda _
+                       (let* ((cpu #$(match (or (%current-target-system)
+                                                (%current-system))
+                                       ((? target-x86-32?)
+                                        "i386")
+                                       ((? target-x86-64?)
+                                        "x86_64")))
+                              (machine (string-append #$output
+                                                      "/include/mach/machine")))
+                         (unless (file-exists? machine)
+                           (symlink cpu machine))))))
+                #~()))))
 
-   (inputs `(("static-bash" ,static-bash)))
+   (inputs (list static-bash))
 
    ;; To build the manual, we need Texinfo and Perl.  Gettext is needed to
    ;; install the message catalogs, with 'msgfmt'.
-   (native-inputs `(("texinfo" ,texinfo)
-                    ("perl" ,perl)
-                    ("bison" ,bison)
-                    ("gettext" ,gettext-minimal)
-                    ("python" ,python-minimal)
-
-                    ,@(if (target-hurd?)
-                          `(("mig" ,mig)
-                            ("perl" ,perl))
-                          '())))
-
+   (native-inputs
+    (append
+     (list bison
+           gettext-minimal
+           perl
+           python-minimal
+           texinfo)
+     (if (target-hurd?)
+         (list mig)
+         (list))))
    (native-search-paths
     ;; Search path for packages that provide locale data.  This is useful
     ;; primarily in build environments.  Use 'GUIX_LOCPATH' rather than
@@ -1300,8 +1316,8 @@ with the Linux kernel.")
         ;; The C.UTF-8 fails to build in glibc 2.35:
         ;; <https://sourceware.org/bugzilla/show_bug.cgi?id=28861>.
         ;; It is missing altogether in versions earlier than 2.35.
-        `(modify-phases ,phases
-           (delete 'install-utf8-c-locale)))))))
+        #~(modify-phases #$phases
+            (delete 'install-utf8-c-locale)))))))
 
 (define-public glibc-2.33
   (package
@@ -1342,9 +1358,9 @@ with the Linux kernel.")
                  "libc_cv_cxx_link_ok=no"
                  #$flags))
        ((#:phases phases)
-        `(modify-phases ,phases
-           ;; This phase fails trying to create /etc/ld.so.cache
-           (delete 'install-utf8-c-locale)))))))
+        #~(modify-phases #$phases
+            ;; This phase fails trying to create /etc/ld.so.cache
+            (delete 'install-utf8-c-locale)))))))
 
 (define-public (make-gcc-libc base-gcc libc)
   "Return a GCC that targets LIBC."

gnu/packages/bash.scm

@@ -66,7 +66,7 @@
 
 (define (patch-url seqno)
   "Return the URL of Bash patch number SEQNO."
-  (format #f "mirror://gnu/bash/bash-5.2-patches/bash52-~3,'0d" seqno))
+  (format #f "mirror://gnu/bash/bash-5.3-patches/bash53-~3,'0d" seqno))
 
 (define (bash-patch seqno sha256-bv)
   "Return the origin of Bash patch SEQNO, with expected hash SHA256-BV."
@@ -79,47 +79,13 @@
   (list (bash-patch seqno (base32 hash))
         ...))
 
-(define %patch-series-5.2
-  ;; This is the current patches series for 5.2, generated using
+(define %patch-series-5.3
+  ;; This is the current patches series for 5.3, generated using
   ;; 'download-patches' below.
   (patch-series
-   (1 "02iibpd3jq8p1bhdzgik8ps6gi1145vr463a82gj1hivjbp2ybzl")
-   (2 "1f6p1z85qh1lavdp3xikgp0bfv0vqhvgpgwmdzlywl35hwdmxk25")
-   (3 "1zxsi869jd90hksx3nyypgyqwrxhw2ws3r6hmk76yc1lsgdhq2ba")
-   (4 "04i5liw5cg6dqkdxfgazqc2jrw40bmclx3dx45bwy259pcj7g0iq")
-   (5 "0mykflv9qnbx3jz71l4f7isadiw9knm4qimqkwsv9cv88dafpq7c")
-   (6 "13265akl8w6zyrg0l7f0x6arjgqjhllcwl6lk46rl53x4mm5dq6i")
-   (7 "146lrwkn5wgxzs6vx34wl47g69zsxdy032k40qzi626b47ya6015")
-   (8 "1s5i8hcayrv25lc8fxcr431v634yx5sii53b8fmip789s0pxjjvb")
-   (9 "1kfk25151ka9wkmk1myf12irgcmvhsd8b0nfifvhrszah9w82npr")
-   (10 "1kf1jrwm30js0v3d1r2rk4x09s1pyjp70wnd1qqhf9bmkw15ww67")
-   (11 "1x5nkvbj6hci7gx42q7qa72hg2a9wwxh85dk79gn521ypwjmy6w3")
-   (12 "0b6lcwzm7v5bzjiwaz2c8n5aj77w8ckhp2vwk4v3zsdq3z70gc9g")
-   (13 "1rkwpibd6j2ghppfhqsva2jm4kdni6b7jpdsxdps52643gc4yjq9")
-   (14 "09766vqqw4ffnmysm725v35qkhp1g9j4qgqag941xvq655pj9y9y")
-   (15 "12im449abnq5gaqjmdxr5i38kmp02fa8l8wffad3jryvd58r0wzg")
-   (16 "05arb0hzmng03cr357lf6p8af0x2a1pznsd3psll03nibfy56n0m")
-   (17 "129cvx4gfz8n23iw1lhbknbw86fyw6vh60jqj1wj3d5pr75wwj0w")
-   (18 "105am94qxjc27gga4a8asvsi01090xwjfim3s16lafwjvm4xsha6")
-   (19 "10njgv5mrc5rhsp5lvxcbm0pnzn59a8spi2nhdasifyl1a32cp1j")
-   (20 "07f0wlmqjdfarp44w3gj9gdqbqm5x20rvlhpn34ngklmxcm2bz5n")
-   (21 "1kahfqqalcwi4m73pg3ssz6lh0kcqsqax09myac7a15d2y0vhd43")
-   (22 "0w74aym0g1fh48864a3qxh89f26iaq7wsbg7244c6kjr94527dbq")
-   (23 "1lywjqbc36j5pdzfcvnz1zy30j76aqmsm190p888av0hw815b45g")
-   (24 "1hq23djqbr7s9y2324jq9mxr5bwdkmgizn3zgpchbsqp054k85cp")
-   (25 "0x9hc4silzl4d3zw4p43i5dm7w86k50j47f87lracwfgwy3z8f2i")
-   (26 "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln")
-   (27 "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1")
-   (28 "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0")
-   (29 "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j")
-   (30 "13v9fqgim082dmvkslsr0hs793yzhsij2s91mjswsfhj1qip7zy3")
-   (31 "15d7rddj6spwc1fy997lxx6zvzq0zbxgf2h20mhi4wgp5nzbglf2")
-   (32 "05ia6yf32hjprmyyxqawhgckxs3684ikfx8xg08zfgx9xkd7g73v")
-   (33 "1qm2aad9mf2xah6xwchga7s5pk3v308mrv9lgh50d65d236ccgh1")
-   (34 "0bi38dhkkwpm2qrzp8zpykglq6gibvv2n9f8m59gwj406cxvp7w9")
-   (35 "1r8k34y82v02yfkgws17j7i53ybb74dqnwl2jjiv0av9z93hl6l2")
-   (36 "0mwhr9hfbh2czf8klbxg6nbd2g9xl9kygvgk061vird56r4kzj8m")
-   (37 "156sbi3srzkyxajkmhb7iigq0j4nvwnpsbw88xdsxn95a4xiqb4a")))
+   (1 "0zr8wgg1gb67vxn7ws971n1znrdinczymc688ndnpy2a6qs88q0z")
+   (2 "009051z55plsy4jmmjdb3ys7li2jraynz99qg7n6a1qk025591g3")
+   (3 "1vb0gnrkmz49rcfpxjcxy0v0k5278wrlkljk9gc20nizvk3xjigj")))
 
 (define (download-patches store count)
   "Download COUNT Bash patches into store.  Return a list of
@@ -157,7 +123,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
                " -Wl,-rpath -Wl,"
                (assoc-ref %build-inputs "ncurses")
                "/lib")))
-         (version "5.2"))
+         (version "5.3"))
     (package
      (name "bash")
      (source (origin
@@ -166,11 +132,11 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
                     "mirror://gnu/bash/bash-" version ".tar.gz"))
               (sha256
                (base32
-                "1yrjmf0mqg2q8pqphjlark0mcmgf88b0acq7bqf4gx3zvxkc2fd1"))
+                "1fii1xaxbng9x0klxmxkm0xhmycngfz72jsgyrna4sgqcmlxhp0d"))
               (patch-flags '("-p0"))
               (patches (cons (search-patch "bash-linux-pgrp-pipe.patch")
-                             %patch-series-5.2))))
-     (version (string-append version "." (number->string (length %patch-series-5.2))))
+                             %patch-series-5.3))))
+     (version (string-append version "." (number->string (length %patch-series-5.3))))
      (build-system gnu-build-system)
 
       (outputs '("out"

gnu/packages/bdw-gc.scm

@@ -6,6 +6,7 @@
 ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2026 Zheng Junjie <z572@z572.online>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,6 +24,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages bdw-gc)
+  #:use-module (guix deprecation)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -55,6 +57,8 @@
      #~(list
         ;; Install gc_cpp.h et al.
         "--enable-cplusplus"
+        ;; Used by 'guile-static'.
+        "--enable-static"
 
         ;; In GNU/Hurd systems during the 'check' phase,
         ;; there is a deadlock caused by the 'gctest' test.
@@ -68,7 +72,17 @@
                #~())
         #$@(if (target-mingw?)
                #~("--enable-threads=pthreads")
-               #~())))
+               #~()))
+     #:phases
+     #~(modify-phases %standard-phases
+         (add-after 'install 'move-static-library
+           (lambda _
+             (for-each
+              (lambda (a)
+                (install-file a (string-append #$output:static
+                                               "/lib"))
+                (delete-file a))
+              (find-files (string-append #$output "/lib") "\\.a"))))))
      (cond
        ((target-ppc64le?)
         (list #:make-flags
@@ -87,7 +101,7 @@
         ;; cross-compiling, and demands using libatomic-ops instead.
         (list libatomic-ops)
         '()))
-   (outputs '("out" "debug"))
+   (outputs '("out" "debug" "static"))
    (properties
     '((release-monitoring-url . "https://www.hboehm.info/gc/gc_source/")
       (upstream-name . "gc")))
@@ -112,16 +126,8 @@ C or C++ programs, though that is not its primary goal.")
 
    (license (x11-style (string-append home-page "license.txt")))))
 
-;; TODO: Add a static output in libgc in the next rebuild cycle.
-(define-public libgc/static-libs
-  (package/inherit
-   libgc
-   (arguments
-    (substitute-keyword-arguments arguments
-      ((#:configure-flags flags #~'())
-       #~(cons "--enable-static" #$flags))))
-
-   (properties '((hidden? . #t)))))
+;; XXX: Deprecated on <2026-04-25>.
+(define-deprecated/public-alias libgc/static-libs libgc)
 
 (define-public libgc-7
   (package

gnu/packages/bioconductor.scm

@@ -3436,14 +3436,14 @@ the @code{HorvathMethylChip40} (Mammal40) array.")
 (define-public r-systempiperdata
   (package
     (name "r-systempiperdata")
-    (version "2.14.6")
+    (version "2.14.5")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "systemPipeRdata" version
                               'experiment))
        (sha256
-        (base32 "1j7h40hcm0gyahmlilvlb83ddmwrarqn319qwpnrgwcji8fm92jd"))))
+        (base32 "1yrq1vyc0pmp3iv621cvdsavlarcca3z4bbxfzbg0ny3fyqp67pb"))))
     (properties `((upstream-name . "systemPipeRdata")))
     (build-system r-build-system)
     (propagated-inputs (list r-biocgenerics r-biostrings r-jsonlite r-remotes))
@@ -4552,9 +4552,15 @@ these biases and construct statistically consistent estimators.")
     (build-system r-build-system)
     (arguments
      (list
-      #:skipped-tests
-      ;; This test needs Internet access.
-      '(("test-examples.R" ".*find_taxonomy\\(\\) is working.*"))))
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'skip-bad-tests
+           (lambda _
+             ;; This test needs Internet access.
+             (with-directory-excursion "tests/testthat"
+               (substitute* "test-examples.R"
+                 ((".*find_taxonomy\\(\\) is working.*" m)
+                  (string-append m "skip('guix')\n")))))))))
     (propagated-inputs
      (list r-ape
            r-assertthat
@@ -4605,13 +4611,13 @@ to understand their data better and discover new insights.")
 (define-public r-anndatar
   (package
     (name "r-anndatar")
-    (version "1.0.2")
+    (version "1.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "anndataR" version))
        (sha256
-        (base32 "1gn1yyfs08a77zrl4cidahxim3kgcvpbsrgfxxnhhrka57xcylld"))))
+        (base32 "1vi9aqgdjy0nlbsk7628sz12jsxd9bfb79yxhh0ngijpxj9sxd4p"))))
     (properties `((upstream-name . "anndataR")))
     (build-system r-build-system)
     (arguments
@@ -4664,13 +4670,14 @@ directly access various slots (e.g. X, obs, var), or convert the data into
     (build-system r-build-system)
     (arguments
      (list
-      #:test-directory "inst/unitTests"
-      ;; These tests require internet access.
-      #:skipped-tests
-      '("test_recipe.R"
-        "test_webAccessFunctions.R")
       #:phases
       '(modify-phases %standard-phases
+         (add-after 'unpack 'delete-bad-tests
+           (lambda _
+             ;; These tests require internet access.
+             (for-each delete-file
+                       '("inst/unitTests/test_recipe.R"
+                         "inst/unitTests/test_webAccessFunctions.R"))))
          (add-before 'install 'set-home
            (lambda _ (setenv "HOME" "/tmp"))))))
     (propagated-inputs
@@ -5237,13 +5244,13 @@ structures: @code{ExpressionSet}, @code{AffyBatch}, @code{NChannelSet}.")
 (define-public r-arrayqualitymetrics
   (package
     (name "r-arrayqualitymetrics")
-    (version "3.66.0")
+    (version "3.64.0")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "arrayQualityMetrics" version))
               (sha256
                (base32
-                "0y9k81vwqq74zfdrc2hvx7mg0l7572hvrsby00m20z034j7f9pmi"))))
+                "1kz2d40wx2ksy9dz1z3wylcj7y7ad9z8xphsnz39j02m4g5mbvlp"))))
     (properties
      '((upstream-name . "arrayQualityMetrics")
        ;; We don't need these.
@@ -5265,7 +5272,7 @@ structures: @code{ExpressionSet}, @code{AffyBatch}, @code{NChannelSet}.")
                              r-svglite
                              r-vsn
                              r-xml))
-    (native-inputs (list r-biocstyle r-knitr))
+    (native-inputs (list r-knitr))
     (home-page "https://bioconductor.org/packages/arrayQualityMetrics")
     (synopsis "Quality metrics report for microarray data sets")
     (description
@@ -6103,8 +6110,10 @@ retrieval analyses, or similar technologies.")
     (build-system r-build-system)
     (arguments
      (list
-      ;; This requires internet access.
-      #:skipped-tests '("test-download.R")))
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'disable-bad-tests
+           (lambda _ (delete-file "tests/testthat/test-download.R"))))))
     (propagated-inputs (list cmake r-dir-expiry))
     (native-inputs (list r-knitr r-testthat))
     (home-page "https://github.com/LTLA/biocmake")
@@ -6412,6 +6421,17 @@ objects.")
         (base32 "189akh4lpbp0dzgflb3nb3vi94bhmsj7qkcl597dnnzxqz00hsb2"))))
     (properties `((upstream-name . "CoreGx")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'disable-bad-tests
+           (lambda _
+             ;; It is unclear why 3 tests fail.
+             (with-directory-excursion "tests/testthat"
+               (substitute* "test-LongTable-utils.R"
+                 ((".*doesn't miss assay observations.*" m)
+                  (string-append m "skip('guix')\n")))))))))
     (propagated-inputs
      (list r-bench
            r-biobase
@@ -7880,13 +7900,13 @@ Kallisto, Salmon, StringTie, Cufflinks/Cuffdiff etc.")
 (define-public r-isva
   (package
     (name "r-isva")
-    (version "1.10")
+    (version "1.9")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "isva" version))
               (sha256
                (base32
-                "1im1bwbf6l88m4bwwwr0z2x8bvw927s3fqbwc06s5240wc8syjpl"))))
+                "05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"))))
     (properties `((upstream-name . "isva")))
     (build-system r-build-system)
     (propagated-inputs (list r-fastica r-jade r-qvalue))
@@ -8653,13 +8673,13 @@ on Bioconductor or which replace R functions.")
 (define-public r-biomart
   (package
     (name "r-biomart")
-    (version "2.66.2")
+    (version "2.66.1")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "biomaRt" version))
               (sha256
                (base32
-                "1awsfklcs35vrmjkc12bk5ys9w7ib0799i3d0k138y44a0837pph"))))
+                "1cmzay4z9s183dc001rxfa81ql67la9y8m0p0wsn2iwzxzx94n8g"))))
     (properties
      `((upstream-name . "biomaRt")))
     (build-system r-build-system)
@@ -10317,13 +10337,13 @@ Enrichment Analysis} (GSEA).")
 (define-public r-gsva
   (package
     (name "r-gsva")
-    (version "2.4.8")
+    (version "2.4.6")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "GSVA" version))
               (sha256
                (base32
-                "0p9awi85dbmmyplhdfz0in4nhaavb58gpf48kqyp30rcc3v5a8h0"))))
+                "08i2s5zlm75mr7zl357cic2zxcy7aqqfv67xb0w67n48cw016ri6"))))
     (properties `((upstream-name . "GSVA")))
     (build-system r-build-system)
     (propagated-inputs (list r-biobase
@@ -10718,54 +10738,6 @@ nucleotide sequence analysis.  The package is primarily useful to developers
 of other R packages who wish to make use of HTSlib.")
     (license license:lgpl2.0+)))
 
-(define-public r-rliger
-  (package
-    (name "r-rliger")
-    (version "2.2.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/welch-lab/liger")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1w849km9b347m56qwr5lr6ymdk7wv22hr224riscm0zrnx402yb3"))))
-    (properties `((upstream-name . "rliger")))
-    (build-system r-build-system)
-    (propagated-inputs (list r-cli
-                             r-delayedarray
-                             r-dplyr
-                             r-ggplot2
-                             r-hdf5array
-                             r-hdf5r
-                             r-leidenalg
-                             r-lifecycle
-                             r-magrittr
-                             r-matrix
-                             r-patchwork
-                             r-rann
-                             r-rcpp
-                             r-rcpparmadillo
-                             r-rcppplanc
-                             r-rcppprogress
-                             r-rlang
-                             r-s4vectors
-                             r-scales
-                             r-uwot))
-    (native-inputs
-     (list r-circlize r-complexheatmap r-knitr r-testthat r-viridis))
-    (home-page "https://github.com/welch-lab/liger")
-    (synopsis "Linked inference of genomic experimental relationships")
-    (description
-     "LIGER is a package for integrating and analyzing multiple single-cell
-datasets. It relies on integrative non-negative matrix factorization to
-identify shared and dataset-specific factors.")
-    (license license:gpl3)))
-
-(define-deprecated-package r-liger
-  r-rliger)
-
 (define-public r-rnbeads
   (package
     (name "r-rnbeads")
@@ -11145,13 +11117,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.")
 (define-public r-maaslin2
   (package
     (name "r-maaslin2")
-    (version "1.24.1")
+    (version "1.22.0")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "Maaslin2" version))
        (sha256
-        (base32 "0z8vfx6db6xfvqdhg6n8jx3fmgwvq22facsacq6ym867kw2jafiz"))))
+        (base32 "10hdjhi1ykk513hzvs0bi6avzghqmkqns8knhz3ycv7bj3ynp70x"))))
     (properties `((upstream-name . "Maaslin2")))
     (build-system r-build-system)
     (propagated-inputs
@@ -11339,6 +11311,17 @@ high distances can be flagged as potentially low-quality.")
        ;; Avoid dependency cycle.
        (updater-ignored-native-inputs . ("r-spectra"))))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         ;; This test uses a deprecated procedure that has since been removed
+         ;; from testthat.
+         (add-after 'unpack 'testthat-compatibility
+           (lambda _
+             (substitute* "tests/testthat/test_zzz.R"
+               ((".*.onLoad works.*" m)
+                (string-append m "skip('guix')\n"))))))))
     (propagated-inputs (list r-biocparallel r-mscoreutils))
     (native-inputs (list r-callr r-knitr r-microbenchmark r-robustbase
                          r-testthat))
@@ -11545,13 +11528,13 @@ time-series data (including a graphical user interface).")
 (define-public r-mmuphin
   (package
     (name "r-mmuphin")
-    (version "1.24.0")
+    (version "1.22.0")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "MMUPHin" version))
        (sha256
-        (base32 "1zdk9ffa996w4acnhbs7grbji5s3plwhcl6m21yajrlck2i9y3cw"))
+        (base32 "0d8i9b6pjwz409jd46fm1n9h21hzg8zgzpvchywpyc1k896fvz4l"))
        ;; Delete generated files.
        (snippet
         '(for-each delete-file
@@ -14315,13 +14298,13 @@ level.")
 (define-public r-tcgautils
   (package
     (name "r-tcgautils")
-    (version "1.30.3")
+    (version "1.30.2")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "TCGAutils" version))
               (sha256
                (base32
-                "1nppp70675y3ds76jf61rhfis2lgkxqjhz48b367qa55g3q2ah61"))))
+                "1zwzx7mfp4s0v1rdjsyxj4l9w360g4qm3am8yf5lsd0biciqqh93"))))
     (properties `((upstream-name . "TCGAutils")))
     (build-system r-build-system)
     (arguments
@@ -15041,14 +15024,14 @@ unmodeled, or latent sources of noise.")
 (define-public r-systempiper
   (package
     (name "r-systempiper")
-    (version "2.16.4")
+    (version "2.16.3")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "systemPipeR" version))
        (sha256
         (base32
-         "1zrk6ky58f30wvaxph5dc2wr418qfpwc7d8pkxpl5dhb5g7vgn8r"))))
+         "0maixi0hwqzkpiq60hf60x4q3gv3hkvmrqh3ygv0fk63g1k9f6cj"))))
     (properties `((upstream-name . "systemPipeR")))
     (build-system r-build-system)
     ;; Tests fail because genWorkenvir fails to set up the environment.
@@ -15415,13 +15398,13 @@ molecular functions, respectively, and produces intuitive graphical outputs.")
 (define-public r-xllim
   (package
     (name "r-xllim")
-    (version "2.3.1")
+    (version "2.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "xLLiM" version))
        (sha256
-        (base32 "1h2z6a3j3yi7rj5lyk7gb1iyp2vf516fgmk7wr333gfkvk522n2r"))))
+        (base32 "08v6acn6vpn8asn61ldqdryjz0xk5zyd2v63aqrc5xximpqwrp7d"))))
     (properties `((upstream-name . "xLLiM")))
     (build-system r-build-system)
     (propagated-inputs (list r-abind
@@ -16321,14 +16304,14 @@ signals directly in the Bruker format.")
 (define-public r-codedepends
   (package
     (name "r-codedepends")
-    (version "0.6.7")
+    (version "0.6.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "CodeDepends" version))
        (sha256
         (base32
-         "02sj40qxq5vywgqay9q9vpv3s6j3jjr46kc8q3v1yw2vbsmlvrz0"))))
+         "0msq5ksjqp2pjzl6f1vizw53gdf5lz520bpdr5dbjwz5mc1mp0bz"))))
     (properties `((upstream-name . "CodeDepends")))
     (build-system r-build-system)
     (propagated-inputs
@@ -17399,14 +17382,14 @@ data.")
 (define-public r-ggtree
   (package
     (name "r-ggtree")
-    (version "4.0.5")
+    (version "4.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "ggtree" version))
        (sha256
         (base32
-         "0w9hqc3m35mrdqy5iwcm201pzpbl8jw6rd3wyzwp6f53wbbm2lbh"))))
+         "1qi5nispv0cirfayijybnn1nr8l6sb2adnic3y37qm3yv91w6s6z"))))
     (properties `((upstream-name . "ggtree")))
     (build-system r-build-system)
     (propagated-inputs
@@ -18720,13 +18703,13 @@ standardization of the analyses and the development of best practices.")
 (define-public r-microbiomestat
   (package
     (name "r-microbiomestat")
-    (version "1.4")
+    (version "1.3")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "MicrobiomeStat" version))
               (sha256
                (base32
-                "0in28lzds3sv1xa25vs8q5mmm1ax78s2axhq7mi23njqip5xmsr1"))))
+                "02xg8l4d0z5wrdrm5dj5a0q51vsbhf3f6z2lk8294c4d85s09dhl"))))
     (properties
      '((upstream-name . "MicrobiomeStat")
        (updater-extra-inputs . ("nlopt"))
@@ -18734,21 +18717,23 @@ standardization of the analyses and the development of best practices.")
     (build-system r-build-system)
     (inputs (list nlopt))
     (native-inputs (list pkg-config))
-    (propagated-inputs (list r-bbotk
+    (propagated-inputs (list r-bbmisc
                              r-dplyr
                              r-foreach
                              r-ggplot2
                              r-ggrepel
+                             r-lhs
                              r-lmertest
                              r-mass
                              r-matrix
                              r-matrixstats
-                             r-mlr3
-                             r-mlr3mbo
+                             r-mlr
+                             r-mlrmbo
                              r-modeest
-                             r-paradox
+                             r-paramhelpers
                              r-rcpp
                              r-rcpparmadillo
+                             r-smoof
                              r-statmod))
     (home-page "https://cran.r-project.org/package=MicrobiomeStat")
     (synopsis "Statistical methods for microbiome compositional data")
@@ -19652,14 +19637,14 @@ correspondence between different data sources.")
 (define-public r-enrichplot
   (package
     (name "r-enrichplot")
-    (version "1.30.5")
+    (version "1.30.4")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "enrichplot" version))
        (sha256
         (base32
-         "12c6xwp29mmalvxp3asliv2hlha5vv8l37prmmcgpdi4nghfic3b"))))
+         "080q91ll8rvqf93hcmxc7kjbmmihyh0vrpxck2pqrwglbqxm4xll"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-aplot
@@ -22904,14 +22889,14 @@ expression space.")
 (define-public r-cicero
   (package
     (name "r-cicero")
-    (version "1.28.3")
+    (version "1.28.0")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "cicero" version))
        (sha256
         (base32
-         "016wpficnbricf4f7sgq8j53cl178f1332fh9zvlx7q560489zf1"))))
+         "1ibxynw77a8mqv9av7z828wcazjpm4sfp83hd412f2rmgkls895x"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-assertthat
@@ -23543,14 +23528,14 @@ populations, splice site strength, conservation, etc.")
 (define-public r-variancepartition
   (package
     (name "r-variancepartition")
-    (version "1.40.2")
+    (version "1.40.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "variancePartition" version))
        (sha256
         (base32
-         "0k2rcgg4ll06b9j7999d4l60wpmi3vnjaqiy5ay8ppd1z0m38ygf"))))
+         "1xqy4jl8im7i4kd4iwn8hvhy172fzsadyn90kprihmvccmpd5cr3"))))
     (properties
      '((upstream-name . "variancePartition")
        (updater-extra-native-inputs . ("r-rfast"))))
@@ -23891,26 +23876,30 @@ rate} (FDR).")
 (define-public r-activedriverwgs
   (package
     (name "r-activedriverwgs")
-    (version "1.2.1")
+    (version "1.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ActiveDriverWGS" version))
        (sha256
         (base32
-         "1v6lnzbaksqpc33q3bp4mwij6rrfbqhi5wk1qx32h2wr2hr4208y"))))
+         "0xnplgwxd197a4d422bsxg753q158i12ils16awd1cw30wafdxkk"))))
     (properties
      `((upstream-name . "ActiveDriverWGS")))
     (build-system r-build-system)
     (propagated-inputs
      (list r-biostrings
            r-bsgenome
+           r-bsgenome-hsapiens-ucsc-hg19
+           r-bsgenome-hsapiens-ucsc-hg38
+           r-bsgenome-mmusculus-ucsc-mm9
+           r-bsgenome-mmusculus-ucsc-mm10
            r-genomeinfodb
            r-genomicranges
            r-iranges
            r-s4vectors))
     (native-inputs
-     (list r-bsgenome-hsapiens-ucsc-hg19 r-knitr r-testthat))
+     (list r-knitr r-testthat))
     (home-page "https://cran.r-project.org/web/packages/ActiveDriverWGS/")
     (synopsis "Driver discovery tool for cancer whole genomes")
     (description
@@ -24770,13 +24759,13 @@ functionality.")
 (define-public r-biocviews
   (package
     (name "r-biocviews")
-    (version "1.78.1")
+    (version "1.78.0")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "biocViews" version))
               (sha256
                (base32
-                "1qw3xwsffdqfwpmwrpzg8rnjwv9l45lkjz8bf5272hkhgjc7b1a8"))))
+                "1dfsfj4dm9wnh4qr1sqdrwzccl3pgw58j17vr3i1bvxkrq31p1ws"))))
     (properties
      `((upstream-name . "biocViews")))
     (build-system r-build-system)
@@ -24889,14 +24878,14 @@ db and resource files to AWS S3 buckets.")
 (define-public r-multiassayexperiment
   (package
     (name "r-multiassayexperiment")
-    (version "1.36.2")
+    (version "1.36.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "MultiAssayExperiment" version))
        (sha256
         (base32
-         "0bhr51c58vdfvly0bh3hgr397qkq45yw8221rpr38cah7dbzvrba"))))
+         "09jwnwiq4vx7cmzq5va3rh7npjyhi1p5p344c4n0h9nr55mxzjiw"))))
     (properties
      '((upstream-name . "MultiAssayExperiment")
        (updater-extra-native-inputs
@@ -25965,13 +25954,13 @@ provided for direct creation of an in-memory tatami matrix from a HDF5 file.")
 (define-public r-beadarray
   (package
     (name "r-beadarray")
-    (version "2.60.1")
+    (version "2.58.0")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "beadarray" version))
               (sha256
                (base32
-                "1bcirbg10ai6jpa8a5ppq4450r5h2bwizb98qn0z0hmm1mm4ww9r"))))
+                "0m9hmy4xn7q2v4ra95b9h08d0qh5qmjgqmg96vabyv46gn5i7qp4"))))
     (properties `((upstream-name . "beadarray")))
     (build-system r-build-system)
     (propagated-inputs (list r-annotationdbi
@@ -26401,13 +26390,13 @@ of other packages.")
 (define-public r-scater
   (package
     (name "r-scater")
-    (version "1.38.1")
+    (version "1.38.0")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "scater" version))
               (sha256
                (base32
-                "1p8dzjphrcqai1f8wh56jfv377dqzdfnx2sl9sn73axbsr41swa7"))))
+                "1qwygk8fg8nharrkmjs65fcl3lsdi232f2383s5j8vm1qil5gghd"))))
     (build-system r-build-system)
     (properties
      '((updater-extra-native-inputs
@@ -26512,13 +26501,13 @@ variable and significantly correlated genes.")
 (define-public r-sparsearray
   (package
     (name "r-sparsearray")
-    (version "1.10.10")
+    (version "1.10.8")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "SparseArray" version))
        (sha256
-        (base32 "19c1dfa5wizq7k53a43i5dwwaqs44prclxbf1k0i3awx5wz6qlbw"))))
+        (base32 "1bjxljwfrv787ikp61xl29wx3k6624qz75gl1kzfif62vys7vgf0"))))
     (properties `((upstream-name . "SparseArray")))
     (build-system r-build-system)
     (propagated-inputs (list r-biocgenerics
@@ -27172,14 +27161,14 @@ with your data.")
 (define-public r-gwascat
   (package
     (name "r-gwascat")
-    (version "2.42.1")
+    (version "2.42.0")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "gwascat" version))
        (sha256
         (base32
-         "0djrd63nsqpy46acblg5k8pq6ldqccr35r6h0sf4xridpkqm78b1"))))
+         "1v5z4fmwgs3swvpa09y986sracz0nsggq8s9hp1nmwb9a9grw8px"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-annotationdbi
@@ -27194,6 +27183,7 @@ with your data.")
            r-readr
            r-s4vectors
            r-seqinfo
+           r-snpstats
            r-tibble
            r-variantannotation))
     (native-inputs
@@ -27654,6 +27644,16 @@ visualizations for publication-quality multi-panel figures.")
          "1c7vy10ga3cswsqwxljbgqlsjg0d2lx9srfknbjy4fkbyrjci15k"))))
     (properties `((upstream-name . "ballgown")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         ;; These deprecated procedures have been removed in testthat.
+         (add-after 'unpack 'testthat-compatibility
+           (lambda _
+             (substitute* "tests/testthat/test-annotation.R"
+               (("is_true\\(\\)") "expect_true")
+               (("is_false\\(\\)") "expect_false")))))))
     (propagated-inputs
      (list r-biobase
            r-genomicranges
@@ -28409,18 +28409,28 @@ separate published packages.")
 (define-public r-biomformat
   (package
     (name "r-biomformat")
-    (version "1.38.3")
+    (version "1.38.0")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "biomformat" version))
        (sha256
         (base32
-         "0b0w0mfx448ph8fla3nb4i50mvpnv498kxip7rnh14xwas9rhdd7"))))
+         "1ydcgifdrgg48y7qxg0gw30h332y3yk3k3n17fajkv58mlvyx1yc"))))
     (properties `((upstream-name . "biomformat")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         ;; These deprecated procedures have been removed in testthat.
+         (add-after 'unpack 'testthat-compatibility
+           (lambda _
+             (substitute* "tests/testthat/test-IO.R"
+               (("is_true\\(\\)") "expect_true")
+               (("is_false\\(\\)") "expect_false")))))))
     (propagated-inputs
-     (list r-jsonlite r-matrix r-rhdf5))
+     (list r-jsonlite r-matrix r-plyr r-rhdf5))
     (native-inputs (list r-knitr r-testthat))
     (home-page "https://github.com/joey711/biomformat/")
     (synopsis "Interface package for the BIOM file format")
@@ -29178,15 +29188,25 @@ reproducibility.")
 (define-public r-phyloseq
   (package
     (name "r-phyloseq")
-    (version "1.54.2")
+    (version "1.54.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "phyloseq" version))
        (sha256
-        (base32 "106zwzzwzvb5x0lz9i68wshh2nsa2rf5rmkqjqsvr4smxq6hknlj"))))
+        (base32 "1zivxag6b2bjh32k1mpn7hlvalap97rp90x3cbfynqrk6933f4bq"))))
     (properties `((upstream-name . "phyloseq")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         ;; These deprecated procedures have been removed in testthat.
+         (add-after 'unpack 'testthat-compatibility
+           (lambda _
+             (substitute* (find-files "tests/testthat" "\\.R$")
+               (("is_true\\(\\)") "expect_true")
+               (("is_false\\(\\)") "expect_false")))))))
     (propagated-inputs
      (list r-ade4
            r-ape

gnu/packages/bioinformatics.scm

@@ -922,10 +922,7 @@ suite native in R.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))
-       (modules '((guix build utils)))
-       (snippet
-        '(delete-file-recursively "r/src/vendor/highway"))))
+        (base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))))
     (properties `((upstream-name . "BPCells")))
     (build-system r-build-system)
     (arguments
@@ -933,11 +930,7 @@ suite native in R.")
       #:phases
       '(modify-phases %standard-phases
          (add-after 'unpack 'chdir
-           (lambda _
-             (substitute* "r/configure"
-               (("tools/hwy-test.cpp" m)
-                (string-append m " $HWY_LIBS $HWY_CFLAGS")))
-             (chdir "r"))))))
+           (lambda _ (chdir "r"))))))
     (propagated-inputs
      (list r-dplyr
            r-ggplot2
@@ -964,7 +957,7 @@ suite native in R.")
            r-igraph
            r-iranges
            r-matrixstats))
-    (inputs (list hdf5 google-highway zlib))
+    (inputs (list hdf5 zlib))
     (native-inputs (list pkg-config))
     (home-page "https://github.com/bnprks/BPCells")
     (synopsis "Single cell counts matrices to PCA")

gnu/packages/bison.scm

@@ -21,14 +21,15 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages bison)
-  #:use-module (guix licenses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix utils)
-  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages flex)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (srfi srfi-1))
 
 (define-public bison
@@ -45,24 +46,29 @@
         "1wjvbbzrr16k1jlby3l436an3kvv492h08arbnf0gwgprha05flv"))))
     (build-system gnu-build-system)
     (arguments
-     `(;; Building in parallel on many-core systems may cause an error such as
-       ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or
-       ;; directory".  See <https://bugs.gnu.org/36238>.
-       #:parallel-build? #f
-       ;; Similarly, when building tests in parallel, Make may produce this error:
-       ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file
-       ;; or directory".  Full log in <https://bugs.gnu.org/36238>.
-       #:parallel-tests? #f
-       ;; On the Hurd with glibc 2.41 bison uses weak symbols from pthread
-       ;; but does not link to it.
-       ,@(if (target-hurd?)
-             (list #:configure-flags ''("LIBS=-lpthread"))
-             '())))
-    (native-inputs (list perl
-                         ;; m4 is not present in PATH when cross-building.
-                         m4))
-    (inputs (list flex))
-    (propagated-inputs (list m4))
+     (list
+      ;; Building in parallel on many-core systems may cause an error such as
+      ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or
+      ;; directory".  See <https://bugs.gnu.org/36238>.
+      #:parallel-build? #f
+      ;; Similarly, when building tests in parallel, Make may produce this error:
+      ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file
+      ;; or directory".  Full log in <https://bugs.gnu.org/36238>.
+      #:parallel-tests? #f
+      #:configure-flags
+      ;; On the Hurd with glibc 2.41 bison uses weak symbols from pthread
+      ;; but does not link to it.
+      (if (target-hurd?)
+          #~(list "LIBS=-lpthread")
+          #~(list))))
+    (native-inputs
+     (list perl
+           ;; m4 is not present in PATH when cross-building.
+           m4))
+    (inputs
+     (list flex))
+    (propagated-inputs
+     (list m4))
     (home-page "https://www.gnu.org/software/bison/")
     (synopsis "Yacc-compatible parser generator")
     (description
@@ -72,4 +78,4 @@ grammar.  It is versatile enough to have many applications, from parsers for
 simple tools through complex programming languages.
 
 Bison also provides an implementation of @command{yacc}, as specified by POSIX.")
-    (license gpl3+)))
+    (license license:gpl3+)))

gnu/packages/bootstrap.scm

@@ -37,7 +37,7 @@
                 #:select (raw-derivation derivation-input derivation->output-path))
   #:use-module (guix utils)
   #:use-module ((guix build utils) #:select (elf-file?))
-  #:use-module ((guix gexp) #:select (lower-object local-file))
+  #:use-module (guix gexp)
   #:use-module (guix monads)
   #:use-module (guix memoization)
   #:use-module (guix i18n)
@@ -204,10 +204,7 @@ for system '~a'")
            (uri (map (cute string-append <>
                            (bootstrap-executable-file-name system program))
                      %bootstrap-executable-base-urls))
-           ;; XXX: In the long term, migrate all boostrap executables to
-           ;; (string-append "bootstrap-" program), and drop the additional
-           ;; file-name argument.
-           (file-name file-name)
+           (file-name (string-append "bootstrap-" program))
            (hash (content-hash bv sha256))))))))
 
 (define* (bootstrap-executable program system #:optional file-name)
@@ -267,32 +264,33 @@ or false to signal an error."
     (version "0")
     (build-system trivial-build-system)
     (arguments
-     `(#:guile ,%bootstrap-guile
-       #:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
+     (list
+      #:guile %bootstrap-guile
+      #:modules '((guix build utils))
+      #:builder
+      #~(begin
+          (use-modules (guix build utils))
 
-         (let ((out     (assoc-ref %outputs "out"))
-              (tar     (assoc-ref %build-inputs "tar"))
-              (xz      (assoc-ref %build-inputs "xz"))
-              (tarball (assoc-ref %build-inputs "tarball")))
+          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
+                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
+                (tarball (assoc-ref %build-inputs
+                                    #$(string-append name ".tar.xz"))))
 
-          (mkdir out)
-          (copy-file tarball "binaries.tar.xz")
-          (invoke xz "-d" "binaries.tar.xz")
-          (let ((builddir (getcwd)))
-            (with-directory-excursion out
-              (invoke tar "xvf"
-                      (string-append builddir "/binaries.tar"))
-              ,@(if snippet (list snippet) '())
-              (or (not ,program-to-test)
-                  (invoke (string-append "bin/" ,program-to-test)
-                          "--version"))))))))
+            (mkdir #$output)
+            (copy-file tarball "binaries.tar.xz")
+            (invoke xz "-d" "binaries.tar.xz")
+            (let ((builddir (getcwd)))
+              (with-directory-excursion #$output
+                (invoke tar "xvf"
+                        (string-append builddir "/binaries.tar"))
+                #$@(if snippet (list snippet) '())
+                (or (not #$program-to-test)
+                    (invoke (string-append "bin/" #$program-to-test)
+                            "--version"))))))))
     (inputs
-     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
-       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
-       ("tarball" ,(bootstrap-origin (source (%current-system))))))
+     (list (bootstrap-executable "tar" (%current-system))
+           (bootstrap-executable "xz" (%current-system))
+           (bootstrap-origin (source (%current-system)))))
     (source #f)
     (synopsis description)
     (description description)
@@ -635,37 +633,29 @@ $out/bin/guile --version~%"
                                             (_
                                              "/20131110/static-binaries.tar.xz")))
                                      %bootstrap-base-urls))
+                           (file-name "bootstrap-binaries.tar.xz")
                            (sha256
-                            (match system
-                              ("x86_64-linux"
-                               (base32
-                                "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4"))
-                              ("i686-linux"
-                               (base32
-                                "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak"))
-                              ("armhf-linux"
-                               (base32
-                                "0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5"))
-                              ("aarch64-linux"
-                               (base32
-                                "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh"))
-                              ("powerpc64le-linux"
-                               (base32
-                                "0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v"))
-                              ("i586-gnu"
-                               (base32
-                                "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn"))
-                              ("x86_64-gnu"
-                               (base32
-                                "0xnw5p6279m8xazbhal5ld5qxsya0249z2l6jcc7w9ndh2gnx07v"))
-                              ("powerpc-linux"
-                               (base32
-                                "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m"))
-                              ("riscv64-linux"
-                               (base32
-                                "0x0xjlpmyh6rkr51p00gp6pscgl6zjida1rsg8vk3rinyi6rrbkg"))
-                              ("mips64el-linux"
-                               (base32
+                            (base32
+                             (match system
+                               ("x86_64-linux"
+                                "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4")
+                               ("i686-linux"
+                                "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak")
+                               ("armhf-linux"
+                                "0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5")
+                               ("aarch64-linux"
+                                "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh")
+                               ("powerpc64le-linux"
+                                "0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v")
+                               ("i586-gnu"
+                                "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")
+                               ("x86_64-gnu"
+                                "0xnw5p6279m8xazbhal5ld5qxsya0249z2l6jcc7w9ndh2gnx07v")
+                               ("powerpc-linux"
+                                "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")
+                               ("riscv64-linux"
+                                "0x0xjlpmyh6rkr51p00gp6pscgl6zjida1rsg8vk3rinyi6rrbkg")
+                               ("mips64el-linux"
                                 "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753"))))))
                         "fgrep"                    ; the program to test
                         "Bootstrap binaries of Coreutils, Awk, etc."
@@ -693,6 +683,7 @@ $out/bin/guile --version~%"
                        "/i686-linux/20190815/"
                        "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz")
                  %bootstrap-base-urls))
+       (file-name "linux-libre-headers-bootstrap.tar.xz")
        (sha256
         (base32
          "0sm2z9x4wk45bh6qfs94p0w1d6hsy6dqx9sw38qsqbvxwa1qzk8s"))))
@@ -700,63 +691,56 @@ $out/bin/guile --version~%"
    "Bootstrap linux-libre-headers"))
 
 (define %bootstrap-binutils
-  (package-from-tarball "binutils-bootstrap"
-                        (lambda (system)
-                          (origin
-                           (method url-fetch)
-                           (uri (map (cut string-append <> "/" system
-                                          (match system
-                                            ("armhf-linux"
-                                             "/20150101/binutils-2.25.tar.xz")
-                                            ("aarch64-linux"
-                                             "/20170217/binutils-2.27.tar.xz")
-                                            ("powerpc64le-linux"
-                                             "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz")
-                                            ("i586-gnu"
-                                             "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
-                                            ("x86_64-gnu"
-                                             "/20260302/binutils-static-stripped-2.44-x86_64-pc-gnu.tar.xz")
-                                            ("powerpc-linux"
-                                             "/20200923/binutils-2.35.1.tar.xz")
-                                            ("riscv64-linux"
-                                             "/20210725/binutils-2.34.tar.xz")
-                                            (_
-                                             "/20131110/binutils-2.23.2.tar.xz")))
-                                     %bootstrap-base-urls))
-                           (sha256
-                            (match system
-                              ("x86_64-linux"
-                               (base32
-                                "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20"))
-                              ("i686-linux"
-                               (base32
-                                "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9"))
-                              ("armhf-linux"
-                               (base32
-                                "1v7dj6bzn6m36f20gw31l99xaabq4xrhrx3gwqkhhig0mdlmr69q"))
-                              ("aarch64-linux"
-                               (base32
-                                "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n"))
-                              ("powerpc64le-linux"
-                               (base32
-                                "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz"))
-                              ("riscv64-linux"
-                               (base32
-                                "0n9qf4vbilfmh1lknhw000waakj4q6s50pnjazr5137skm976z5m"))
-                              ("i586-gnu"
-                               (base32
-                                "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs"))
-                              ("x86_64-gnu"
-                               (base32
-                                "033bgmaa012b2lw8g76b02mjgzdnzv2yd3jvaqbhqrr5q9r3xn04"))
-                              ("powerpc-linux"
-                               (base32
-                                "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8"))
-                              ("mips64el-linux"
-                               (base32
-                                "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7"))))))
-                        "ld"                      ; the program to test
-                        "Bootstrap binaries of the GNU Binutils"))
+  (package-from-tarball
+   "binutils-bootstrap"
+   (lambda (system)
+     (origin
+       (method url-fetch)
+       (uri (map (cut string-append <> "/" system
+                      (match system
+                        ("armhf-linux"
+                         "/20150101/binutils-2.25.tar.xz")
+                        ("aarch64-linux"
+                         "/20170217/binutils-2.27.tar.xz")
+                        ("powerpc64le-linux"
+                         "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz")
+                        ("i586-gnu"
+                         "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
+                        ("x86_64-gnu"
+                         "/20260302/binutils-static-stripped-2.44-x86_64-pc-gnu.tar.xz")
+                        ("powerpc-linux"
+                         "/20200923/binutils-2.35.1.tar.xz")
+                        ("riscv64-linux"
+                         "/20210725/binutils-2.34.tar.xz")
+                        (_
+                         "/20131110/binutils-2.23.2.tar.xz")))
+                 %bootstrap-base-urls))
+       (file-name "binutils-bootstrap.tar.xz")
+       (sha256
+        (base32
+         (match system
+           ("x86_64-linux"
+            "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20")
+           ("i686-linux"
+            "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9")
+           ("armhf-linux"
+            "1v7dj6bzn6m36f20gw31l99xaabq4xrhrx3gwqkhhig0mdlmr69q")
+           ("aarch64-linux"
+            "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n")
+           ("powerpc64le-linux"
+            "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz")
+           ("riscv64-linux"
+            "0n9qf4vbilfmh1lknhw000waakj4q6s50pnjazr5137skm976z5m")
+           ("i586-gnu"
+            "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")
+           ("x86_64-gnu"
+            "033bgmaa012b2lw8g76b02mjgzdnzv2yd3jvaqbhqrr5q9r3xn04")
+           ("powerpc-linux"
+            "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8")
+           ("mips64el-linux"
+            "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7"))))))
+   "ld"                      ; the program to test
+   "Bootstrap binaries of the GNU Binutils"))
 
 (define %bootstrap-glibc
   ;; The initial libc.
@@ -766,99 +750,91 @@ $out/bin/guile --version~%"
     (source #f)
     (build-system trivial-build-system)
     (arguments
-     `(#:guile ,%bootstrap-guile
-       #:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
+     (list
+      #:guile %bootstrap-guile
+      #:modules '((guix build utils))
+      #:builder
+      #~(begin
+          (use-modules (guix build utils))
 
-         (let ((out     (assoc-ref %outputs "out"))
-              (tar     (assoc-ref %build-inputs "tar"))
-              (xz      (assoc-ref %build-inputs "xz"))
-              (tarball (assoc-ref %build-inputs "tarball")))
+          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
+                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
+                (tarball (assoc-ref %build-inputs "glibc.tar.xz")))
 
-          (mkdir out)
-          (copy-file tarball "binaries.tar.xz")
-          (invoke xz "-d" "binaries.tar.xz")
-          (let ((builddir (getcwd)))
-            (with-directory-excursion out
-              (invoke tar "xvf"
-                      (string-append builddir
-                                     "/binaries.tar"))
-              (chmod "lib" #o755)
+            (mkdir #$output)
+            (copy-file tarball "binaries.tar.xz")
+            (invoke xz "-d" "binaries.tar.xz")
+            (let ((builddir (getcwd)))
+              (with-directory-excursion #$output
+                (invoke tar "xvf"
+                        (string-append builddir
+                                       "/binaries.tar"))
+                (chmod "lib" #o755)
 
-              ;; Patch linker scripts so they refer to the right file-names.
-              (substitute* ,(cond ((target-hurd64?)
-                                   ''("lib/libc.so" "lib/libm.so"))
-                                  ((and (not (target-hurd?))
-                                        (or (target-x86?)
-                                            (target-arm?)))
-                                   ''("lib/libc.so" "lib/libpthread.so"))
-                                  (else
-                                   ''("lib/libc.so")))
-                (("/[^ ]+/lib/(libc|libh|libm|libpthread|ld)" _ prefix)
-                 (string-append out "/lib/" prefix)))
-              ,@(if (target-arm32?)
-                    `((substitute* "lib/libpthread.so"
-                        (("/[^ ]+/lib/libpthread_nonshared\\.a") "")))
-                    `())))))))
+                ;; Patch linker scripts so they refer to the right file-names.
+                (substitute* #$(cond ((target-hurd64?)
+                                      ''("lib/libc.so" "lib/libm.so"))
+                                     ((and (not (target-hurd?))
+                                           (or (target-x86?)
+                                               (target-arm?)))
+                                      ''("lib/libc.so" "lib/libpthread.so"))
+                                     (else
+                                      ''("lib/libc.so")))
+                  (("/[^ ]+/lib/(libc|libh|libm|libpthread|ld)" _ prefix)
+                   (string-append #$output "/lib/" prefix)))
+                #$@(if (target-arm32?)
+                       #~((substitute* "lib/libpthread.so"
+                            (("/[^ ]+/lib/libpthread_nonshared\\.a") "")))
+                       #~())))))))
     (inputs
-     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
-       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
-       ("tarball" ,(bootstrap-origin
-                    (origin
-                     (method url-fetch)
-                     (uri (map (cut string-append <> "/" (%current-system)
-                                    (match (%current-system)
-                                      ("armhf-linux"
-                                       "/20150101/glibc-2.20.tar.xz")
-                                      ("aarch64-linux"
-                                       "/20170217/glibc-2.25.tar.xz")
-                                      ("powerpc64le-linux"
-                                       "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz")
-                                      ("i586-gnu"
-                                       "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz")
-                                      ("x86_64-gnu"
-                                       "/20260302/glibc-stripped-2.41-x86_64-pc-gnu.tar.xz")
-                                      ("powerpc-linux"
-                                       "/20200923/glibc-2.32.tar.xz")
-                                      ("riscv64-linux"
-                                       "/20210725/glibc-2.31.tar.xz")
-                                      (_
-                                       "/20131110/glibc-2.18.tar.xz")))
-                               %bootstrap-base-urls))
-                     (sha256
-                      (match (%current-system)
-                        ("x86_64-linux"
-                         (base32
-                          "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v"))
-                        ("i686-linux"
-                         (base32
-                          "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w"))
-                        ("armhf-linux"
-                         (base32
-                          "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn"))
-                        ("aarch64-linux"
-                         (base32
-                          "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c"))
-                        ("powerpc64le-linux"
-                         (base32
-                          "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz"))
-                        ("riscv64-linux"
-                         (base32
-                          "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm"))
-                        ("i586-gnu"
-                         (base32
-                          "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2"))
-                        ("x86_64-gnu"
-                         (base32
-                          "1lpvk0l7qqvz46cnxm64a1a40zg0gj90j3glyk67i1sh5r4znlmy"))
-                        ("powerpc-linux"
-                         (base32
-                          "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb"))
-                        ("mips64el-linux"
-                         (base32
-                          "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg")))))))))
+     (list (bootstrap-executable "tar" (%current-system))
+           (bootstrap-executable "xz" (%current-system))
+           (bootstrap-origin
+            (origin
+              (method url-fetch)
+              (uri (map (cut string-append <> "/" (%current-system)
+                             (match (%current-system)
+                               ("armhf-linux"
+                                "/20150101/glibc-2.20.tar.xz")
+                               ("aarch64-linux"
+                                "/20170217/glibc-2.25.tar.xz")
+                               ("powerpc64le-linux"
+                                "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz")
+                               ("i586-gnu"
+                                "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz")
+                               ("x86_64-gnu"
+                                "/20260302/glibc-stripped-2.41-x86_64-pc-gnu.tar.xz")
+                               ("powerpc-linux"
+                                "/20200923/glibc-2.32.tar.xz")
+                               ("riscv64-linux"
+                                "/20210725/glibc-2.31.tar.xz")
+                               (_
+                                "/20131110/glibc-2.18.tar.xz")))
+                        %bootstrap-base-urls))
+              (file-name "glibc.tar.xz")
+              (sha256
+               (base32
+                (match (%current-system)
+                  ("x86_64-linux"
+                   "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")
+                  ("i686-linux"
+                   "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")
+                  ("armhf-linux"
+                   "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn")
+                  ("aarch64-linux"
+                   "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")
+                  ("powerpc64le-linux"
+                   "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")
+                  ("riscv64-linux"
+                   "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm")
+                  ("i586-gnu"
+                   "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2")
+                  ("x86_64-gnu"
+                   "1lpvk0l7qqvz46cnxm64a1a40zg0gj90j3glyk67i1sh5r4znlmy")
+                  ("powerpc-linux"
+                   "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")
+                  ("mips64el-linux"
+                   "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))
     (synopsis "Bootstrap binaries and headers of the GNU C Library")
     (description synopsis)
     (home-page #f)
@@ -873,110 +849,102 @@ $out/bin/guile --version~%"
     (source #f)
     (build-system trivial-build-system)
     (arguments
-     `(#:guile ,%bootstrap-guile
-       #:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils)
-                      (ice-9 popen))
+     (list
+      #:guile %bootstrap-guile
+      #:modules '((guix build utils))
+      #:builder
+      #~(begin
+          (use-modules (guix build utils)
+                       (ice-9 popen))
 
-         (let ((out     (assoc-ref %outputs "out"))
-               (tar     (assoc-ref %build-inputs "tar"))
-               (xz      (assoc-ref %build-inputs "xz"))
-               (bash    (assoc-ref %build-inputs "bash"))
-               (libc    (assoc-ref %build-inputs "libc"))
-               (tarball (assoc-ref %build-inputs "tarball")))
+          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
+                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
+                (bash    (assoc-ref %build-inputs "bootstrap-bash"))
+                (libc    (assoc-ref %build-inputs "glibc-bootstrap"))
+                (tarball (assoc-ref %build-inputs "gcc.tar.xz")))
 
-           (mkdir out)
-           (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link
-           (invoke xz "-d" "binaries.tar.xz")
-           (let ((builddir (getcwd))
-                 (bindir   (string-append out "/bin")))
+            (mkdir #$output)
+            (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link
+            (invoke xz "-d" "binaries.tar.xz")
+            (let ((builddir (getcwd))
+                  (bindir   (string-append #$output "/bin")))
 
-             (define (wrap-program program)
-               (let ((wrapped (format #f ".~a-wrapped" program)))
-                 (rename-file program wrapped)
-                 (call-with-output-file program
-                   (lambda (p)
-                     (format p "#!~a
+              (define (wrap-program program)
+                (let ((wrapped (format #f ".~a-wrapped" program)))
+                  (rename-file program wrapped)
+                  (call-with-output-file program
+                    (lambda (p)
+                      (format p "#!~a
 exec ~a/bin/~a -B~a/lib \
      -Wl,-rpath -Wl,~a/lib \
      -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
-                             bash
-                             out wrapped
-                             libc libc libc
-                             ,(glibc-dynamic-linker)))))
-               (chmod program #o555))
+                              bash
+                              #$output wrapped
+                              libc libc libc
+                              #$(glibc-dynamic-linker)))))
+                (chmod program #o555))
 
-             (with-directory-excursion out
-               (invoke tar "xvf"
-                       (string-append builddir "/binaries.tar")))
+              (with-directory-excursion #$output
+                (invoke tar "xvf"
+                        (string-append builddir "/binaries.tar")))
 
-             (with-directory-excursion bindir
-               (chmod "." #o755)
-               (for-each wrap-program
-                         ,(if (target-hurd64?)
-                              ''("gcc" "g++")
-                              ''("gcc")))))))))
+              (with-directory-excursion bindir
+                (chmod "." #o755)
+                (for-each wrap-program
+                          #$(if (target-hurd64?)
+                                ''("gcc" "g++")
+                                ''("gcc")))))))))
     (inputs
-     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
-       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
-       ("bash" ,(bootstrap-executable "bash" (%current-system)))
-       ("libc" ,%bootstrap-glibc)
-       ("tarball" ,(bootstrap-origin
-                    (origin
-                      (method url-fetch)
-                      (uri (map (cut string-append <> "/" (%current-system)
-                                     (match (%current-system)
-                                       ("armhf-linux"
-                                        "/20150101/gcc-4.8.4.tar.xz")
-                                       ("aarch64-linux"
-                                        "/20170217/gcc-5.4.0.tar.xz")
-                                       ("powerpc64le-linux"
-                                        "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz")
-                                       ("i586-gnu"
-                                        "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
-                                       ("x86_64-gnu"
-                                        "/20260302/gcc-stripped-14.3.0-x86_64-pc-gnu.tar.xz")
-                                       ("powerpc-linux"
-                                        "/20200923/gcc-5.5.0.tar.xz")
-                                       ("riscv64-linux"
-                                        "/20210725/gcc-7.5.0.tar.xz")
-                                       (_
-                                        "/20131110/gcc-4.8.2.tar.xz")))
-                                %bootstrap-base-urls))
-                      (sha256
-                       (match (%current-system)
-                         ("x86_64-linux"
-                          (base32
-                           "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls"))
-                         ("i686-linux"
-                          (base32
-                           "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw"))
-                         ("armhf-linux"
-                          (base32
-                           "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v"))
-                         ("aarch64-linux"
-                          (base32
-                           "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1"))
-                         ("powerpc64le-linux"
-                          (base32
-                           "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1"))
-                         ("riscv64-linux"
-                          (base32
-                           "1k4mbnb54wj2q37fgshf5dfixixqnhn002vhzvi9pnb57xb9v14d"))
-                         ("i586-gnu"
-                          (base32
-                           "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5"))
-                         ("x86_64-gnu"
-                          (base32
-                           "1fhi7f5zld08b6qsyv1d48ha7z0vr8pxr4kf8x7aq1a3kbcv5rkz"))
-                         ("powerpc-linux"
-                          (base32
-                           "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w"))
-                         ("mips64el-linux"
-                          (base32
-                           "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks")))))))))
+     (list (bootstrap-executable "tar" (%current-system))
+           (bootstrap-executable "xz" (%current-system))
+           (bootstrap-executable "bash" (%current-system))
+           %bootstrap-glibc
+           (bootstrap-origin
+            (origin
+              (method url-fetch)
+              (uri (map (cut string-append <> "/" (%current-system)
+                             (match (%current-system)
+                               ("armhf-linux"
+                                "/20150101/gcc-4.8.4.tar.xz")
+                               ("aarch64-linux"
+                                "/20170217/gcc-5.4.0.tar.xz")
+                               ("powerpc64le-linux"
+                                "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz")
+                               ("i586-gnu"
+                                "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
+                               ("x86_64-gnu"
+                                "/20260302/gcc-stripped-14.3.0-x86_64-pc-gnu.tar.xz")
+                               ("powerpc-linux"
+                                "/20200923/gcc-5.5.0.tar.xz")
+                               ("riscv64-linux"
+                                "/20210725/gcc-7.5.0.tar.xz")
+                               (_
+                                "/20131110/gcc-4.8.2.tar.xz")))
+                        %bootstrap-base-urls))
+              (file-name "gcc.tar.xz")
+              (sha256
+               (base32
+                (match (%current-system)
+                  ("x86_64-linux"
+                   "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")
+                  ("i686-linux"
+                   "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")
+                  ("armhf-linux"
+                   "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v")
+                  ("aarch64-linux"
+                   "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")
+                  ("powerpc64le-linux"
+                   "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1")
+                  ("riscv64-linux"
+                   "1k4mbnb54wj2q37fgshf5dfixixqnhn002vhzvi9pnb57xb9v14d")
+                  ("i586-gnu"
+                   "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")
+                  ("x86_64-gnu"
+                   "1fhi7f5zld08b6qsyv1d48ha7z0vr8pxr4kf8x7aq1a3kbcv5rkz")
+                  ("powerpc-linux"
+                   "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w")
+                  ("mips64el-linux"
+                   "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))
     (native-search-paths
      (list (search-path-specification
             (variable "C_INCLUDE_PATH")
@@ -997,14 +965,12 @@ exec ~a/bin/~a -B~a/lib \
   ;; own packages.
   (match (%current-system)
     ((or "i686-linux" "x86_64-linux")
-     `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)))
+     (list %bootstrap-linux-libre-headers))
     (_
-     `(("libc" ,%bootstrap-glibc)
-       ("gcc" ,%bootstrap-gcc)
-       ("binutils" ,%bootstrap-binutils)
-       ("coreutils&co" ,%bootstrap-coreutils&co)
-       ;; In gnu-build-system.scm, we rely on the availability of Bash.
-       ("bash" ,%bootstrap-coreutils&co)))))
+     (list %bootstrap-glibc
+           %bootstrap-gcc
+           %bootstrap-binutils
+           %bootstrap-coreutils&co))))
 
 (define %bootstrap-inputs-for-tests
   ;; These are bootstrap inputs that are cheap to produce (no compilation

gnu/packages/build-tools.scm

@@ -26,7 +26,6 @@
 ;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2026 Nemin <bergengocia@protonmail.com>
-;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -101,7 +100,6 @@
   #:use-module (gnu packages rpc)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
-  #:use-module (gnu packages tcl)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages unicode)
   #:use-module (gnu packages version-control)
@@ -141,48 +139,6 @@ Bourne shell script instead of m4.")
     (home-page "https://github.com/radareorg/acr")
     (license license:gpl2)))
 
-(define-public autosetup
-  (package
-    (name "autosetup")
-    (version "0.7.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/msteveb/autosetup")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256 (base32 "002b380073cpxlqziia2gvngywrb37b08p9k0zk9vlxn2p174hc6"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            (delete-file "jimsh0.c")
-            (substitute* "Makefile"
-              (("^.*tclsh8\\..*")       ;tests run with specific Tcl versions
-               ""))))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:test-target "test"
-           #:phases
-           #~(modify-phases %standard-phases
-               (delete 'configure)
-               (delete 'build)
-               (replace 'install
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* "sys-find-tclsh"
-                     (("jimsh tclsh")
-                      (search-input-file inputs "bin/tclsh")))
-                   (invoke "tclsh" "autosetup"
-                           (string-append "--sysinstall=" #$output)))))))
-    (inputs (list tcl))
-    (home-page "https://msteveb.github.io/autosetup/")
-    (synopsis "Build environment auto-configurator")
-    (description
-     "@command{autosetup} is a tool, similar to @command{autoconf},
-to configure a build system for the appropriate environment,
-according to the system capabilities and the user-selected options.")
-    (license license:bsd-2)))
-
 (define-public bam
   (package
     (name "bam")

gnu/packages/compression.scm

@@ -321,7 +321,11 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
                 "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb"))))
     (build-system gnu-build-system)
     (arguments
-     (list #:modules '((guix build gnu-build-system)
+     (list #:make-flags #~(list (string-append "PREFIX=" #$output))
+           ;; Don't attempt to run the tests when cross-compiling.
+           #:tests? (not (%current-target-system))
+
+           #:modules '((guix build gnu-build-system)
                        (guix build utils)
                        (ice-9 ftw)
                        (srfi srfi-1))
@@ -329,20 +333,21 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
            #~(modify-phases %standard-phases
                (add-after 'set-paths 'hide-input-bzip2
                  (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((bzip2 (assoc-ref inputs "bzip2")))
-                     (if bzip2
+                   (let ((libbz2.so (false-if-exception
+                                     (search-input-file inputs "lib/libbz2.so"))))
+                     (if libbz2.so
                          ;; Prevent the build system from retaining a reference to
-                         ;; BZIP2 from INPUTS.
+                         ;; BZIP2 from INPUTS (used in both implicit and bootstrap).
                          (begin
-                           (setenv "LIBRARY_PATH"
-                                   (string-join (delete (string-append bzip2 "/lib")
-                                                        (string-split (getenv "LIBRARY_PATH")
-                                                                      #\:))
-                                                ":"))
+                           (let ((library-path (string-split (getenv "LIBRARY_PATH")
+                                                             #\:)))
+                             (setenv "LIBRARY_PATH"
+                                     (string-join (delete (dirname libbz2.so)
+                                                          library-path)
+                                                  ":")))
                            (format #t "environment variable `LIBRARY_PATH' set to `~a'~%"
                                    (getenv "LIBRARY_PATH")))
-                         (format #t "no bzip2 found, nothing done~%"))
-                     #t)))
+                         (format #t "no bzip2 found, nothing done~%")))))
                (replace 'configure
                  (lambda* (#:key target #:allow-other-keys)
                    (when #$(%current-target-system)
@@ -356,8 +361,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
                         (string-append "RANLIB = " target "-ranlib\n"))
                        (("^all:(.*)test" _ prerequisites)
                         ;; Remove 'all' -> 'test' dependency.
-                        (string-append "all:" prerequisites "\n"))))
-                   #t))
+                        (string-append "all:" prerequisites "\n"))))))
                (add-before 'build 'build-shared-lib
                  (lambda* (#:key inputs #:allow-other-keys)
                    (patch-makefile-SHELL "Makefile-libbz2_so")
@@ -366,8 +370,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
                  (lambda* (#:key outputs #:allow-other-keys)
                    ;; The Makefile above does not have an 'install' target, nor does
                    ;; it create all the (un)versioned symlinks, so we handle it here.
-                   (let* ((out    (assoc-ref outputs "out"))
-                          (libdir (string-append out "/lib"))
+                   (let* ((libdir (string-append #$output "/lib"))
                           (soname "libbz2.so")
                           ;; Locate the built library (e.g. "libbz2.so.1.0.6").
                           (lib (car (scandir "."
@@ -384,32 +387,19 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
                          (unless (null? numbers)
                            (let ((so-file (string-append base "." (car numbers))))
                              (symlink so-file base)
-                             (loop so-file (cdr numbers))))))
-                     #t)))
+                             (loop so-file (cdr numbers)))))))))
                (add-after 'install-shared-lib 'move-static-lib
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (let ((out (assoc-ref outputs "out"))
-                         (static (assoc-ref outputs "static")))
-                     (with-directory-excursion (string-append out "/lib")
-                       (install-file "libbz2.a" (string-append static "/lib"))
-                       (delete-file "libbz2.a")
-                       #t))))
+                 (lambda _
+                   (with-directory-excursion (string-append #$output "/lib")
+                     (install-file "libbz2.a" (string-append #$output:static "/lib"))
+                     (delete-file "libbz2.a"))))
                (add-after 'install-shared-lib 'patch-scripts
-                 (lambda* (#:key outputs inputs #:allow-other-keys)
-                   (let* ((out (assoc-ref outputs "out")))
-                     (substitute* (string-append out "/bin/bzdiff")
-                       (("/bin/rm") "rm")))
-                   #t)))
-
-           #:make-flags #~(list (string-append "PREFIX="
-                                               (assoc-ref %outputs "out")))
-
-           ;; Don't attempt to run the tests when cross-compiling.
-           #:tests? (not (%current-target-system))))
-    (inputs
-     `(,@(if (%current-target-system)
-             `(("bash" ,bash-minimal))
-             '())))
+                 (lambda _
+                   (substitute* (string-append #$output "/bin/bzdiff")
+                     (("/bin/rm") "rm")))))))
+    (inputs (if (%current-target-system)
+                (list bash-minimal)
+                (list)))
     (outputs '("out" "static"))
     (synopsis "High-quality data compression program")
     (description
@@ -554,7 +544,7 @@ formats, including zstd, xz, gzip, and bgzf.")
 (define-public xz
   (package
    (name "xz")
-   (version "5.4.5")
+   (version "5.8.1")
    (source (origin
             (method url-fetch)
             (uri (list (string-append "http://tukaani.org/xz/xz-" version
@@ -563,7 +553,7 @@ formats, including zstd, xz, gzip, and bgzf.")
                                       version ".tar.gz")))
             (sha256
              (base32
-              "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k"))))
+              "0hsmg58a27jd1vq0lc6yp405978c1nfhqwndl7f10v1mk6sjay2h"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
@@ -581,7 +571,7 @@ formats, including zstd, xz, gzip, and bgzf.")
               (substitute* (string-append out "/lib/liblzma.la")
                 (("^old_library='liblzma.a'") "old_library=''"))
               #t))))))
-   (outputs '("out" "static"))
+   (outputs '("out" "static" "doc"))
    (inputs
     `(,@(if (%current-target-system)
             `(("bash" ,bash-minimal))
@@ -598,6 +588,8 @@ compression algorithm is currently LZMA2, which is used inside the .xz
 container format.  With typical files, XZ Utils create 30 % smaller output
 than gzip and 15 % smaller output than bzip2.")
    (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
+   (properties
+    `((output-synopsis "doc" "API documentation and example code")))
    (home-page "https://tukaani.org/xz/")))
 
 (define-public heatshrink

gnu/packages/containers.scm

@@ -375,7 +375,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
 (define-public guix-compose
   (package
     (name "guix-compose")
-    (version "0.2.0")
+    (version "0.1.1")
     (source
      (origin
        (method git-fetch)
@@ -384,7 +384,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1dy48qkz3ifxagijpvwg7rmq7hz3pikhdcfral6djyc9ppmz8mbm"))))
+        (base32 "1ij6rfs5pfykk8c53q029sl2qx3k572dqdfb6pn5s569l6697ci1"))))
     (build-system guile-build-system)
     (arguments
      (list
@@ -426,7 +426,7 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
                  "guile" "-L" "./modules" "-s" "tests/test-compose.scm")))))))
     (native-inputs (list guile-3.0))
     ;; Avoid setting propagated so that we use the user’s profile.
-    (inputs (list guix guile-dotenv guile-yamlpp))
+    (inputs (list guix guile-yamlpp))
     (native-search-paths
      (list $GUIX_EXTENSIONS_PATH))
     (synopsis "Guix' docker compose compatibility layer")

gnu/packages/cross-base.scm

@@ -567,16 +567,15 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                         (srfi srfi-26))
              ,@(package-arguments glibc/hurd-headers))
          ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'set-cross-headers-path
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let* ((mach (assoc-ref inputs "gnumach-headers"))
-                        (hurd (assoc-ref inputs "hurd-headers"))
-                        (cpath (string-append mach "/include:"
-                                              hurd "/include")))
-                   (for-each (cut setenv <> cpath)
-                             ',%gcc-cross-include-paths)
-                   #t)))))
+          #~(modify-phases #$phases
+              (add-after 'unpack 'set-cross-headers-path
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (let* ((mach (assoc-ref inputs "gnumach-headers"))
+                         (hurd (assoc-ref inputs "hurd-headers"))
+                         (cpath (string-append mach "/include:"
+                                               hurd "/include")))
+                    (for-each (cut setenv <> cpath)
+                              '#$%gcc-cross-include-paths))))))
          ((#:configure-flags flags)
           `(cons* ,(string-append "--build=" (%current-system))
                   ,(string-append "--host=" target)
@@ -691,80 +690,78 @@ returned."
       (name (string-append "glibc-cross-" target))
       (arguments
        (substitute-keyword-arguments
-         `(;; Disable stripping (see above.)
-           #:strip-binaries? #f
+           `(;; Disable stripping (see above.)
+             #:strip-binaries? #f
 
-           ;; This package is used as a target input, but it should not have
-           ;; the usual cross-compilation inputs since that would include
-           ;; itself.
-           #:implicit-cross-inputs? #f
+                               ;; This package is used as a target input, but it should not have
+                               ;; the usual cross-compilation inputs since that would include
+                               ;; itself.
+                               #:implicit-cross-inputs? #f
 
-           ;; We need SRFI 26.
-           #:modules ((guix build gnu-build-system)
-                      (guix build utils)
-                      (srfi srfi-26))
+                               ;; We need SRFI 26.
+                               #:modules ((guix build gnu-build-system)
+                                          (guix build utils)
+                                          (srfi srfi-26))
 
-               ,@(package-arguments libc))
-           ((#:configure-flags flags)
-            `(cons ,(string-append "--host=" target)
-                   ,(if (target-hurd? target)
-                        `(append (list "--disable-werror")
-                                 ,flags)
+                               ,@(package-arguments libc))
+         ((#:configure-flags flags)
+          #~(cons #$(string-append "--host=" target)
+                  #$(if (target-hurd? target)
+                        #~(append (list "--disable-werror")
+                                  #$flags)
                         flags)))
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-before 'configure 'set-cross-kernel-headers-path
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let* ((kernel (assoc-ref inputs "kernel-headers"))
-                          (cpath (string-append kernel "/include")))
-                     (for-each (cut setenv <> cpath)
-                               ',%gcc-cross-include-paths)
-                     (setenv "CROSS_LIBRARY_PATH"
-                             (string-append kernel "/lib")) ; for Hurd's libihash
-                     #t)))
-               (add-before 'configure 'add-cross-binutils-to-PATH
-                 (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                   ;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc
-                   ;; -print-prog-name=objdump' returns the correct name.  See
-                   ;; <https://inbox.sourceware.org/libc-alpha/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/>.
-                   (define cross-objdump
-                     (search-input-file
-                      (or native-inputs inputs)
-                      (string-append ,target "/bin/objdump")))
+         ((#:phases phases)
+          #~(modify-phases #$phases
+              (add-before 'configure 'set-cross-kernel-headers-path
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (let* ((kernel (assoc-ref inputs "kernel-headers"))
+                         (cpath (string-append kernel "/include")))
+                    (for-each (cut setenv <> cpath)
+                              '#$%gcc-cross-include-paths)
+                    (setenv "CROSS_LIBRARY_PATH"
+                            (string-append kernel "/lib"))))) ; for Hurd's libihash
+              (add-before 'configure 'add-cross-binutils-to-PATH
+                (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                  ;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc
+                  ;; -print-prog-name=objdump' returns the correct name.  See
+                  ;; <https://inbox.sourceware.org/libc-alpha/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/>.
+                  (define cross-objdump
+                    (search-input-file
+                     (or native-inputs inputs)
+                     (string-append #$target "/bin/objdump")))
 
-                   (define cross-binutils
-                     (dirname cross-objdump))
+                  (define cross-binutils
+                    (dirname cross-objdump))
 
-                   (format #t "adding '~a' to the front of 'PATH'~%"
-                           cross-binutils)
-                   (setenv "PATH" (string-append cross-binutils ":"
-                                                 (getenv "PATH")))))
+                  (format #t "adding '~a' to the front of 'PATH'~%"
+                          cross-binutils)
+                  (setenv "PATH" (string-append cross-binutils ":"
+                                                (getenv "PATH")))))
 
-               ;; This phase would require running 'localedef' built for
-               ;; TARGET, which is impossible by definition.
-               (delete 'install-utf8-c-locale)
+              ;; This phase would require running 'localedef' built for
+              ;; TARGET, which is impossible by definition.
+              (delete 'install-utf8-c-locale)
 
-               ,@(if (target-hurd? target)
-                     `((add-after 'install 'augment-libc.so
-                         (lambda* (#:key outputs #:allow-other-keys)
-                           (let ((out (assoc-ref outputs "out")))
-                             (substitute* (string-append out "/lib/libc.so")
-                               (("/[^ ]+/lib/libc.so.0.3")
-                                (string-append out "/lib/libc.so.0.3"
-                                               " libmachuser.so libhurduser.so"))))))
-                       (add-after 'install 'create-machine-symlink
-                         (lambda* (#:key outputs #:allow-other-keys)
-                           (let* ((out (assoc-ref outputs "out"))
-                                  (cpu ,(match target
-                                          ((? target-x86-32?)
-                                           "i386")
-                                          ((? target-x86-64?)
-                                           "x86_64")))
+              #$@(if (target-hurd? target)
+                     #~((add-after 'install 'augment-libc.so
+                          (lambda _
+                            (substitute* (string-append #$output "/lib/libc.so")
+                              (("/[^ ]+/lib/libc.so.0.3")
+                               (string-append #$output "/lib/libc.so.0.3"
+                                              " libmachuser.so libhurduser.so")))))
+                        (add-after 'install 'create-machine-symlink
+                          (lambda _
+                            (let ((cpu #$(match target
+                                           ((? target-x86-32?)
+                                            "i386")
+                                           ((? target-x86-64?)
+                                            "x86_64")))
                                   (machine (string-append
-                                            out "/include/mach/machine")))
-                             (unless (file-exists? machine)
-                               (symlink cpu machine))))))
-                     '())))))
+                                            #$output
+                                            "/include/mach/machine")))
+                              (unless (file-exists? machine)
+                                (symlink cpu machine))))))
+                     #~())))))
 
       ;; Shadow the native "kernel-headers" because glibc's recipe expects the
       ;; "kernel-headers" input to point to the right thing.

gnu/packages/crypto.scm

@@ -1688,14 +1688,14 @@ structure.  However CryFS is not considered stable yet by the developers.")
 (define-public b3sum
   (package
     (name "b3sum")
-    (version "1.8.4")
+    (version "1.8.2")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "b3sum" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "0pkra5zh680cl9q92hpzmg9flz99b06bhpg7jyhymg1nkm0anw7a"))))
+         (base32 "06qc6iv574km4j1ja4qhxyai680jkll58qzpz4mb79c0rk750dpd"))))
     (build-system cargo-build-system)
     (arguments
      (list

gnu/packages/dbm.scm

@@ -113,14 +113,7 @@
                      (for-each (lambda (x)
                                  (install-file x "aclocal"))
                                (find-files "aclocal_java"))
-                     (apply (assq-ref %standard-phases 'bootstrap) arguments)
-                     (let ((automake-files (search-input-directory
-                                            (or native-inputs inputs)
-                                            "share/automake-1.16")))
-                       (define (replace file)
-                         (symlink (string-append automake-files "/" file) file))
-                       (for-each replace '("config.sub" "config.guess"
-                                           "install-sh"))))))
+                     (apply (assq-ref %standard-phases 'bootstrap) arguments))))
                #$@(if (or (target-arm?)
                           (target-riscv64?))
                       #~((add-after 'unpack 'bdb-configure-patch
@@ -202,14 +195,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
                      (for-each (lambda (x)
                                  (install-file x "aclocal"))
                                (find-files "aclocal_java"))
-                     (apply (assq-ref %standard-phases 'bootstrap) arguments)
-                     (let ((automake-files (search-input-directory
-                                            (or native-inputs inputs)
-                                            "share/automake-1.16")))
-                       (define (replace file)
-                         (symlink (string-append automake-files "/" file) file))
-                       (for-each replace '("config.sub" "config.guess"
-                                           "install-sh"))))))
+                     (apply (assq-ref %standard-phases 'bootstrap) arguments))))
                (add-before 'configure 'pre-configure
                  (lambda _
                    (chdir "dist")

gnu/packages/distributed.scm

@@ -51,7 +51,7 @@
 (define-public boinc-client
   (package
     (name "boinc-client")
-    (version "8.2.9")
+    (version "8.2.8")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -62,7 +62,7 @@
               (file-name (git-file-name "boinc" version))
               (sha256
                (base32
-                "0ik9423ii6kal29jdn907pxy8w86zpi8n158qx1gcsh8lsaif1v5"))))
+                "1ppcf57p6dkv9dv5k90fj3xhbv9di2d3yjkg2flfv5d45s82lay8"))))
     (build-system gnu-build-system)
     (arguments
      (list

gnu/packages/django.scm

@@ -709,13 +709,13 @@ your code.")
 (define-public python-django-filter
   (package
     (name "python-django-filter")
-    (version "25.2")
+    (version "25.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django_filter" version))
               (sha256
                (base32
-                "08wgzqirabxzcdhh0wvv45hqr6dqxy3ifm7mjv86hi0zjd59h3kn"))))
+                "0lvi82f3dnj89ip8hry8fq8w7x632r5p84dlr451rnm8izsfxj8y"))))
     (build-system pyproject-build-system)
     (arguments
      '(#:phases

gnu/packages/dlang.scm

@@ -75,8 +75,7 @@
        (uri (string-append "https://github.com/ldc-developers/ldc/releases"
                            "/download/v" version "/ldc-" version "-src.tar.gz"))
        (sha256
-        (base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))
-       (patches (search-patches "ldc-i686-int128-alignment.patch"))))
+        (base32 "13pkg69wjj4ali4ikijicccpg8y6f2hghhb70z9lrqr2w3pkhqna"))))
     (build-system cmake-build-system)
     (arguments
      `(#:disallowed-references (,tzdata-for-tests)
@@ -373,7 +372,6 @@ integration tests...\n")
               ;; Do not build the shared libphobos2.so library, to avoid
               ;; retaining a reference to gcc:lib.
               "SHARED=0"
-              "DIFFABLE=1"              ;constant timestamp
               "VERBOSE=1")
       #:modules
       `(,@%default-gnu-modules
@@ -478,15 +476,6 @@ integration tests...\n")
               (phase-in-sub-dir 'build "dmd"))
             (add-after 'build 'build-phobos
               (phase-in-sub-dir 'build "phobos"))
-            (add-after 'build-phobos 'build-man
-              (lambda* (#:key make-flags #:allow-other-keys)
-                (with-directory-excursion "dmd/compiler/docs"
-                  (let ((dmd (or (which "gdmd")
-                                 (which "dmd"))))
-                    ((assoc-ref %standard-phases 'build)
-                     #:make-flags (cons
-                                   (string-append "DMD=" dmd)
-                                   make-flags))))))
             (replace 'check
               (phase-in-sub-dir 'check "dmd"))
             (add-after 'check 'check-phobos
@@ -512,7 +501,7 @@ integration tests...\n")
                       (for-each (cut install-file <> lib-lib)
                                 (find-files "." "^libdruntime\\.so[.0-9]*$")))
                     (copy-recursively "druntime/import" out-include)
-                    (copy-recursively "generated/docs/man" out-man))
+                    (copy-recursively "compiler/docs/man" out-man))
                   (with-directory-excursion "phobos"
                     (with-directory-excursion build-sub-dir
                       (install-file "libphobos2.a" out-lib)
@@ -687,7 +676,6 @@ needed.")
                  (lambda* (#:key tests? #:allow-other-keys)
                    (when tests?
                      (invoke "bin/rdmd" "rdmd_test.d" "bin/rdmd"
-                             "-m" (if #$(target-64bit?) "64" "32")
                              "--rdmd-default-compiler" "ldmd2"))))
                (replace 'install
                  (lambda* (#:key outputs #:allow-other-keys)

gnu/packages/dns.scm

@@ -295,37 +295,35 @@ prompt the user with the option to go with insecure DNS only.")
 (define-public dnsmasq
   (package
     (name "dnsmasq")
-    (version "2.92")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "http://thekelleys.org.uk/git/dnsmasq.git")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "055gn5kigz0m9y09vig97s1g257hnlkhw4wv9d9wdficnsxcbwwm"))))
+    (version "2.90")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-"
+                    version ".tar.xz"))
+              (sha256
+               (base32
+                "1r09l537vi867hlpv6vl7nvqhscvq1kf04m896bfrgrpv2dk0l4f"))))
     (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ;no tests
-      #:make-flags
-      #~(list (string-append "PREFIX=" #$output)
-              (string-append "CC=" #$(cc-for-target))
-              (string-append "PKG_CONFIG=" #$(pkg-config-for-target))
-              "COPTS=\"-DHAVE_DBUS\"")
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure) ;no configure
-          (add-after 'install 'install-dbus
-            (lambda _
-              (install-file "dbus/dnsmasq.conf"
-                            (string-append #$output "/etc/dbus-1/system.d")))))))
     (native-inputs
      (list pkg-config))
     (inputs
      (list dbus))
-    (home-page "https://thekelleys.org.uk/dnsmasq/doc.html")
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-after 'install 'install-dbus
+           (lambda _
+             (install-file "dbus/dnsmasq.conf"
+                           (string-append %output "/etc/dbus-1/system.d")))))
+
+       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+                          (string-append "CC=" ,(cc-for-target))
+                          (string-append "PKG_CONFIG=" ,(pkg-config-for-target))
+                          "COPTS=\"-DHAVE_DBUS\"")
+       #:tests? #f))                    ; no ‘check’ target
+    (home-page "https://www.thekelleys.org.uk/dnsmasq/doc.html")
     (synopsis "Small caching DNS proxy and DHCP/TFTP server")
     (description
      "Dnsmasq is a light-weight DNS forwarder and DHCP server.  It is designed

gnu/packages/duckdb.scm

@@ -148,13 +148,13 @@ system.")
 (define-public r-duckdb
   (package
     (name "r-duckdb")
-    (version "1.5.1")
+    (version "1.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "duckdb" version))
        (sha256
-        (base32 "177621m08whqqk4yhj3zrr08l3d9hhlqh3gm9jzhi5cplg47cksq"))
+        (base32 "1hch36v3lsymnx30lv3cjy12gs3v3mhd44ha97l7w9mwp9wbzmxl"))
        ;; This package bundles the duckdb sources and builds a custom variant
        ;; of duckdb.  I'd be happy to link it with our duckdb library instead,
        ;; but it does not seem possible to do that.
@@ -179,12 +179,10 @@ system.")
                          r-dplyr
                          r-remotes
                          r-rlang
-                         r-sf
                          r-testthat
                          r-tibble
                          r-vctrs
                          r-withr
-                         r-wk
                          tzdata-for-tests))
     (home-page "https://r.duckdb.org/")
     (synopsis "DBI package for the DuckDB database management system")

gnu/packages/emacs-xyz.scm

@@ -15153,27 +15153,6 @@ exporter already existing in Org mode.  It supports the Github flavored
 markdown features.")
     (license license:gpl3+)))
 
-(define-public emacs-grip-mode
-  (package
-    (name "emacs-grip-mode")
-    (version "2.5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/seagle0128/grip-mode")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1mrpmzcxgc9hkv55d6kv79f8y6ldqrf5b48f0a4fy30qlgby2wyz"))))
-    (arguments (list #:tests? #f)) ;no tests
-    (build-system emacs-build-system)
-    (home-page "https://github.com/seagle0128/grip-mode")
-    (synopsis "Instant GitHub-flavored Markdown/Org preview")
-    (description "Instant GitHub-flavored Markdown/Org preview using
-@code{grip}, @code{mdopen} or @code{go-grip}.")
-    (license license:gpl3)))
-
 (define-public emacs-2048-game
   (package
     (name "emacs-2048-game")
@@ -16996,35 +16975,6 @@ called.  If there are more, each window will have its first character
 highlighted.  Pressing that character will switch to that window.")
     (license license:gpl3+)))
 
-(define-public emacs-spatial-window
-  (package
-    (name "emacs-spatial-window")
-    (version "0.9.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/lewang/spatial-window")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "19whlw6p2q6ma20ifkr6iyrhj5l99vj1hv06s7j6j6pvgah27lm4"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:test-command
-      #~(list "emacs" "-Q" "-batch" "-L"  "."
-              "-l" "spatial-window-geometry-test.el"
-              "-l" "spatial-window-test.el"
-              "-f" "ert-run-tests-batch-and-exit")))
-    (propagated-inputs (list emacs-posframe))
-    (home-page "https://github.com/lewang/spatial-window")
-    (synopsis "Jump to windows by spatial position")
-    (description
-     "Jump to Emacs windows by pressing keys that match their spatial position
-on your keyboard.")
-    (license license:gpl3+)))
-
 (define-public emacs-windsize
   ;; There is no proper release.  The base version is extracted from the
   ;; "Version" keyword in the main file.
@@ -17771,29 +17721,6 @@ etc), but also compiling languages (C, C++, Go, Java etc) and markup
 languages.")
     (license license:gpl3+)))
 
-(define-public emacs-quotable
-  (package
-    (name "emacs-quotable")
-    (version "1.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/coopi/emacs-quotable")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "00359yljynmk6bqifvfrrradm4na9ap76isibi2d6s4i810szixh"))))
-    (build-system emacs-build-system)
-    (home-page "https://codeberg.org/coopi/emacs-quotable")
-    (synopsis "Emacs Lisp client for the Quotable API")
-    (description
-     "This package provides a programmatic interface for the
-@uref{https://github.com/lukePeavey/quotable, Quotable @acronym{API,
-Application Programming Interface}}, a free and open-source quotations
-@acronym{API}.")
-    (license license:agpl3+)))
-
 (define-public emacs-pkg-info
   (package
     (name "emacs-pkg-info")
@@ -24509,9 +24436,11 @@ conflicts.")
             (lambda* (#:key inputs native-inputs #:allow-other-keys)
               (substitute* "xelb-gen"
                 (("/usr/bin/env") (which "env")))
-              (invoke "make"
-                      (format #f "PROTO_PATH=~a/share/xcb"
-                              #$(this-package-native-input "xcb-proto"))))))))
+              (let ((xcb-proto #$(this-package-native-input "xcb-proto"))
+                    (emacs (search-input-file (or native-inputs inputs)
+                                              "/bin/emacs")))
+                (invoke "make"
+                        (format #f "PROTO_PATH=~a/share/xcb" xcb-proto))))))))
     (native-inputs (list xcb-proto))
     (propagated-inputs (list emacs-compat))
     (home-page "https://github.com/emacs-exwm/xelb")
@@ -24608,8 +24537,7 @@ of XELB.")
     (name "emacs-exwm-no-x-toolkit")
     (synopsis "Emacs X window manager (without an X toolkit)")
     (propagated-inputs
-     (modify-inputs propagated-inputs
-       (replace "emacs-xelb" emacs-xelb-no-x-toolkit)))
+     (list emacs-xelb-no-x-toolkit))
     (arguments
      (substitute-keyword-arguments arguments
        ((#:emacs emacs) `,emacs-no-x-toolkit)))))
@@ -28143,7 +28071,7 @@ match and total match information in the mode-line in various search modes.")
 (define-public emacs-pg
   (package
     (name "emacs-pg")
-    (version "0.63")
+    (version "0.62")
     (source (origin
               (method git-fetch)
               (uri (git-reference (url "https://github.com/emarsden/pg-el")
@@ -28151,7 +28079,7 @@ match and total match information in the mode-line in various search modes.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "19hh45mlb4j6a3ys3wvivj0bm5xy5vjwscnvn68b656b5jk5himh"))))
+                "0fjzrn5b4s00km71ya98vwwfyvd4rvcywxdxqzy5xfrv8crm92w6"))))
     (build-system emacs-build-system)
     (propagated-inputs (list emacs-peg))
     (home-page "https://github.com/emarsden/pg-el")
@@ -28167,7 +28095,7 @@ end users.")
 (define-public emacs-pgmacs
   (package
     (name "emacs-pgmacs")
-    (version "0.30")
+    (version "0.42")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -28176,7 +28104,7 @@ end users.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0f4mbamk2n9l7qwhi2n1kwvng6wa9yp6k2w1qn6yc07pri2mb6yc"))))
+                "0pf8y64hka1fl47dphmh4xgxiwfsd0g4q2fazq5yc48zwr9nsf02"))))
     (build-system emacs-build-system)
     (propagated-inputs
      (list emacs-pg))
@@ -28185,12 +28113,6 @@ end users.")
     (home-page "https://github.com/emarsden/pgmacs")
     (license license:gpl3+)))
 
-(define-public emacs-pgmacs-0.42
-  (package
-    (inherit emacs-pgmacs)
-    (version "0.42")
-    (properties `((superseded . ,emacs-pgmacs)))))
-
 (define-public emacs-finalize
   (package
   (name "emacs-finalize")

gnu/packages/embedded.scm

@@ -1505,8 +1505,7 @@ hardware.  The utility support USB and UART as serial link.")
                  (apply (assoc-ref cargo:%standard-phases phase)
                         #:cargo-target #$(cargo-triplet)
                         args))
-               '(prepare-rust-crates
-                 unpack-rust-crates
+               '(unpack-rust-crates
                  configure
                  check-for-pregenerated-files
                  patch-cargo-checksums)))))))

gnu/packages/enchant.scm

@@ -48,7 +48,7 @@
 (define-public nuspell
   (package
     (name "nuspell")
-    (version "5.1.4")
+    (version "5.1.7")
     (source
      (origin
        (method git-fetch)
@@ -58,12 +58,14 @@
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "05j1hmczy6v9dyxp77vxhgyl7y5hff3v45vlp86gyh7m9lgqpmra"))))
+        (base32 "1xvy8qrpw1282akr873xzja61afnr27f1gab6jc4cgy8pkfqq308"))))
     (build-system cmake-build-system)
     (arguments
-     (if (%current-target-system)
-         (list #:configure-flags #~(list "-DBUILD_TESTING=OFF"))
-         '()))
+     (list #:configure-flags
+           #~(list "-DBUILD_DOCS=OFF"   ;do not pull Pandoc
+                   #$@(if (%current-target-system)
+                          '("-DBUILD_TESTING=OFF")
+                          '()))))
     (native-inputs (list catch2-3 pkg-config))
     (propagated-inputs (list icu4c))
     (native-search-paths (list (search-path-specification

gnu/packages/engineering.scm

@@ -2816,7 +2816,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
            qtwayland
            sqlite
            onetbb                       ;same version as opencascade-occt
-           vtk-9.5
+           vtk
            xerces-c
            yaml-cpp
            zlib))

gnu/packages/file-systems.scm

@@ -88,7 +88,6 @@
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
-  #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages haskell-xyz)
@@ -762,7 +761,7 @@ from a mounted file system.")
   ;; completions by running a native bcachefs binary at build time.
   (package
     (name "bcachefs-tools-minimal")
-    (version "1.37.4")
+    (version "1.35.1")
     (source
      (origin
        (method git-fetch)
@@ -771,7 +770,7 @@ from a mounted file system.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "17041jphzbg0ppxlc1acr3d73zyn02spjvi5my30wak8xh9n6nan"))))
+        (base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
     (build-system cargo-build-system)
     (arguments
      (list
@@ -969,13 +968,20 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
 (define-public bcachefs-linux-module
   (package
     (name "bcachefs-linux-module")
-    (version (package-version bcachefs-tools-minimal))
-    (source (package-source bcachefs-tools-minimal))
+    (version "1.35.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://evilpiepirate.org/git/bcachefs-tools.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
     (build-system linux-module-build-system)
     (arguments
      (list
-      #:make-flags #~(list "BCACHEFS_DKMS=1")
-      #:tests? #f                       ;no 'check' target
+      #:tests? #f ;no 'check' target
       #:source-directory "build/src/fs/bcachefs"
       #:phases
       #~(modify-phases %standard-phases
@@ -984,14 +990,18 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
               (with-output-to-file ".version"
                 (lambda ()
                   (display #$version)))))
-          (add-before 'configure 'prepare-build-directory
-            (lambda* (#:key make-flags #:allow-other-keys)
-              (apply invoke "make" "install_dkms"
-                     (string-append "DESTDIR="
-                                    (getcwd) "/")
-                     "DKMSDIR=build/"
-                     make-flags))))))
-    (home-page (package-home-page bcachefs-tools-minimal))
+          (add-after 'unpack 'patch-source
+            (lambda _
+              (substitute* "Makefile"
+                ;; Remove unnecessary dependencies
+                (("^.*PKG_CONFIG.*$")
+                 ""))))
+          (add-before 'configure 'prepare-build-dir
+            (lambda _
+              (invoke "make" "install_dkms"
+                      (string-append "DESTDIR="
+                                     (getcwd) "/") "DKMSDIR=build/"))))))
+    (home-page (package-home-page bcachefs-tools-minimal/static))
     (synopsis "Bcachefs Linux kernel module")
     (description
      "This package provides the Linux kernel module for Bcachefs.
@@ -2130,75 +2140,6 @@ the XDG directory specification from @file{~/.@var{name}} to
 @file{~/.config/@var{name}}.")
       (license license:gpl2+))))
 
-(define-public s5cmd
-  (package
-    (name "s5cmd")
-    (version "2.3.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/peak/s5cmd")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1y1bwma6f68j00jfdjxvw5flp9l4cdys7dgkrr0yvfz68lk9a17v"))
-       (snippet
-        #~(begin (use-modules (guix build utils))
-                 (delete-file-recursively "vendor")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:import-path "github.com/peak/s5cmd/v2"
-      #:test-flags
-      #~(list "-vet=off"
-              ;; cp_test.go:74: assertion failed: text/plain; charset=utf-8
-              ;; (tc.expectedContentType string) != text/html; charset=utf-8
-              ;; (string)
-              "-skip" "TestGuessContentType")
-      #:test-subdirs
-      ;; build flag -mod=vendor only valid when using modules
-      ;; /<...>/peak/s5cmd/v2/e2e/util_test.go:417 +0x3b9
-      ;; /<...>/peak/s5cmd/v2/e2e/main_test.go:12 +0x65
-      #~(list "command/..."
-              "orderedwriter/..."
-              "progressbar/..."
-              "storage/..."
-              "storage/url/..."
-              "strutil/...")
-      #:phases
-      #~(modify-phases %standard-phases
-	  (add-after 'install 'rename-binaries
-	    (lambda _
-	      (rename-file
-	       (string-append #$output "/bin/v2")
-	       (string-append #$output "/bin/s5cmd")))))))
-    (native-inputs
-     (list go-github-com-aws-aws-sdk-go
-           go-github-com-cheggaaa-pb-v3
-           go-github-com-google-go-cmp
-           go-github-com-hashicorp-go-multierror
-           go-github-com-iancoleman-strcase
-           go-github-com-igungor-gofakes3
-           go-github-com-karrick-godirwalk
-           go-github-com-kballard-go-shellquote
-           go-github-com-lanrat-extsort-1.0.2
-           go-github-com-termie-go-shutil
-           go-github-com-urfave-cli-v2
-           go-go-uber-org-mock
-           go-gotest-tools-v3
-           go-honnef-co-go-tools
-           go-mvdan-cc-unparam))
-    (home-page "https://github.com/peak/s5cmd")
-    (synopsis "Parallel S3 and local filesystem execution tool")
-    (description
-     "@code{s5cmd} is a fast S3 and local filesystem execution tool.  It comes
-with support for a multitude of operations including tab completion and
-wildcard support for files, which can be handy for object storage workflow
-while working with large number of files.")
-    (license license:expat)))
-
 (define-public squashfuse
   (package
     (name "squashfuse")

gnu/packages/finance.scm

@@ -766,7 +766,7 @@ require Coincurve.")
 (define-public electrum
   (package
     (name "electrum")
-    (version "4.7.2")
+    (version "4.7.1")
     (source
      (origin
        (method git-fetch)
@@ -775,7 +775,7 @@ require Coincurve.")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "05y3w9jhpfxd7frzlilqvsfggrgfzcml2spc2qb5xx9j4q62hnmx"))))
+        (base32 "171jbap3khzwkyxg730sasfj01qiip396sgyiwr1i6yq5fxd23pi"))))
     (build-system pyproject-build-system)
     (arguments
      (list

gnu/packages/flex.scm

@@ -26,6 +26,7 @@
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (gnu packages)
+  #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
   #:use-module (gnu packages bison)
@@ -43,18 +44,9 @@
                     "flex-" version ".tar.gz"))
               (sha256
                (base32
-                "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))))
+                "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))
+              (patches (search-patches "flex-fix-make-dependencies.patch"))))
     (build-system gnu-build-system)
-    (inputs
-     (let ((bison-for-tests
-            (package
-              (inherit bison)
-              (arguments
-               ;; Disable tests, since they require flex.
-               (substitute-keyword-arguments arguments
-                 ((#:tests? _ #f) #f)))
-              (inputs (alist-delete "flex" (package-inputs bison))))))
-       `(("bison" ,bison-for-tests))))
     (arguments
      (if (%current-target-system)
          (list #:configure-flags
@@ -63,21 +55,29 @@
          '()))
     ;; m4 is not present in PATH when cross-building
     (native-inputs
-     (list help2man m4))
+     (let ((bison-for-tests
+            (package
+             (inherit bison)
+             (arguments
+              ;; Disable tests, since they require flex.
+              (substitute-keyword-arguments arguments
+                ((#:tests? _ #f) #f)))
+             (inputs (modify-inputs inputs
+                       (delete "flex"))))))
+       (list bison-for-tests help2man m4)))
     (propagated-inputs (list m4))
     (home-page "https://github.com/westes/flex")
     (synopsis "Fast lexical analyser generator")
     (description
-     "Flex is a tool for generating scanners.  A scanner, sometimes
-called a tokenizer, is a program which recognizes lexical patterns in
-text.  The flex program reads user-specified input files, or its standard
-input if no file names are given, for a description of a scanner to
-generate.  The description is in the form of pairs of regular expressions
-and C code, called rules.  Flex generates a C source file named,
-\"lex.yy.c\", which defines the function yylex().  The file \"lex.yy.c\"
-can be compiled and linked to produce an executable.  When the executable
-is run, it analyzes its input for occurrences of text matching the
-regular expressions for each rule.  Whenever it finds a match, it
-executes the corresponding C code.")
+     "Flex is a tool for generating scanners.  A scanner, sometimes called a
+tokenizer, is a program which recognizes lexical patterns in text.  The flex
+program reads user-specified input files, or its standard input if no file
+names are given, for a description of a scanner to generate.  The description
+is in the form of pairs of regular expressions and C code, called rules.  Flex
+generates a C source file named @file{lex.yy.c}, which defines the function
+@code{yylex()}.  The @file{lex.yy.c} can be compiled and linked to produce an
+executable.  When the executable is run, it analyzes its input for occurrences
+of text matching the regular expressions for each rule.  Whenever it finds a
+match, it executes the corresponding C code.")
     (license (non-copyleft "file://COPYING"
                            "See COPYING in the distribution."))))

gnu/packages/freedesktop.scm

@@ -1150,60 +1150,6 @@ GNOME Shell.  The @command{localectl} command-line tool allows you to interact
 with localed.  This package is extracted from the broader systemd package.")
     (license license:lgpl2.1+)))
 
-(define-public gardenhostd
-  (package
-   (name "gardenhostd")
-   (version "1.1")
-   (source (origin
-            (method git-fetch)
-            (uri (git-reference
-                  (url "https://codeberg.org/axtlos/gardenhostd.git")
-                  (commit (string-append "v" version))))
-            (file-name (git-file-name name version))
-            (sha256
-             (base32
-              "1q0pdh0imc2ggb26cddl62hx6fmz6z4hqj2352a4k9wxyn5kfiam"))))
-   (build-system meson-build-system)
-   (arguments
-    (list
-     #:imported-modules `(,@%meson-build-system-modules
-                          ,@%pyproject-build-system-modules)
-     #:modules '(((guix build pyproject-build-system) #:prefix pyproject:)
-                 (guix build meson-build-system)
-                 (guix build utils))
-     #:phases
-     #~(modify-phases %standard-phases
-         (add-after 'install 'remove-extra-files
-           (lambda _
-             (with-directory-excursion #$output
-               (delete-file-recursively "etc/init.d")
-               (rmdir "etc"))))
-         ;; See <https://codeberg.org/guix/guix/issues/7579>.
-         (add-after 'install 'wrap-search-paths
-           (lambda _
-             (wrap-program (string-append #$output "/libexec/gardenhostd")
-               `("GUIX_PYTHONPATH" prefix
-                 ,(map
-                   (lambda (package)
-                     (string-append
-                      package "/lib/python"
-                      (pyproject:python-version #$(this-package-input "python"))
-                      "/site-packages"))
-                   ;; Avoids references to meson’s libraries.
-                   (list #$(this-package-input "python")
-                         #$(this-package-input "python-pygobject"))))))))))
-   (inputs
-    (list bash-minimal
-          python
-          python-pygobject))
-   (home-page "https://codeberg.org/axtlos/gardenhostd")
-   (synopsis "Minimal Python implementation of systemd-hostnamed")
-   (description "This package is a partial implementation of the
-systemd-hostnamed daemon.  It provides the @code{org.freedesktop.hostname1}
-D-Bus interface, which helps applications like GNOME Settings retrieve and
-modify the system’s hostname, as well as set a pretty hostname for display.")
-   (license license:gpl3+)))
-
 (define-public packagekit
   (package
     (name "packagekit")
@@ -2916,7 +2862,7 @@ to the C library @code{uchardet} to increase performance.")
 (define-public udiskie
   (package
     (name "udiskie")
-    (version "2.6.2")
+    (version "2.6.1")
     (source
      (origin
        (method git-fetch)
@@ -2925,7 +2871,7 @@ to the C library @code{uchardet} to increase performance.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0zc23yf2sw1m21xkfbpfjzbp7xykqjwq56fr2nxzlc02n7g6iqgk"))))
+        (base32 "0ngr8sdzd32mxamzfh82ar8m40z52lx91339b7dq3in0cr5r1ynp"))))
     (build-system pyproject-build-system)
     (arguments
      (list

gnu/packages/games.scm

@@ -3964,7 +3964,7 @@ that beneath its ruins lay buried an ancient evil.")
 (define-public angband
   (package
     (name "angband")
-    (version "4.2.6")
+    (version "4.2.5")
     (source
      (origin
        (method git-fetch)
@@ -3973,7 +3973,7 @@ that beneath its ruins lay buried an ancient evil.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0hgzdvlh0j42w4q9kch9xvhnbvcrypac01xhpksw35gj9my887cp"))
+        (base32 "0kg6npbfy42mhggsqvs04khc8198i980z52xm59pws29698qazaw"))
        (modules '((guix build utils)))
        (snippet
         ;; So, some of the sounds/graphics/tilesets are under different
@@ -3989,55 +3989,12 @@ that beneath its ruins lay buried an ancient evil.")
            (substitute* "lib/Makefile"
              ;; And don't try to invoke makefiles in the directories we removed.
              (("gamedata customize help screens fonts tiles sounds icons user")
-              "gamedata customize help screens user"))
-           ;; Remove nonfree .dll files too.
-           (delete-file-recursively "src/win")))))
+              "gamedata customize help screens user"))))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags (list (string-append "--bindir=" %output "/bin"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'fix-infinite-loop-on-sighup
-           ;; XXX Release 4.2.6 has a major bug where sending the process a
-           ;; SIGHUP when closing the terminal causes it to infinite loop
-           ;; waiting for input: https://github.com/angband/angband/issues/6558
-           ;; Reevaluate for future versions.
-           (lambda _
-             (substitute* "src/ui-signals.c"
-               (("(SIGHUP, )SIG_IGN" _ first)
-                (string-append first "handle_signal_abort")))))
-         (add-before 'check 'skip-failing-tests
-           (lambda _
-             (let ((to-skip '(;; some of these may be fixable, but most try to
-                              ;; create a directory in the user's home directory.
-                              ;; Rather than reading environment variables, they
-                              ;; lookup the username using getpwnam(3) and manually
-                              ;; construct the string.
-                              ;; Generic "Suite died":
-                              "game/basic"
-                              "game/mage"
-                              ;; "Cannot create '//.angband/Angband'":
-                              "effects/chain"
-                              "effects/destruction"
-                              "effects/earthquake"
-                              "object/info"
-                              "object/slays"
-                              "player/calc-inventory"
-                              "player/combine-pack"
-                              "player/digging"
-                              "player/inven-carry-num"
-                              "player/inven-wield"
-                              "player/timed"
-                              ;; This file likes to read /etc/passwd
-                              "z-file/path-normalize")))
-               (substitute* "src/tests/Makefile"
-                 (("include \\$\\(SUITES\\)" all)
-                  (string-append all "\nTESTPROGS := $(filter-out "
-                                 (string-join to-skip " ")
-                                 ", $(TESTPROGS))")))))))))
-    (native-inputs (list autoconf
-                         automake
-                         perl)) ;for tests
+     `(#:tests? #f                      ; no check target
+       #:configure-flags (list (string-append "--bindir=" %output "/bin"))))
+    (native-inputs (list autoconf automake))
     (inputs (list ncurses))
     (home-page "https://rephial.org/")
     (synopsis "Dungeon exploration roguelike")
@@ -4948,7 +4905,7 @@ Protocol).")
 (define-public extremetuxracer
   (package
     (name "extremetuxracer")
-    (version "0.8.4")
+    (version "0.8.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -4956,7 +4913,7 @@ Protocol).")
                     version "/etr-" version ".tar.xz"))
               (sha256
                (base32
-                "1rbk8zqfzzk90znf3f5lqqa12j0n6pm2qgwzabzmlnkm1k68acps"))))
+                "0knd22lzhzqih1w92y6m7yxha376c6ydl22wy4xm6jg2x5jlk1qw"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))

gnu/packages/gawk.scm

@@ -41,13 +41,13 @@
 (define-public gawk
   (package
    (name "gawk")
-   (version "5.3.0")
+   (version "5.3.2")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gawk/gawk-" version
                                 ".tar.xz"))
             (sha256
-             (base32 "02x97iyl9v84as4rkdrrkfk2j4vy4r3hpp3rkp3gh3qxs79id76a"))))
+             (base32 "1k699kfajwzw4dyw1m9h9kld1gdv00nfy04b2f952w6y15jlihzq"))))
    (build-system gnu-build-system)
    (arguments
     (list #:phases
@@ -56,7 +56,7 @@
                 (lambda* (#:key inputs #:allow-other-keys)
                   ;; Refer to the right shell.
                   (let ((/bin/sh (search-input-file inputs "bin/sh")))
-                    (substitute* "io.c"
+                    (substitute* '("io.c" "builtin.c")
                       (("/bin/sh") /bin/sh))
 
                     ;; When cross-compiling, remove dependencies on the
@@ -73,7 +73,7 @@
                   ;; Remove dependency on 'more' (from util-linux), which
                   ;; would needlessly complicate bootstrapping.
                   (substitute* "test/Makefile"
-                    (("\\| more") ""))
+                    (("\\| \\$\\$\\{PAGER:-more\\}") ""))
 
                   ;; Adjust the shebang in that file since it is then diff'd
                   ;; against the actual test output.

gnu/packages/gcc.scm

@@ -80,16 +80,16 @@ where the OS part is overloaded to denote a specific ABI---into GCC
   (cond ((string-match "^mips64el.*gnuabin?64$" target)
          ;; Triplets recognized by glibc as denoting the N64 ABI; see
          ;; ports/sysdeps/mips/preconfigure.
-         '("--with-abi=64"))
+         #~(list "--with-abi=64"))
 
         ((string-match "^arm.*-gnueabihf$" target)
-         '("--with-arch=armv7-a"
-           "--with-float=hard"
-           "--with-mode=thumb"
-           "--with-fpu=neon"))
+         #~(list "--with-arch=armv7-a"
+                 "--with-float=hard"
+                 "--with-mode=thumb"
+                 "--with-fpu=neon"))
 
         ((string-match "x86_64-linux-gnux32" target)
-         '("--with-abi=mx32"))
+         #~(list "--with-abi=mx32"))
 
         ((and (string-suffix? "-gnu" target)
               (not (string-contains target "-linux")))
@@ -97,36 +97,24 @@ where the OS part is overloaded to denote a specific ABI---into GCC
          ;; with:
          ;;   libcilkrts/runtime/os-unix.c:388:2: error: #error "Unknown architecture"
          ;; Cilk has been removed from GCC 8 anyway.
-         '("--disable-libcilkrts"))
+         #~(list "--disable-libcilkrts"))
 
         ;; glibc needs the 128-bit long double type on these architectures.
         ((or (string-prefix? "powerpc64le-" target)
              (string-prefix? "powerpc-" target))
-         '("--with-long-double-128"))
+         #~(list "--with-long-double-128"))
 
         ;; GCC 11.3.0's <libgcov.h> includes <sys/mman.h>, which MinGW lacks:
         ;; <https://bugs.gentoo.org/show_bug.cgi?id=843989>.
         ((target-mingw? target)
-         '("--disable-gcov"))
+         #~(list "--disable-gcov"))
 
         (else
          ;; TODO: Add `arm.*-gnueabi', etc.
-         '())))
+         #~(list))))
 
 (define-public gcc-base
   (let* ((stripped? #t)      ;whether to strip the compiler, not the libraries
-         (maybe-target-tools
-          (lambda ()
-            ;; Return the `_FOR_TARGET' variables that are needed when
-            ;; cross-compiling GCC.
-            (let ((target (%current-target-system)))
-              (if target
-                  (map (lambda (var tool)
-                         (string-append (string-append var "_FOR_TARGET")
-                                        "=" target "-" tool))
-                       '("CC"  "CXX" "LD" "AR" "NM" "OBJDUMP" "RANLIB" "STRIP")
-                       '("gcc" "g++" "ld" "ar" "nm" "objdump" "ranlib" "strip"))
-                  '()))))
          (libdir
           (let ((base '(or (assoc-ref outputs "lib")
                            (assoc-ref outputs "out"))))
@@ -134,45 +122,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
               ;; Return the directory that contains lib/libgcc_s.so et al.
               (if (%current-target-system)
                   `(string-append ,base "/" ,(%current-target-system))
-                  base))))
-         (configure-flags
-          (lambda ()
-            ;; This is terrible.  Since we have two levels of quasiquotation,
-            ;; we have to do this convoluted thing just so we can insert the
-            ;; contents of (maybe-target-tools).
-            (list 'quasiquote
-                  (append
-                   '("--enable-plugin"
-                     "--enable-languages=c,c++,objc,obj-c++"
-                     "--disable-multilib"
-                     "--with-system-zlib"
-
-                     ;; No pre-compiled libstdc++ headers, to save space.
-                     "--disable-libstdcxx-pch"
-
-                     "--with-local-prefix=/no-gcc-local-prefix"
-
-                     ;; With a separate "lib" output, the build system
-                     ;; incorrectly guesses GPLUSPLUS_INCLUDE_DIR, so force
-                     ;; it.  (Don't use a versioned sub-directory, that's
-                     ;; unnecessary.)
-                     ,(string-append "--with-gxx-include-dir="
-                                     (assoc-ref %outputs "out")
-                                     "/include/c++")
-
-                     ,(let ((libc (assoc-ref %build-inputs "libc")))
-                        (if libc
-                            (string-append "--with-native-system-header-dir=" libc
-                                           "/include")
-                            "--without-headers")))
-
-                   ;; Pass the right options for the target triplet.
-                   (let ((triplet
-                          (or (%current-target-system)
-                              (nix-system->gnu-triplet (%current-system)))))
-                     (gcc-configure-flags-for-triplet triplet))
-
-                   (maybe-target-tools))))))
+                  base)))))
     (hidden-package
      (package
        (name "gcc")
@@ -202,201 +152,239 @@ where the OS part is overloaded to denote a specific ABI---into GCC
                             texinfo-5))
 
        (arguments
-        `(#:out-of-source? #t
-          #:configure-flags ,(configure-flags)
+        (list
+         #:out-of-source? #t
+         #:configure-flags
+         #~(append
+            (list "--enable-plugin"
+                  "--enable-languages=c,c++,objc,obj-c++"
+                  "--disable-multilib"
+                  "--with-system-zlib"
 
-          #:make-flags
-          ;; None of the flags below are needed when doing a Canadian cross.
-          ;; TODO: Simplify this.
-          ,(if (%current-target-system)
-               (if stripped?
-                   ''("CFLAGS=-g0 -O2")
-                   ''())
-               `(let* ((libc        (assoc-ref %build-inputs "libc"))
-                       (libc-native (or (assoc-ref %build-inputs "libc-native")
-                                        libc)))
-                  `(,@(if libc
-                          (list (string-append "LDFLAGS_FOR_TARGET="
-                                               "-B" libc "/lib "
-                                               "-Wl,-dynamic-linker "
-                                               "-Wl," libc
-                                               ,(glibc-dynamic-linker)))
-                          '())
+                  ;; No pre-compiled libstdc++ headers, to save space.
+                  "--disable-libstdcxx-pch"
 
-                    ;; Native programs like 'genhooks' also need that right.
-                    ,(string-append "LDFLAGS="
-                                    "-Wl,-rpath=" libc-native "/lib "
-                                    "-Wl,-dynamic-linker "
-                                    "-Wl," libc-native ,(glibc-dynamic-linker))
-                    ,(string-append "BOOT_CFLAGS=-O2 "
-                                    ,(if stripped? "-g0" "-g")))))
+                  "--with-local-prefix=/no-gcc-local-prefix"
 
-          #:tests? #f
+                  ;; With a separate "lib" output, the build system
+                  ;; incorrectly guesses GPLUSPLUS_INCLUDE_DIR, so force
+                  ;; it.  (Don't use a versioned sub-directory, that's
+                  ;; unnecessary.)
+                  (string-append "--with-gxx-include-dir="
+                                 #$output "/include/c++")
 
-          #:phases
-          (modify-phases %standard-phases
-            (add-before 'configure 'relax-gcc-14s-strictness
-              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((bash (assoc-ref inputs "bash"))
-                      (wrapper (string-append (getcwd) "/gcc.sh"))
-                      (stage-wrapper (string-append (getcwd) "/stage-gcc.sh")))
-                  (with-output-to-file wrapper
-                    (lambda _
-                      (format #t "#! ~a/bin/bash
+                  (let ((libc (assoc-ref %build-inputs "libc")))
+                    (if libc
+                        (string-append "--with-native-system-header-dir=" libc
+                                       "/include")
+                        "--without-headers")))
+
+            ;; Pass the right options for the target triplet.
+            #$(gcc-configure-flags-for-triplet
+               (or (%current-target-system)
+                   (nix-system->gnu-triplet (%current-system))))
+
+            ;; Return the `_FOR_TARGET' variables that are needed when
+            ;; cross-compiling GCC.
+            #$(let ((target (%current-target-system)))
+                (if target
+                    #~(map (lambda (var tool)
+                             (string-append (string-append var "_FOR_TARGET")
+                                            "=" #$target "-" tool))
+                           '("CC"  "CXX" "LD" "AR" "NM" "OBJDUMP" "RANLIB" "STRIP")
+                           '("gcc" "g++" "ld" "ar" "nm" "objdump" "ranlib" "strip"))
+                    #~(list))))
+         #:make-flags
+         (cond
+          ((and (%current-target-system) stripped?)
+           #~(list "CFLAGS=-g0 -O2"))
+          ((%current-target-system)
+           #~(list)) ;None of the flags are needed when doing a Canadian cross.
+          (else
+           #~(let* ((libc (assoc-ref %build-inputs "libc"))
+                    (libc-native (or (assoc-ref %build-inputs "libc-native")
+                                     libc))
+                    (loader #$(glibc-dynamic-linker)))
+               (cons*
+                ;; Native programs like 'genhooks' need that right.
+                (string-append "LDFLAGS="
+                               "-Wl,-rpath=" libc-native "/lib "
+                               "-Wl,-dynamic-linker "
+                               "-Wl," libc-native loader)
+                (string-append "BOOT_CFLAGS=-O2 "
+                               (if #$stripped? "-g0" "-g"))
+                (if libc
+                    (list (string-append "LDFLAGS_FOR_TARGET="
+                                         "-B" libc "/lib "
+                                         "-Wl,-dynamic-linker "
+                                         "-Wl," libc loader))
+                    (list))))))
+         #:tests? #f
+
+         #:phases
+         #~(modify-phases %standard-phases
+             (add-before 'configure 'relax-gcc-14s-strictness
+               (lambda* (#:key inputs #:allow-other-keys)
+                 (let ((bash (search-input-file inputs "/bin/bash"))
+                       (wrapper (string-append (getcwd) "/gcc.sh"))
+                       (stage-wrapper (string-append (getcwd) "/stage-gcc.sh")))
+                   (with-output-to-file wrapper
+                     (lambda _
+                       (format #t "#! ~a
 exec gcc \"$@\" \
     -Wno-error=implicit-function-declaration"
-                              bash)))
-                  (chmod wrapper #o555)
-                  (with-output-to-file stage-wrapper
-                    (lambda _
-                      (format #t "#! ~a/bin/bash
+                               bash)))
+                   (chmod wrapper #o555)
+                   (with-output-to-file stage-wrapper
+                     (lambda _
+                       (format #t "#! ~a
 exec \"$@\" \
     -Wno-error=implicit-function-declaration"
-                              bash)))
-                  (chmod stage-wrapper #o555)
-                  ;; Rather than adding CC to #:configure-flags and
-                  ;; STAGE_CC_WRAPPER to #:make-flags, we add them to the
-                  ;; environment in this easily removable stage.
-                  (cond (,(%current-target-system) ;cross-build?
-                         (setenv "CC_FOR_BUILD" wrapper))
-                        (else
-                         (setenv "CC" wrapper)
-                         (setenv "STAGE_CC_WRAPPER" stage-wrapper))))))
-            (add-before 'configure 'pre-configure
-              (lambda* (#:key inputs outputs #:allow-other-keys)
-                (let ((libdir ,(libdir))
-                      (libc   (assoc-ref inputs "libc")))
-                  (when libc
-                    ;; The following is not performed for `--without-headers'
-                    ;; cross-compiler builds.
+                               bash)))
+                   (chmod stage-wrapper #o555)
+                   ;; Rather than adding CC to #:configure-flags and
+                   ;; STAGE_CC_WRAPPER to #:make-flags, we add them to the
+                   ;; environment in this easily removable stage.
+                   (cond (#$(%current-target-system) ;cross-build?
+                          (setenv "CC_FOR_BUILD" wrapper))
+                         (else
+                          (setenv "CC" wrapper)
+                          (setenv "STAGE_CC_WRAPPER" stage-wrapper))))))
+             (add-before 'configure 'pre-configure
+               (lambda* (#:key inputs outputs #:allow-other-keys)
+                 (let ((libdir #$(libdir))
+                       (libc   (assoc-ref inputs "libc")))
+                   (when libc
+                     ;; The following is not performed for `--without-headers'
+                     ;; cross-compiler builds.
 
-                    ;; Join multi-line definitions of GLIBC_DYNAMIC_LINKER* into a
-                    ;; single line, to allow the next step to work properly.
-                    (for-each
-                     (lambda (x)
-                       (substitute* (find-files "gcc/config"
-                                                "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
-                         (("(#define (GLIBC|GNU_USER)_DYNAMIC_LINKER.*)\\\\\n$" _ line)
-                          line)))
-                     '(1 2 3))
+                     ;; Join multi-line definitions of GLIBC_DYNAMIC_LINKER* into a
+                     ;; single line, to allow the next step to work properly.
+                     (for-each
+                      (lambda (x)
+                        (substitute* (find-files "gcc/config"
+                                                 "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
+                          (("(#define (GLIBC|GNU_USER)_DYNAMIC_LINKER.*)\\\\\n$" _ line)
+                           line)))
+                      '(1 2 3))
 
-                    ;; Fix the dynamic linker's file name.
-                    (substitute* (find-files "gcc/config"
-                                             "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
-                      (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ \t]*).*$"
-                        _ gnu-user suffix)
-                       (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
-                               gnu-user suffix
-                               (string-append libc ,(glibc-dynamic-linker)))))
+                     ;; Fix the dynamic linker's file name.
+                     (substitute* (find-files "gcc/config"
+                                              "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
+                       (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ \t]*).*$"
+                         _ gnu-user suffix)
+                        (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
+                                gnu-user suffix
+                                (string-append libc #$(glibc-dynamic-linker)))))
 
-                    ;; Tell where to find libstdc++, libc, and `?crt*.o', except
-                    ;; `crt{begin,end}.o', which come with GCC.
-                    (substitute* (find-files "gcc/config"
-                                             "^gnu-user.*\\.h$")
-                      (("#define GNU_USER_TARGET_LIB_SPEC (.*)$" _ suffix)
-                       ;; Help libgcc_s.so be found (see also below.)  Always use
-                       ;; '-lgcc_s' so that libgcc_s.so is always found by those
-                       ;; programs that use 'pthread_cancel' (glibc dlopens
-                       ;; libgcc_s.so when pthread_cancel support is needed, but
-                       ;; having it in the application's RUNPATH isn't enough; see
-                       ;; <http://sourceware.org/ml/libc-help/2013-11/msg00023.html>.)
-                       ;;
-                       ;; NOTE: The '-lgcc_s' added below needs to be removed in a
-                       ;; later phase of %gcc-static.  If you change the string
-                       ;; below, make sure to update the relevant code in
-                       ;; %gcc-static package as needed.
-                       (format #f "#define GNU_USER_TARGET_LIB_SPEC \
+                     ;; Tell where to find libstdc++, libc, and `?crt*.o', except
+                     ;; `crt{begin,end}.o', which come with GCC.
+                     (substitute* (find-files "gcc/config"
+                                              "^gnu-user.*\\.h$")
+                       (("#define GNU_USER_TARGET_LIB_SPEC (.*)$" _ suffix)
+                        ;; Help libgcc_s.so be found (see also below.)  Always use
+                        ;; '-lgcc_s' so that libgcc_s.so is always found by those
+                        ;; programs that use 'pthread_cancel' (glibc dlopens
+                        ;; libgcc_s.so when pthread_cancel support is needed, but
+                        ;; having it in the application's RUNPATH isn't enough; see
+                        ;; <http://sourceware.org/ml/libc-help/2013-11/msg00023.html>.)
+                        ;;
+                        ;; NOTE: The '-lgcc_s' added below needs to be removed in a
+                        ;; later phase of %gcc-static.  If you change the string
+                        ;; below, make sure to update the relevant code in
+                        ;; %gcc-static package as needed.
+                        (format #f "#define GNU_USER_TARGET_LIB_SPEC \
 \"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib -lgcc_s}} \" ~a"
-                               libc libc libdir suffix))
-                      (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
-                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
+                                libc libc libdir suffix))
+                       (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
+                        (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"
 ~a"
-                               libc line)))
+                                libc line)))
 
-                    ;; The rs6000 (a.k.a. powerpc) config in GCC does not use
-                    ;; GNU_USER_* defines.  Do the above for this case.
-                    (substitute*
-                        "gcc/config/rs6000/sysv4.h"
-                      (("#define LIB_LINUX_SPEC (.*)$" _ suffix)
-                       (format #f "#define LIB_LINUX_SPEC \
+                     ;; The rs6000 (a.k.a. powerpc) config in GCC does not use
+                     ;; GNU_USER_* defines.  Do the above for this case.
+                     (substitute*
+                         "gcc/config/rs6000/sysv4.h"
+                       (("#define LIB_LINUX_SPEC (.*)$" _ suffix)
+                        (format #f "#define LIB_LINUX_SPEC \
 \"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib -lgcc_s}} \" ~a"
-                               libc libc libdir suffix))
-                      (("#define	STARTFILE_LINUX_SPEC.*$" line)
-                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
+                                libc libc libdir suffix))
+                       (("#define	STARTFILE_LINUX_SPEC.*$" line)
+                        (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"
 ~a"
-                               libc line))))
+                                libc line))))
 
-                  (when (file-exists? "gcc/config/rs6000")
-                    ;; Force powerpc libdir to be /lib and not /lib64
-                    (substitute* (find-files "gcc/config/rs6000")
-                      (("/lib64") "/lib")))
+                   (when (file-exists? "gcc/config/rs6000")
+                     ;; Force powerpc libdir to be /lib and not /lib64
+                     (substitute* (find-files "gcc/config/rs6000")
+                       (("/lib64") "/lib")))
 
-                  ;; Don't retain a dependency on the build-time sed.
-                  (substitute* "fixincludes/fixincl.x"
-                    (("static char const sed_cmd_z\\[\\] =.*;")
-                     "static char const sed_cmd_z[] = \"sed\";"))
+                   ;; Don't retain a dependency on the build-time sed.
+                   (substitute* "fixincludes/fixincl.x"
+                     (("static char const sed_cmd_z\\[\\] =.*;")
+                      "static char const sed_cmd_z[] = \"sed\";"))
 
-                  ;; Aarch64 support didn't land in GCC until the 4.8 series.
-                  (when (file-exists? "gcc/config/aarch64")
-                    ;; Force Aarch64 libdir to be /lib and not /lib64
-                    (substitute* "gcc/config/aarch64/t-aarch64-linux"
-                      (("lib64") "lib")))
+                   ;; Aarch64 support didn't land in GCC until the 4.8 series.
+                   (when (file-exists? "gcc/config/aarch64")
+                     ;; Force Aarch64 libdir to be /lib and not /lib64
+                     (substitute* "gcc/config/aarch64/t-aarch64-linux"
+                       (("lib64") "lib")))
 
-                  ;; The STARTFILE_PREFIX_SPEC prevents gcc from finding the
-                  ;; gcc:lib output, which causes ld to not find -lgcc_s.
-                  (when (file-exists? "gcc/config/riscv")
-                    (substitute* '("gcc/config/riscv/linux.h"
-                                   "gcc/config/riscv/riscv.h")  ; GCC < 10
-                      (("define STARTFILE_PREFIX_SPEC")
-                      "define __STARTFILE_PREFIX_SPEC")))
+                   ;; The STARTFILE_PREFIX_SPEC prevents gcc from finding the
+                   ;; gcc:lib output, which causes ld to not find -lgcc_s.
+                   (when (file-exists? "gcc/config/riscv")
+                     (substitute* '("gcc/config/riscv/linux.h"
+                                    "gcc/config/riscv/riscv.h")  ; GCC < 10
+                       (("define STARTFILE_PREFIX_SPEC")
+                        "define __STARTFILE_PREFIX_SPEC")))
 
-                  (when (file-exists? "libbacktrace")
-                    ;; GCC 4.8+ comes with libbacktrace.  By default it builds
-                    ;; with -Werror, which fails with a -Wcast-qual error in glibc
-                    ;; 2.21's stdlib-bsearch.h.  Remove -Werror.
-                    (substitute* "libbacktrace/configure"
-                      (("WARN_FLAGS=(.*)-Werror" _ flags)
-                       (string-append "WARN_FLAGS=" flags)))
+                   (when (file-exists? "libbacktrace")
+                     ;; GCC 4.8+ comes with libbacktrace.  By default it builds
+                     ;; with -Werror, which fails with a -Wcast-qual error in glibc
+                     ;; 2.21's stdlib-bsearch.h.  Remove -Werror.
+                     (substitute* "libbacktrace/configure"
+                       (("WARN_FLAGS=(.*)-Werror" _ flags)
+                        (string-append "WARN_FLAGS=" flags)))
 
-                    (when (file-exists? "libsanitizer/libbacktrace")
-                      ;; Same in libsanitizer's bundled copy (!) found in 4.9+.
-                      (substitute* "libsanitizer/libbacktrace/Makefile.in"
-                        (("-Werror")
-                         ""))))
+                     (when (file-exists? "libsanitizer/libbacktrace")
+                       ;; Same in libsanitizer's bundled copy (!) found in 4.9+.
+                       (substitute* "libsanitizer/libbacktrace/Makefile.in"
+                         (("-Werror")
+                          ""))))
 
-                  ;; Add a RUNPATH to libstdc++.so so that it finds libgcc_s.
-                  ;; See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354>
-                  ;; and <http://bugs.gnu.org/20358>.
-                  (substitute* "libstdc++-v3/src/Makefile.in"
-                    (("^OPT_LDFLAGS = ")
-                     "OPT_LDFLAGS = -Wl,-rpath=$(libdir) "))
+                   ;; Add a RUNPATH to libstdc++.so so that it finds libgcc_s.
+                   ;; See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354>
+                   ;; and <http://bugs.gnu.org/20358>.
+                   (substitute* "libstdc++-v3/src/Makefile.in"
+                     (("^OPT_LDFLAGS = ")
+                      "OPT_LDFLAGS = -Wl,-rpath=$(libdir) "))
 
-                  ;; Move libstdc++*-gdb.py to the "lib" output to avoid a
-                  ;; circularity between "out" and "lib".  (Note:
-                  ;; --with-python-dir is useless because it imposes $(prefix) as
-                  ;; the parent directory.)
-                  (substitute* "libstdc++-v3/python/Makefile.in"
-                    (("pythondir = .*$")
-                     (string-append "pythondir = " libdir "/share"
-                                    "/gcc-$(gcc_version)/python\n")))
+                   ;; Move libstdc++*-gdb.py to the "lib" output to avoid a
+                   ;; circularity between "out" and "lib".  (Note:
+                   ;; --with-python-dir is useless because it imposes $(prefix) as
+                   ;; the parent directory.)
+                   (substitute* "libstdc++-v3/python/Makefile.in"
+                     (("pythondir = .*$")
+                      (string-append "pythondir = " libdir "/share"
+                                     "/gcc-$(gcc_version)/python\n")))
 
-                  ;; Avoid another circularity between the outputs: this #define
-                  ;; ends up in auto-host.h in the "lib" output, referring to
-                  ;; "out".  (This variable is used to augment cpp's search path,
-                  ;; but there's nothing useful to look for here.)
-                  (substitute* "gcc/config.in"
-                    (("PREFIX_INCLUDE_DIR")
-                     "PREFIX_INCLUDE_DIR_isnt_necessary_here")))))
+                   ;; Avoid another circularity between the outputs: this #define
+                   ;; ends up in auto-host.h in the "lib" output, referring to
+                   ;; "out".  (This variable is used to augment cpp's search path,
+                   ;; but there's nothing useful to look for here.)
+                   (substitute* "gcc/config.in"
+                     (("PREFIX_INCLUDE_DIR")
+                      "PREFIX_INCLUDE_DIR_isnt_necessary_here")))))
 
-            (add-after 'configure 'post-configure
-              (lambda _
-                ;; Don't store configure flags, to avoid retaining references to
-                ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
-                (substitute* "Makefile"
-                  (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
-                   "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))))))
+             (add-after 'configure 'post-configure
+               (lambda _
+                 ;; Don't store configure flags, to avoid retaining references to
+                 ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
+                 (substitute* "Makefile"
+                   (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
+                    "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))))))
        (native-search-paths %gcc-search-paths)
        (properties `((gcc-libc . ,(assoc-ref inputs "libc"))))
        (synopsis "GNU Compiler Collection")
@@ -440,21 +428,21 @@ Go.  It also includes runtime support libraries for these languages.")
             `((srfi srfi-1)
               ,@modules))
            ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libc (assoc-ref inputs "libc"))
-                         (gcc (assoc-ref inputs  "gcc")))
-                     (setenv "CPLUS_INCLUDE_PATH"
-                             (string-join (fold delete
-                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                              #\:)
-                                                (list (string-append libc "/include")
-                                                      (string-append gcc "/include/c++")))
-                                          ":"))
-                     (format #t
-                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
+            #~(modify-phases #$phases
+                (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                  (lambda* (#:key inputs #:allow-other-keys)
+                    (let ((libc (assoc-ref inputs "libc"))
+                          (gcc (assoc-ref inputs  "gcc")))
+                      (setenv "CPLUS_INCLUDE_PATH"
+                              (string-join (fold delete
+                                                 (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                               #\:)
+                                                 (list (string-append libc "/include")
+                                                       (string-append gcc "/include/c++")))
+                                           ":"))
+                      (format #t
+                              "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                              (getenv "CPLUS_INCLUDE_PATH"))))))))))
     (supported-systems (fold delete %supported-systems
                              '("aarch64-linux" "riscv64-linux"
                                "powerpc64le-linux" "x86_64-gnu")))))
@@ -498,21 +486,21 @@ Go.  It also includes runtime support libraries for these languages.")
            ;; For native builds of some GCC versions the C++ include path needs to
            ;; be adjusted so it does not interfere with GCC's own build processes.
            ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libc (assoc-ref inputs "libc"))
-                         (gcc (assoc-ref inputs  "gcc")))
-                     (setenv "CPLUS_INCLUDE_PATH"
-                             (string-join (fold delete
-                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                              #\:)
-                                                (list (string-append libc "/include")
-                                                      (string-append gcc "/include/c++")))
-                                          ":"))
-                     (format #t
-                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
+            #~(modify-phases #$phases
+                (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                  (lambda* (#:key inputs #:allow-other-keys)
+                    (let ((libc (assoc-ref inputs "libc"))
+                          (gcc (assoc-ref inputs  "gcc")))
+                      (setenv "CPLUS_INCLUDE_PATH"
+                              (string-join (fold delete
+                                                 (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                               #\:)
+                                                 (list (string-append libc "/include")
+                                                       (string-append gcc "/include/c++")))
+                                           ":"))
+                      (format #t
+                              "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                              (getenv "CPLUS_INCLUDE_PATH"))))))))))
     (supported-systems (fold delete %supported-systems
                              '("riscv64-linux" "x86_64-gnu")))
     (inputs
@@ -981,7 +969,8 @@ It also includes runtime support libraries for these languages.")
               (patches (search-patches "gcc-12-strmov-store-file-names.patch"
                                        "gcc-5.0-libvtv-runpath.patch"
                                        "gcc-13-libsanitizer-no-crypt.patch"
-                                       "gcc-libstdc++-newer-gcc.patch"))
+                                       "gcc-libstdc++-newer-gcc.patch"
+                                       "gcc-mangle-guix-store.patch"))
               (modules '((guix build utils)))
               (snippet gcc-canadian-cross-objdump-snippet)))
     (arguments
@@ -1012,7 +1001,8 @@ It also includes runtime support libraries for these languages.")
                (base32
                 "0fna78ly417g69fdm4i5f3ms96g8xzzjza8gwp41lqr5fqlpgp70"))
               (patches (search-patches "gcc-12-strmov-store-file-names.patch"
-                                       "gcc-5.0-libvtv-runpath.patch"))
+                                       "gcc-5.0-libvtv-runpath.patch"
+                                       "gcc-mangle-guix-store.patch"))
               (modules '((guix build utils)))
               (snippet gcc-canadian-cross-objdump-snippet)))
     (arguments (substitute-keyword-arguments arguments
@@ -1045,7 +1035,8 @@ It also includes runtime support libraries for these languages.")
                 "0knj4ph6y7r7yhnp1v4339af7mki5nkh7ni9b948433bhabdk3s3"))
               (patches (search-patches "gcc-12-strmov-store-file-names.patch"
                                        "gcc-5.0-libvtv-runpath.patch"
-                                       "gcc-hurd-split-stack.patch"))
+                                       "gcc-hurd-split-stack.patch"
+                                       "gcc-mangle-guix-store.patch"))
               (modules '((guix build utils)))
               (snippet gcc-canadian-cross-objdump-snippet)))
     (arguments
@@ -1196,10 +1187,17 @@ using compilers other than GCC."
           #$@(if (version>=? (package-version gcc) "11")
                  #~((add-after 'unpack 'hide-gcc-headers
                       (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                        (let ((gcc (assoc-ref (or native-inputs inputs)
-                                              #$(if (%current-target-system)
-                                                    "cross-gcc"
-                                                    "gcc"))))
+                        ;; Depending on the actual gcc input, two locations
+                        ;; candidates to check to get gcc from the file tree.
+                        (let* ((gcc-nested (false-if-exception
+                                            (search-input-directory
+                                             (or native-inputs inputs)
+                                             "libexec/gcc")))
+                               (gcc-nested (or gcc-nested
+                                               (search-input-file
+                                                (or native-inputs inputs)
+                                                "bin/gcc")))
+                               (gcc (dirname (dirname gcc-nested))))
                           ;; Fix a regression in GCC 11 where the GCC headers
                           ;; shadows glibc headers when building libstdc++.  An
                           ;; upstream fix was added in GCC 11.3.0, but it only

gnu/packages/gettext.scm

@@ -13,6 +13,7 @@
 ;;; Copyright © 2020 EuAndreh <eu@euandre.org>
 ;;; Copyright © 2022, 2024, 2025 gemmaro <gemmaro.dev@gmail.com>
 ;;; Copyright © 2023 Maxim Cournoyer maxim@guixotic.coop>
+;;; Copyright © 2026 Robin Templeton <robin@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -57,24 +58,21 @@
 (define-public gettext-minimal
   (package
     (name "gettext-minimal")
-    (version "0.23.1")
+    (version "1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/gettext/gettext-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0j8fijicvg8jkrisgsqbpnbmfb2mz3gx2p6pcwip82731yb7i9aj"))))
+                "06jgjxnm5xhw0d0zwl9birlwfxfgfqhk9q029j3h9941r5wrpnc5"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc"))                            ;9 MiB of HTML
     (inputs
      (list libunistring
            libxml2
-           ;; TODO: ncurses is only needed for the 'libtextstyle' library.
-           ;; The next version of gettext can use a separate libtextstyle,
-           ;; but for now we include it here in 'gettext-minimal'.
-           ncurses))
+           libtextstyle))
     (arguments
      (list #:configure-flags #~'("--with-included-libunistring=no"
                                  "--with-included-libxml=no")
@@ -93,11 +91,11 @@
                      (("/bin/pwd") "pwd"))))
                (add-before 'check 'patch-tests
                  (lambda* (#:key inputs #:allow-other-keys)
-                   ;;libgettextlib-0.23.so => not found
+                   ;;libgettextlib-1.0.so => not found
                    (substitute* "gettext-tools/gnulib-tests/test-execute.sh"
                      (("^#!.*" all)
                       (string-append all "exit 77;\n")))
-                   (let* ((bash (which "sh")))
+                   (let* ((bash (search-input-file inputs "bin/sh")))
                      ;; Some of the files we're patching are
                      ;; ISO-8859-1-encoded, so choose it as the default
                      ;; encoding so the byte encoding is preserved.
@@ -106,7 +104,7 @@
                            (find-files "gettext-tools/tests"
                                        "^(lang-sh|msg(exec|filter)-[0-9])")
                          (("#![[:blank:]]/bin/sh")
-                          (format #f "#!~a" bash)))
+                          (string-append "#!" bash)))
 
                        (substitute* (cons "gettext-tools/src/msginit.c"
                                           (find-files "gettext-tools/gnulib-tests"
@@ -118,12 +116,26 @@
                          (("/bin/pwd")
                           "pwd"))
 
+                       #$@(if (string=? "riscv64-linux" (%current-system))
+                              ;; Unmodified test-lock will fail or crash riscv64
+                              #~((substitute* "gettext-tools/gnulib-tests/test-lock.c"
+                                   (("#define DO_TEST_RWLOCK 1")
+                                    "#define DO_TEST_RWLOCK 0")))
+                              #~())
                        #$@(if (target-hurd?)
                               #~((substitute*
                                      "gettext-tools/gnulib-tests/Makefile.in"
                                    ;; See 'coreutils' for the rationale.
                                    ((" test-tls\\$\\(EXEEXT\\) ") " ")))
                               '())))))
+               (add-after 'install 'patch-gettext.sh
+                 (lambda _
+                   ;; This matches only the relevant command invocations, but
+                   ;; is sensitive to the formatting of gettext.sh.  (The
+                   ;; string "gettext" appears in program output.)
+                   (substitute* (string-append #$output "/bin/gettext.sh")
+                     (("(^  |`|; )(gettext|ngettext|envsubst)" _ prefix program)
+                      (string-append prefix #$output "/bin/" program)))))
           #$@(if (%current-target-system)
                  #~((add-after 'install 'patch-cross-shebangs
                       (lambda _
@@ -151,30 +163,31 @@ translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
                   (cpe-name . "gettext")))
     (license gpl3+)))                             ;some files are under GPLv2+
 
-(define-public gettext-minimal-0.21
+;; Starting with gettext 0.24 some gnulib files are no longer public.
+;; keep this here to easily fix autoreconf
+(define-public gettext-minimal-0.23
   (package/inherit gettext-minimal
-    (version "0.21")
+    (version "0.23.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/gettext/gettext-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))
-              (patches (search-patches "gettext-libunicode-update.patch"))))
+                "0j8fijicvg8jkrisgsqbpnbmfb2mz3gx2p6pcwip82731yb7i9aj"))))
     (arguments
      (substitute-keyword-arguments arguments
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (add-after 'unpack 'touch-test
-              (lambda _
-                (with-output-to-file "gettext-tools/gnulib-tests/test-execute.sh"
-                  (lambda _ (display "")))))
-            (add-before 'check 'patch-test
-              (lambda _
-                ;; This test fails with ggc-14.
-                (substitute* "gettext-tools/tests/xgettext-javascript-6"
-                  (("^#!.*" all) (string-append all "exit 77;\n")))))))))))
+       ((#:make-flags flags)
+        ;; these gnulib tests fail with newer libunistring
+        #~(cons (string-append "XFAIL_TESTS="
+                               "test-uc_tolower "
+                               "test-ctype_alnum "
+                               "test-ctype_alpha "
+                               "test-ctype_graph "
+                               "test-ctype_lower "
+                               "test-ctype_print "
+                               "test-ctype_punct "
+                               "test-ctype_upper") #$flags))))))
 
 ;; Use that name to avoid clashes with Guile's 'gettext' procedure.
 ;;
@@ -203,22 +216,17 @@ translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
 (define-public libtextstyle
   (package
     (name "libtextstyle")
-    (version "0.21")
-    (source (origin
-              (inherit (package-source gnu-gettext))
-              (uri (string-append "mirror://gnu/gettext/gettext-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))))
+    (version (package-version gnu-gettext))
+    (source (package-source gnu-gettext))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-static")
-       #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'chdir
-                    (lambda _
-                      (chdir "libtextstyle")
-                      #t)))))
+     (list
+      #:configure-flags #~(list "--disable-static")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "libtextstyle"))))))
     ;; libtextstyle bundles libxml2, glib (a small subset thereof), and
     ;; libcroco, but it purposefully prevents users from using an external
     ;; copy, to reduce the startup time of programs using libtextstyle.

gnu/packages/gimp.scm

@@ -398,8 +398,7 @@ that is extensible via a plugin system.")
                         ;; environment, as it could cause Gimp to crash (see
                         ;; bug#77921).
                         `("GI_TYPELIB_PATH" prefix
-                          (,(getenv "GI_TYPELIB_PATH")
-                           ,(string-append #$output "/lib/girepository-1.0")))
+                          (,(getenv "GI_TYPELIB_PATH")))
                         `("GUIX_PYTHONPATH" prefix
                           (,(getenv "GUIX_PYTHONPATH")))
                         `("GDK_PIXBUF_MODULE_FILE" =

gnu/packages/gnome-circle.scm

@@ -524,8 +524,7 @@ like automatic language detection, text-to-speech and clipboard buttons.")
                             #:vendor-dir "vendor"
                             #:cargo-target #$(cargo-triplet)
                             args))
-                   '(prepare-rust-crates
-                     unpack-rust-crates
+                   '(unpack-rust-crates
                      configure
                      check-for-pregenerated-files
                      patch-cargo-checksums))))))))
@@ -596,8 +595,7 @@ Transmission, and can be used to control remote Transmission instances.")
                         #:vendor-dir "vendor"
                         #:cargo-target #$(cargo-triplet)
                         args))
-               '(prepare-rust-crates
-                 unpack-rust-crates
+               '(unpack-rust-crates
                  configure
                  check-for-pregenerated-files
                  patch-cargo-checksums)))))))

gnu/packages/gnuzilla.scm

@@ -604,7 +604,6 @@ in the case of Firefox, it is browser/locales/all-locales."
     "zh-CN"
     "zh-TW"))
 
-;;; Please keep these versions in sync with icedove.
 (define %icecat-base-version "140.9.0")
 (define %icecat-version (string-append %icecat-base-version "-gnu1"))
 (define %icecat-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
@@ -1249,29 +1248,24 @@ testing.")
        (cpe-name . "firefox_esr")
        (cpe-version . ,(first (string-split version #\-)))))))
 
-(define %icedove-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-build-id "20260224000000") ;must be of the form YYYYMMDDhhmmss
 ;;; See <https://product-details.mozilla.org/1.0/thunderbird_versions.json>
 ;;; for the source of truth regarding Thunderbird releases.
-;;; Please keep these version numbers in sync with icecat.
-;;; Please also update thunderbird-comm-source and thunderbird-comm-l10n to
-;;; the icedove version.
-(define %icedove-version "140.9.0")
+(define %icedove-version "140.8.0")
 
 ;; Provides the "comm" folder which is inserted into the icecat source.
 ;; Avoids the duplication of Icecat's source tarball.  Pick the changeset that
 ;; matches the most recent tag of the form 'THUNDERBIRD_140_2_0esr_RELEASE'.
-;; Please also update the commit of thunderbird-comm-l10n to match the
-;; changeset used by thunderbird-comm-source.
 (define thunderbird-comm-source
   (origin
     (method hg-fetch)
     (uri (hg-reference
           (url "https://hg.mozilla.org/releases/comm-esr140")
-          (changeset "8be9f2d3072c225a1e5f153745a18984c2babf8f")))
+          (changeset "aa377fbf351e6b10b053e6afa421755c82d5fcf7")))
     (file-name (string-append "thunderbird-" %icedove-version "-checkout"))
     (sha256
      (base32
-      "04j35957x03m5x7mhh8zxa86mwjy0is2vb614sr4inkvvz4rs2hg"))
+      "0595jg1qbwclzi9qssljqkisrm2dn99rzxzaz2mcfi7b1kvbfaki"))
     (patches (search-patches "icedove-observer-fix.patch"))))
 
 ;;; To regenerate, see the `format-locales' helper defined above.
@@ -1348,8 +1342,7 @@ testing.")
   ;; The commit to use can be found in the mail/locales/l10n-changesets.json
   ;; file in Thunderbird's source (e.g.:
   ;; <https://hg-edge.mozilla.org/releases/comm-esr140/file/efb07defaa2d56105675dc1d936af581ebfd8ffa/mail/locales/l10n-changesets.json>)
-  ;; where the hash in the URL is the changeset from thunderbird-comm-source.
-  (let* ((commit "7c86eab97e77f00ca7ed8f224d38338a3ed46693")
+  (let* ((commit "b6fd3d6c75ba35d91fe131a654df76ca86f35ac5")
          (revision "0")
          (version (git-version %icedove-version revision commit)))
     (origin
@@ -1360,7 +1353,7 @@ testing.")
       (file-name (git-file-name "thunderbird-l10n" version))
       (sha256
        (base32
-        "1navma2gwcgbbiwcwrc5lrx2jk3qmrnrc6i8pvhb8156pz4cg5nd")))))
+        "0n4df6kv70a6mxxsqwc83nhj8vl7acv9bcbf07nkcsjjxh3szvqc")))))
 
 (define icedove-source
   (let ((name (string-append "icedove-" %icedove-version)))

gnu/packages/golang-check.scm

@@ -3342,33 +3342,6 @@ and restore them afterwards.")
 @url{http://www.freebsd.org/cgi/man.cgi?query=fail,failpoints} for Golang.")
     (license license:asl2.0)))
 
-(define-public go-go-shabbyrobe-org-gocovmerge
-  (package
-    (name "go-go-shabbyrobe-org-gocovmerge")
-    (version "0.0.0-20230507111327-fa4f82cfbf4d")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~shabbyrobe/gocovmerge")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0sbr6i1m5hjbnlfad8cl8w30949r02c66l85hcmyyd9ka30mqr23"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "go.shabbyrobe.org/gocovmerge"))
-    (propagated-inputs
-     (list go-golang-org-x-tools))
-    (home-page "https://go.shabbyrobe.org/gocovmerge")
-    (synopsis "gocovmerge")
-    (description
-     "Package gocovmerge takes the results from multiple @code{go test
--coverprofile} runs and merges them into one profile.  It is a maintained fork
-of @url{https://github.com/wadey/gocovmerge}.")
-    (license license:bsd-2)))
-
 (define-public go-go-simpler-org-sloglint
   (package
     (name "go-go-simpler-org-sloglint")

gnu/packages/golang-web.scm

@@ -3404,41 +3404,6 @@ pattern.")
 @code{net/rpc}.")
     (license license:expat)))
 
-(define-public go-github-com-cevatbarisyilmaz-ara
-  (package
-    (name "go-github-com-cevatbarisyilmaz-ara")
-    (version "0.0.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/cevatbarisyilmaz/ara")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0512nlqqv9bnsplphiw7q9s80icl63wgl88b7m6m4vsvn5ghphc8"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/cevatbarisyilmaz/ara"
-      #:test-flags
-      ;; ialer_test.go:46: lookup google.com on [::1]:53: read udp
-      ;; [::1]:39632->[::1]:53: read: connection refused
-      #~(list "-skip" "TestDialer|TestNewCustomResolver")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-examples
-            (lambda* (#:key import-path #:allow-other-keys)
-              (with-directory-excursion (string-append "src/" import-path)
-                (delete-file "example_test.go")))))))
-    (home-page "https://github.com/cevatbarisyilmaz/ara")
-    (synopsis "Dialer with customizable resolver")
-    (description
-     "Package ara provides a dialer with customizable resolver.  It can be
-used with @code{http.Client} and @code{http.Transport} to alter host
-lookups.")
-    (license license:expat)))
-
 (define-public go-github-com-chris-ramon-douceur
   (package
     (name "go-github-com-chris-ramon-douceur")
@@ -5312,8 +5277,7 @@ for Go.")
     (home-page "https://github.com/emersion/go-sasl")
     (synopsis "SASL library written in Go")
     (description
-     "This package provides a @acronym{Simple Authentication and Security
-Layer, SASL} library written in Go.")
+     "This package provides a SASL library written in Go.")
     (license license:expat)))
 
 (define-public go-github-com-emersion-go-smtp
@@ -8666,40 +8630,6 @@ protocol) - used to discover UPnP services on a network
  by the IBM Cloud @code{OpenAPI} SDK Generator (openapi-sdkgen).")
     (license license:asl2.0)))
 
-(define-public go-github-com-igungor-gofakes3
-  (package
-    (name "go-github-com-igungor-gofakes3")
-    (version "0.0.18")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/igungor/gofakes3")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "136wvgz8d1982ns3vqqlvk3r7cbns7b0givwcrala562sd87yqka"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/igungor/gofakes3"))
-    (propagated-inputs
-     (list go-github-com-aws-aws-sdk-go
-           go-github-com-ryszard-goskiplist
-           go-github-com-shabbyrobe-gocovmerge
-           go-github-com-spf13-afero
-           go-go-etcd-io-bbolt
-           go-golang-org-x-tools
-           go-gopkg-in-mgo-v2))
-    (home-page "https://github.com/igungor/gofakes3")
-    (synopsis "Simple fake AWS S3 object storage")
-    (description
-     "AWS S3 fake server and testing library for extensive S3 test integrations.
-Either by running a test-server, e.g. for testing of AWS Lambda functions
-accessing S3.  Or, to have a simple and convencience S3 mock- and test-server.
-It's an alternative fork of @url{https://github.com/johannesboyne/gofakes3}.")
-    (license license:expat)))
-
 (define-public go-github-com-inetaf-tcpproxy
   (package
     (name "go-github-com-inetaf-tcpproxy")
@@ -9214,48 +9144,6 @@ described in @url{https://www.rfc-editor.org/rfc/rfc959,RFC 959}.")
 transforms one JSON document into another through a JMESPath expression.")
     (license license:asl2.0)))
 
-(define-public go-github-com-johannesboyne-gofakes3
-  (package
-    (name "go-github-com-johannesboyne-gofakes3")
-    (version "0.0.0-20260208201424-4c385a1f6a73")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/johannesboyne/gofakes3")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "14h4wrryrn4darp2vg2kyh2rwz0p93y99plv7lyql9i50h351895"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/johannesboyne/gofakes3"))
-    (native-inputs
-     (list go-github-com-stretchr-testify
-           go-go-shabbyrobe-org-gocovmerge))
-    (propagated-inputs
-     (list go-github-com-aws-aws-sdk-go-v2
-           go-github-com-aws-aws-sdk-go-v2-config
-           go-github-com-aws-aws-sdk-go-v2-credentials
-           go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
-           go-github-com-aws-aws-sdk-go-v2-service-s3
-           go-github-com-aws-smithy-go
-           go-github-com-cevatbarisyilmaz-ara
-           go-github-com-ryszard-goskiplist
-           go-github-com-spf13-afero
-           go-go-etcd-io-bbolt
-           go-golang-org-x-tools
-           go-gopkg-in-mgo-v2))
-    (home-page "https://github.com/johannesboyne/gofakes3")
-    (synopsis "Simple fake AWS S3 object storage")
-    (description
-     "AWS S3 fake server and testing library for extensive S3 test
-integrations.  Either by running a test-server, e.g. for testing of AWS Lambda
-functions accessing S3.  Or, to have a simple and convencience S3 mock- and
-test-server.")
-    (license license:expat)))
-
 (define-public go-github-com-jsimonetti-rtnetlink
   (package
     (name "go-github-com-jsimonetti-rtnetlink")

gnu/packages/golang-xyz.scm

@@ -16158,27 +16158,6 @@ in memory.  The library operates on channels and uses temporary disk storage
 to handle datasets larger than available RAM.")
     (license license:asl2.0)))
 
-;; For s5cmd@2.3.0, remove when a fresh version is released.
-(define-public go-github-com-lanrat-extsort-1.0.2
-  (hidden-package
-   (package
-     (inherit go-github-com-lanrat-extsort)
-     (name "go-github-com-lanrat-extsort")
-     (version "1.0.2")
-     (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/lanrat/extsort")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "0blsif4qzmmlqxhgc6dyl7rn9zws7mvlc6ckjj43cxlp517ravk8"))))
-     (arguments
-      (list
-       #:tests? #f
-       #:import-path "github.com/lanrat/extsort")))))
-
 (define-public go-github-com-layeh-gopher-luar
   (package
     (name "go-github-com-layeh-gopher-luar")
@@ -24828,34 +24807,6 @@ standard library.")
      "This package provides XOR bitwise code engine.")
     (license license:expat)))
 
-(define-public go-github-com-termie-go-shutil
-  (package
-    (name "go-github-com-termie-go-shutil")
-    (version "0.0.0-20140729215957-bcacb06fecae")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/termie/go-shutil")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0xwdx3qiqxm1bmlzqlf1cgdmrkmmahhdm2piikyhw8cbl3wdih82"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/termie/go-shutil"
-      #:test-flags
-      ;; shutil_test.go:101: open test/testfile3: permission denied
-      #~(list "-skip" "TestCopy")))
-    (home-page "https://github.com/termie/go-shutil")
-    (synopsis "Golang port of Python's shutil")
-    (description
-     "This package implements a direct port of a few of the functions from
-Python's @url{https://docs.python.org/3/library/shutil.html, shutil} package
-for high-level filesystem operations.")
-    (license license:expat)))
-
 (define-public go-github-com-texttheater-golang-levenshtein
   (package
     (name "go-github-com-texttheater-golang-levenshtein")
@@ -29400,57 +29351,6 @@ decimal arithmetic.")
     (description "Go library for ini files")
     (license license:asl2.0)))
 
-(define-public go-gopkg-in-mgo-v2
-  ;; XXX: Upstream note - UNMAINTAINED
-  ;; Suggested alternatives:
-  ;; - https://github.com/globalsign/mgo
-  ;;   Community supported fork of mgo.
-  ;; - https://github.com/coreos/bbolt
-  ;;   Single file in-memory document database for Go.
-  ;; - https://github.com/dgraph-io/badger
-  ;;   Fast in-memory document database for Go.
-  ;; - https://github.com/dgraph-io/dgraph
-  ;;   Distributed graph database on top of Badger.
-  ;; - https://github.com/lib/pq
-  ;;   PostgreSQL driver in pure Go.
-  (package
-    (name "go-gopkg-in-mgo-v2")
-    (version "2016.08.01")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/go-mgo/mgo")
-             (commit (string-append "r" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0rwbi1z63w43b0z9srm8m7iz1fdwx7bq7n2mz862d6liiaqa59jd"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "gopkg.in/mgo.v2"
-      #:test-flags
-      #~(list "-vet=off"
-              ;; Panic: runtime error: invalid memory address or nil pointer
-              ;; dereference (PC=0x47ADB1)
-              "-skip" "TestAll")
-    #:test-subdirs
-    ;; internal/sasl/sasl.go needs <sasl/sasl.h> header.
-    #~(list "internal/json/..."
-            "internal/scram/...")))
-    (native-inputs
-     (list go-gopkg-in-check-v1
-           go-gopkg-in-yaml-v2))
-    (propagated-inputs
-     (list go-gopkg-in-tomb-v2))
-    (home-page "https://labix.org/mgo")
-    (synopsis "Rich MongoDB driver for Go")
-    (description
-     "@command{mgo} (pronounced as mango) is a MongoDB driver for the Go
-language that implements a rich and well tested selection of features under a
-very simple API following standard Go idioms.")
-    (license license:expat)))
-
 (define-public go-gopkg-in-natefinch-lumberjack-v2
   (package
     (name "go-gopkg-in-natefinch-lumberjack-v2")
@@ -29518,25 +29418,6 @@ very simple API following standard Go idioms.")
 termination.")
     (license license:bsd-3)))
 
-(define-public go-gopkg-in-tomb-v2
-  (package
-    (inherit go-gopkg-in-tomb-v1)
-    (name "go-gopkg-in-tomb-v2")
-    (version "2.0.0-20161208151619-d5d1b5820637")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/go-tomb/tomb")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10"))))
-    (build-system go-build-system)
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:import-path _) "gopkg.in/tomb.v2")))))
-
 (define-public go-gopkg-in-validator-v2
   (package
     (name "go-gopkg-in-validator-v2")

gnu/packages/guile-xyz.scm

@@ -918,7 +918,7 @@ generate API documentation for GNU Guile projects.")
 (define-public guile-dotenv
   (package
    (name "guile-dotenv")
-   (version "0.3.1")
+   (version "0.2.1")
     (source
      (origin
        (method git-fetch)
@@ -927,7 +927,7 @@ generate API documentation for GNU Guile projects.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0j2m9nnjp7096gdy2b038p7wrx93hgw6i6rfy4gh9hkvk4q43b1m"))))
+        (base32 "1zgc9xwpz6w64rbndvl8c73lsx935byin921209acyw54j52g706"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -948,6 +948,7 @@ generate API documentation for GNU Guile projects.")
           pkg-config
           texinfo))
    (inputs (list guile-3.0))
+   (propagated-inputs (list nyacc))
    (synopsis "Read environment variables specifications from @code{.env} files")
    (description "This package provides a simple Guile interface to @code{.env}
 (or dotenv) files.  It implements parsing of files and setting environment
@@ -989,7 +990,8 @@ variables from them.")
                                              (assoc-ref inputs input)
                                              path))
                                           (list "guile-config"
-                                                "guile-dotenv"))))))
+                                                "guile-dotenv"
+                                                "nyacc"))))))
                       (bin (string-append (ungexp output) "/bin/")))
                  (wrap-program (string-append bin "dotenv")
                    (dep-path "GUILE_LOAD_PATH" site)
@@ -3939,7 +3941,7 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")))))))
      (list autoconf
            automake
            texinfo
-           gettext-minimal
+           gettext-minimal-0.23              ;for 'AC_LIB_LINKFLAGS_FROM_LIBS'
            guile-3.0
            pkg-config))
     (inputs

gnu/packages/guile.scm

@@ -4,7 +4,7 @@
 ;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org>
 ;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015, 2017 Christine Lemmer-Webber <cwebber@dustycloud.org>
-;;; Copyright © 2016, 2023, 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2023-2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
@@ -212,6 +212,10 @@ without requiring the source code to be rewritten.")
       ;; <https://bugs.gnu.org/20272>, which affects 2.0, 2.2, and 3.0 so far.
       #:parallel-build? #f
 
+      #:modules ((guix build gnu-build-system)
+                 (guix build utils)
+                 (ice-9 regex))
+
       #:phases
       (modify-phases %standard-phases
         ,@(if (system-hurd?)
@@ -236,22 +240,9 @@ without requiring the source code to be rewritten.")
         (add-before 'configure 'pre-configure
           (lambda* (#:key inputs #:allow-other-keys)
             ;; Tell (ice-9 popen) the file name of Bash.
-
-            ;; TODO: On the next rebuild cycle, unconditionally use
-            ;; 'search-input-file' instead of 'assoc-ref'.
-            (let ((bash (assoc-ref inputs "bash")))
-              (substitute* "module/ice-9/popen.scm"
-                ;; If bash is #f allow fallback for user to provide
-                ;; "bash" in PATH.  This happens when cross-building to
-                ;; MinGW for which we do not have Bash yet.
-                (("/bin/sh")
-                 ,(cond ((target-mingw?)
-                         "bash")
-                        ((%current-target-system)
-                         '(search-input-file inputs "/bin/bash"))
-                        (else
-                         '(string-append bash "/bin/bash")))))
-              #t)))
+            (substitute* "module/ice-9/popen.scm"
+              (("/bin/sh")
+               (search-input-file inputs "/bin/bash")))))
         (add-after 'install 'add-libxcrypt-reference-pkgconfig
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (define out (assoc-ref outputs "out"))
@@ -263,8 +254,26 @@ without requiring the source code to be rewritten.")
                   (find-files (string-append out "/lib/pkgconfig")
                               ".*\\.pc")
                 (("-lcrypt")
-                 (string-append "-L" libxcrypt " -lcrypt")))))))))
-
+                  (string-append "-L" libxcrypt " -lcrypt"))))))
+        ,@(if (target-mingw?)
+              '()
+              '((add-after 'install 'install-major.minor-symlinks
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (let* ((out (assoc-ref outputs "out"))
+                           (bin (in-vicinity out "bin"))
+                           (m (string-match
+                               ".*-([0-9]+[.][0-9]+)[.][0-9]+$" out))
+                           (effective-version (match:substring m 1)))
+                      (define (symlink-version name)
+                        (let ((name-version
+                               (string-append name "-" effective-version)))
+                          (symlink name (in-vicinity bin name-version))))
+                      (for-each symlink-version
+                                '("guild"
+                                  "guile"
+                                  "guile-config"
+                                  "guile-snarf"
+                                  "guile-tools"))))))))))
    (native-search-paths
     (list (search-path-specification
            (variable "GUILE_LOAD_PATH")
@@ -900,7 +909,7 @@ type system, elevating types to first-class status.")
 (define-public guile-git
   (package
     (name "guile-git")
-    (version "0.11.0")
+    (version "0.10.0")
     (home-page "https://gitlab.com/guile-git/guile-git.git")
     (source (origin
               (method git-fetch)
@@ -910,7 +919,7 @@ type system, elevating types to first-class status.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1yjyil6z4k80pjdps8v6h6lxikwxmjxvrslf2jrmq2rrfnajschz"))))
+                "01scznpg7356ygdlgn1f2892bwg6fsvp37hbmsk4gsg0g49aj4la"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags '("GUILE_AUTO_COMPILE=0")       ; to prevent guild warnings

gnu/packages/haskell.scm

@@ -1186,8 +1186,7 @@ interactive environment for the functional language Haskell.")
                  "https://www.haskell.org/ghc/dist/"
                  version "/" name "-" version "-testsuite.tar.xz"))
            (patches (search-patches "ghc-testsuite-dlopen-pie.patch"
-                                    "ghc-testsuite-grep-compat.patch"
-                                    "ghc-testsuite-recomp015-execstack.patch"))
+                                    "ghc-testsuite-grep-compat.patch"))
            (sha256
             (base32
              "0pw9r91g2np3i806g2f4f8z4jfdd7mx226cmdizk4swa7av1qf91"))
@@ -1241,7 +1240,14 @@ interactive environment for the functional language Haskell.")
                (substitute* "libraries/unix/tests/all.T"
                  (("^test\\('T8108'") "# guix skipped: test('T8108'"))
                (substitute* "libraries/unix/tests/libposix/all.T"
-                 (("^test\\('posix010'") "# guix skipped: test('posix010'"))))))))
+                 (("^test\\('posix010'") "# guix skipped: test('posix010'"))))
+           ;; binutils@2.39 warns for execstack deprecation by default, causing
+           ;; some tests to fail ; explicitely disable during linking instead.
+           (add-after 'unpack-testsuite 'fix-tests-with-binutils@2.39
+             (lambda _
+               (substitute* "testsuite/mk/test.mk"
+                 (("^TEST_HC_OPTS = ")
+                  "TEST_HC_OPTS = -optl -Wl,-z,noexecstack "))))))))
     (native-search-paths (list (search-path-specification
                                 (variable "GHC_PACKAGE_PATH")
                                 (files (list
@@ -1269,8 +1275,7 @@ interactive environment for the functional language Haskell.")
                  "https://www.haskell.org/ghc/dist/"
                  version "/ghc-" version "-testsuite.tar.xz"))
            (patches (search-patches "ghc-testsuite-dlopen-pie.patch"
-                                    "ghc-testsuite-grep-compat.patch"
-                                    "ghc-testsuite-recomp015-execstack.patch"))
+                                    "ghc-testsuite-grep-compat.patch"))
            (sha256
             (base32
              "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z"))
@@ -1329,8 +1334,7 @@ interactive environment for the functional language Haskell.")
                  "https://www.haskell.org/ghc/dist/"
                  version "/ghc-" version "-testsuite.tar.xz"))
            (patches (search-patches "ghc-testsuite-dlopen-pie.patch"
-                                    "ghc-testsuite-grep-compat.patch"
-                                    "ghc-testsuite-recomp015-execstack.patch"))
+                                    "ghc-testsuite-grep-compat.patch"))
            (sha256
             (base32
              "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz"))
@@ -1525,8 +1529,7 @@ interactive environment for the functional language Haskell.")
            (sha256
             (base32
              "1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s"))
-           (patches (search-patches "ghc-9.2-grep-warnings.patch"
-                                    "ghc-testsuite-recomp015-execstack.patch"))
+           (patches (search-patches "ghc-9.2-grep-warnings.patch"))
            (modules '((guix build utils)))
            (snippet
             ;; collections.Iterable was moved to collections.abc in Python 3.10.
@@ -1612,8 +1615,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
              (sha256
               (base32
                "0cmmwhcwv9fjzvmgjj85d354858qqbmqfzaz5160xqj4yl9zk225"))
-             (patches (search-patches "ghc-9.2-grep-warnings.patch"
-                                      "ghc-testsuite-recomp015-execstack.patch"))))
+             (patches (search-patches "ghc-9.2-grep-warnings.patch"))))
          ,@(filter (match-lambda
                      (("ghc-bootstrap" . _) #f)
                      (("ghc-testsuite" . _) #f)
@@ -1722,8 +1724,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
                     version "/ghc-" version "-testsuite.tar.xz"))
              (sha256
               (base32
-               "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3"))
-             (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))))
+               "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3"))))
          ("ghc-alex" ,ghc-alex-bootstrap-for-9.4)
          ("ghc-happy" ,ghc-happy-bootstrap-for-9.4)
          ,@(filter (match-lambda

gnu/packages/hurd.scm

@@ -246,23 +246,28 @@ Library, Parted and netdde for GNU/Hurd.")
     (source #f)
     (build-system trivial-build-system)
     (arguments
-     '(#:modules ((guix build union))
-       #:builder (begin
-                   (use-modules (srfi srfi-1)
-                                (srfi srfi-26)
-                                (ice-9 match)
-                                (guix build union))
-                   (let ((inputs (filter
-                                  (compose (cute member <> '("gnumach-headers"
-                                                             "hurd-headers"
-                                                             "hurd-minimal"))
-                                           car)
-                                  %build-inputs)))
-                     (match inputs
-                       (((names . directories) ...)
-                        (union-build (assoc-ref %outputs "out")
-                                     directories)
-                        #t))))))
+     '(#:modules ((guix build union)
+                  (guix build utils))
+       #:builder
+       (begin
+         (use-modules (srfi srfi-1)
+                      (ice-9 match)
+                      (guix build union)
+                      (guix build utils))
+
+         (union-build (assoc-ref %outputs "out")
+                      (filter-map
+                       (match-lambda
+                         ((label . input)
+                          (and (or (directory-exists?
+                                    (string-append input "/include/mach"))
+                                   (directory-exists?
+                                    (string-append input "/include/hurd")))
+                               ;; Avoid libc libraries.
+                               (not (file-exists?
+                                     (string-append input "/include/locale.h")))
+                               input)))
+                       %build-inputs)))))
     (inputs (list gnumach-headers hurd-headers hurd-minimal))
     (supported-systems %hurd-systems)
     (synopsis "Union of the Hurd headers and libraries")

gnu/packages/image-viewers.scm

@@ -96,7 +96,6 @@
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages graphics)
-  #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages image-processing)
   #:use-module (gnu packages imagemagick)
@@ -117,7 +116,6 @@
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
-  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages suckless)
   #:use-module (gnu packages stb)
   #:use-module (gnu packages terminals)
@@ -1053,67 +1051,6 @@ synchronization of multiple instances.")
     (home-page "https://nomacs.org/")
     (license license:gpl3+)))
 
-(define-public timg
-  (package
-    (name "timg")
-    (version "1.6.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/hzeller/timg")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0xr3g6my2n9ry5mqiw1qvf7m0lpmj20h2xsnh75653ha83wqxmhm"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Remove bundled sources
-        #~(begin
-            (delete-file-recursively "third_party") #t))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:configure-flags
-      #~'("-Wno-dev" "-DWITH_OPENSLIDE_SUPPORT=ON")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'fix-stb-path
-            ;; This package expects stb-image to be at stb/stb_image.h, but
-            ;; Guix puts it at stb_image.h instead
-            (lambda _
-              (substitute* "src/CMakeLists.txt"
-                (("stb/stb")
-                 "stb"))
-              (substitute* "src/stb-image-source.cc"
-                (("#include \"stb/stb_image.h\"")
-                 "#include \"stb_image.h\"")))))
-      #:tests? #f)) ;No tests
-    (inputs (list cairo
-                  ffmpeg
-                  graphicsmagick
-                  libdeflate
-                  libdicom
-                  libexif
-                  libjpeg-turbo
-                  librsvg
-                  libsixel
-                  libxml2
-                  openjpeg
-                  openslide
-                  poppler
-                  qoi
-                  sqlite
-                  stb-image))
-    (native-inputs (list git pandoc pkg-config))
-    (home-page "https://timg.sh/")
-    (synopsis "Terminal image and video viewer")
-    (description
-     "This package provides a user-friendly terminal image viewer that uses
-graphic capabilities of terminals (Sixel, Kitty or iterm2), or 24-Bit color
-capabilities and unicode character blocks if these are not available.")
-    (license license:gpl2)))
-
 (define-public xzgv
   (package
     (name "xzgv")

gnu/packages/image.scm

@@ -74,7 +74,6 @@
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages datastructures)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -107,7 +106,6 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages ragel)
   #:use-module (gnu packages sphinx)
-  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages video)
@@ -247,29 +245,6 @@ code is Valgrind-clean and unit tested.")
     (home-page "https://sourceforge.net/projects/iqa/")
     (license license:bsd-4)))
 
-(define-public libdicom
-  (package
-    (name "libdicom")
-    (version "1.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ImagingDataCommons/libdicom")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0l1z8riv7lrw65nswq8lvyvnxn5vc06gydwc96gj3ywb1gcqv831"))))
-    (build-system meson-build-system)
-    (inputs (list check uthash))
-    (native-inputs (list pkg-config))
-    (home-page "https://github.com/ImagingDataCommons/libdicom")
-    (synopsis "C library for reading DICOM files")
-    (description
-     "This package is a C library and a set of command-line tools for reading
-DICOM WSI files.")
-    (license license:expat)))
-
 (define-public libpng
   (package
    (name "libpng")
@@ -1134,41 +1109,6 @@ JPEG 2000 Reference Software.")
     (home-page "https://github.com/uclouvain/openjpeg")
     (license license:bsd-2)))
 
-(define-public openslide
-  (package
-    (name "openslide")
-    (version "4.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/openslide/openslide")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "00gc530g0lxm2lhwq249w97021w1v1y9ybqs2z5l1z922s15rhl2"))))
-    (build-system meson-build-system)
-    (inputs (list cairo
-                  gdk-pixbuf
-                  glib
-                  libdicom
-                  libjpeg-turbo
-                  libpng
-                  libtiff
-                  libxml2
-                  openjpeg
-                  sqlite
-                  zlib
-                  zstd))
-    (native-inputs (list pkg-config))
-    (home-page "https://openslide.org/")
-    (synopsis "C library for reading slide image files")
-    (description
-     "OpenSlide is a C library for reading whole slide image files (also known
-as virtual slides).  It provides a consistent and simple API for reading files
-from multiple vendors.")
-    (license license:lgpl2.1)))
-
 (define-public giflib
   (package
     (name "giflib")
@@ -2028,34 +1968,6 @@ possible, all formats supported by the PNG standard are represented.")
 use, copy, modify and distribute these images for any purpose and without fee
 is hereby granted."))))
 
-(define-public qoi
-  (let ((commit "6fff9b70dd79b12f808b0acc5cb44fde9998725e")
-        (revision "0"))
-    (package
-      (name "qoi")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/phoboslab/qoi")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "078zasncyylgnwx6br82nkjssl82wygz6fh8zm65fbfpadzfa3x7"))))
-      (build-system copy-build-system)
-      (arguments
-       (list
-        #:install-plan
-        #~'(("qoi.h" "include/"))
-        #:tests? #f)) ;No tests
-      (home-page "https://qoiformat.org")
-      (synopsis "Library for the QOI image format")
-      (description
-       "This package provides a library for the QOI image format, offering
-fast, lossless image compression.")
-      (license license:expat))))
-
 (define-public libjpeg-turbo
   (package
     (name "libjpeg-turbo")

gnu/packages/irc.scm

@@ -14,7 +14,7 @@
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2023, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2024 Christian Miller <christian.miller@dadoes.de>
 ;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
@@ -348,7 +348,7 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
 (define-public weechat
   (package
     (name "weechat")
-    (version "4.9.0")
+    (version "4.8.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -357,7 +357,7 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1pwayhpnyd6nq1sph4hqi43xwqgq6vj6fr8q0xqn0jx5zzjlyx8c"))))
+                "06lmbd27fdj7z7v6m096csswp73354516z64apfyz8lr5kh140wq"))))
     (build-system cmake-build-system)
     (outputs '("out" "doc"))
     (native-inputs
@@ -393,13 +393,12 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
            #~(modify-phases %standard-phases
                #$@(if (target-x86?)
                       #~((add-after 'install 'move-doc
-                           (lambda _
-                             (let ((from (string-append #$output
-                                                        "/share/doc/weechat"))
-                                   (to (string-append #$output:doc
-                                                      "/share/doc/weechat")))
-                               (mkdir-p (string-append #$output:doc
-                                                       "/share/doc"))
+                           (lambda* (#:key outputs #:allow-other-keys)
+                             (let* ((out (assoc-ref outputs "out"))
+                                    (doc (assoc-ref outputs "doc"))
+                                    (from (string-append out "/share/doc/weechat"))
+                                    (to (string-append doc "/share/doc/weechat")))
+                               (mkdir-p (string-append doc "/share/doc"))
                                (rename-file from to)))))
                       #~()))))
     (synopsis "Extensible chat client")

gnu/packages/kde-pim.scm

@@ -5,7 +5,7 @@
 ;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2023-2026 Sughosha <sughosha@disroot.org>
+;;; Copyright © 2023-2025 Sughosha <sughosha@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -70,7 +70,6 @@
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages video)
   #:use-module (gnu packages wget)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml))
@@ -2105,83 +2104,6 @@ information in non-ASCII character sets.")
 application \"Parts\" to be embedded as a Kontact component (or plugin).")
     (license license:lgpl2.0+)))
 
-(define-public kalarm
-  (package
-    (name "kalarm")
-    (version "25.12.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://kde/stable/release-service/" version
-                           "/src/kalarm-" version ".tar.xz"))
-       (sha256
-        (base32 "0g8frgnpzbr2npx7i28271yfcv7yqx4h6bzmkgxip1chhycjwps5"))))
-    (build-system qt-build-system)
-    (arguments
-     (list #:qtbase qtbase
-           ;; There are only 2 tests, kadatetimetest and kaeventtest, which
-           ;; fail due to be unable to determine system time zone.
-           #:tests? #f
-           #:configure-flags
-           #~(list "-DENABLE_LIBVLC=OFF"))) ;Use only mpv
-    (native-inputs
-     (list extra-cmake-modules kdoctools pkg-config))
-    (inputs
-     (list akonadi
-           akonadi-contacts
-           akonadi-mime
-           grantleetheme
-           kauth
-           kcalendarcore
-           kcalutils
-           kcodecs
-           kcompletion
-           kconfig
-           kconfigwidgets
-           kcontacts
-           kcrash
-           kdbusaddons
-           kglobalaccel
-           kguiaddons
-           kholidays
-           ki18n
-           kiconthemes
-           kidentitymanagement
-           kio
-           kitemmodels
-           kitemviews
-           kjobwidgets
-           kmailtransport
-           kmime
-           knotifications
-           knotifyconfig
-           kpimtextedit
-           kservice
-           kstatusnotifieritem
-           ktextaddons
-           ktextwidgets
-           kwidgetsaddons
-           kwindowsystem
-           kxmlgui
-           mpv))
-    (home-page "https://apps.kde.org/kalarm/")
-    (synopsis "Alarm manager for KDE")
-    (description "Kalarm is a personal alarm message, command and email
-scheduler application for KDE.
-
-It features:
-@itemize
-@item displaying alarms using your own text message, the text generated by a
- command, or a text or image file,
-@item audible alarm using a sound file,
-@item recurring alarm on an hours/minutes, daily, weekly, monthly or annual
- basis, or set it to trigger every time you log in,
-@item display alarms color and font customization, and
-@item support for multiple alarm calendars, which for example enables you to
- share alarms between a laptop and desktop computer.
-@end itemize")
-    (license license:gpl2+)))
-
 (define-public korganizer
   (package
     (name "korganizer")

gnu/packages/kde-plasma.scm

@@ -2426,7 +2426,6 @@ integration of Qt applications when running on a KDE Plasma workspace.")
                   knotifications
                   kirigami
                   libplasma
-                  lz4
                   mobile-broadband-provider-info
                   modemmanager-qt
                   network-manager
@@ -2440,7 +2439,6 @@ integration of Qt applications when running on a KDE Plasma workspace.")
                   ksvg
                   qcoro-qt6
                   openconnect
-                  qtwebengine
                   qtdeclarative))
     (synopsis "Plasma applet for managing network connections")
     (description "This package provides Plasma applet for managing network

gnu/packages/language.scm

@@ -282,18 +282,16 @@ Random Cage Fighting Birds, Cool Music etc.")
 (define-public libchewing
   (package
     (name "libchewing")
-    (version "0.11.0")
+    (version "0.9.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/chewing/libchewing")
-             (commit (string-append "v" version))
-             ;; Also libchewing-data
-             (recursive? #t)))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "08734i3xyq3wv5vimki7cz438v56ywk3x3assgfjlrngj1ijw0y8"))))
+        (base32 "0gh64wvrk5pn0fhmpvj1j99d5g7f7697rk96zbkc8l72yjr819z5"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -877,7 +875,7 @@ noun phrases, verb phrases, etc.).")
 (define-public praat
   (package
     (name "praat")
-    (version "6.4.62")
+    (version "6.4.61")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -886,7 +884,7 @@ noun phrases, verb phrases, etc.).")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0jplas35yrhh1csdiw2mim4cgmj5iz5c3b87908smd0r528v75a6"))))
+                "0lxg0h07cgz5fjhpsihvf8dk6g03fp4a7ar8x70pm2s5lbfr1amy"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags #~(list (string-append "CC="

gnu/packages/lean.scm

@@ -70,7 +70,7 @@
            python-wrapper
            tzdata-for-tests))
     (inputs
-     (list cadical-2.1 gmp libuv llvm))
+     (list cadical gmp libuv llvm))
     (arguments
      (list
       #:make-flags

gnu/packages/libevent.scm

@@ -164,14 +164,14 @@ resolution, asynchronous file system operations, and threading primitives.")
   (package
     (inherit libuv)
     (name "libuv")
-    (version "1.51.0")
+    (version "1.49.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://dist.libuv.org/dist/v" version
                                   "/libuv-v" version ".tar.gz"))
               (sha256
                (base32
-                "1szqivvs7izbhw1a3nd1ipbk012yvqqkjg0sjmqxw1hi1fwmf1az"))))
+                "1a75p8wp4l43y2ffj1szs1ssm6nzjad7k51bqi2r04ngs9mp044c"))))
     (properties '((hidden? . #t)))))
 
 (define-public libuv-for-r-httpuv

gnu/packages/libsigsegv.scm

@@ -27,14 +27,14 @@
 (define-public libsigsegv
   (package
    (name "libsigsegv")
-   (version "2.14")
+   (version "2.15")
    (source (origin
             (method url-fetch)
             (uri (string-append
                   "mirror://gnu/libsigsegv/libsigsegv-"
                   version ".tar.gz"))
             (sha256
-             (base32 "15d2r831xz94s7540nvb1gbfl062g7mrnj88m60wyr1kh10kkb6d"))))
+             (base32 "1n992y64ni16bv9lijxsa5h87rscfvk01z4hl4bkijr509k5as03"))))
    (build-system gnu-build-system)
    (home-page "https://www.gnu.org/software/libsigsegv/")
    (synopsis "Library for handling page faults")

gnu/packages/libunistring.scm

@@ -36,7 +36,7 @@
 (define-public libunistring
   (package
    (name "libunistring")
-   (version "1.3")
+   (version "1.4.1")
    (source (origin
             (method url-fetch)
             (uri (string-append
@@ -44,7 +44,7 @@
                   version ".tar.xz"))
             (sha256
              (base32
-              "09wmas38i9fw7l3sv92xkbvy7idcl76ifhzv7l7ia98xhdn7higj"))))
+              "0qvp61m14xi9kx2gg44rjnq1g8h2g33ni23q0ccqc9r5i4q89n37"))))
    (propagated-inputs (libiconv-if-needed))
    (outputs '("out" "static"))
    (build-system gnu-build-system)
@@ -69,6 +69,14 @@
                           (("# define WIN32_LEAN_AND_MEAN" all)
                            (string-append "#define nanosleep nanosleep_native\n"
                                           all))))))
+                 #~())
+          #$@(if (string=? "riscv64-linux" (%current-system))
+                 ;; Unmodified test-lock will fail or crash riscv64
+                 #~((add-before 'check 'modify-test-lock
+                      (lambda _
+                        (substitute* "tests/test-lock.c"
+                          (("#define DO_TEST_RWLOCK 1")
+                           "#define DO_TEST_RWLOCK 0")))))
                  #~()))))
    (synopsis "C library for manipulating Unicode strings")
    (description

gnu/packages/linux.scm

@@ -531,7 +531,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; The current "stable" kernels. That is, the most recently released major
 ;; versions that are still supported upstream.
 
-(define-public linux-libre-6.19-version "6.19.10")
+(define-public linux-libre-6.19-version "6.19.9")
 (define-public linux-libre-6.19-gnu-revision "gnu")
 (define deblob-scripts-6.19
   (linux-libre-deblob-scripts
@@ -541,12 +541,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "05jpciyypvmy6byaxjl49b1fvzxcnlhknf0xabrdj5152iznrzkh")))
 (define-public linux-libre-6.19-pristine-source
   (let ((version linux-libre-6.19-version)
-        (hash (base32 "072s76238rnf87yhdy15nbxfyq7x3ch7p2v14dq4pq551qd48va6")))
+        (hash (base32 "1gsmklhqpx5k9wca3gr8j439q8khr9byy7ivxqyr9qqjmyinhq61")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.19)))
 
-(define-public linux-libre-6.18-version "6.18.20")
+(define-public linux-libre-6.18-version "6.18.19")
 (define-public linux-libre-6.18-gnu-revision "gnu")
 (define deblob-scripts-6.18
   (linux-libre-deblob-scripts
@@ -556,7 +556,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "0qlih8w8wg4v5cwbmd34rbhb6mjgbx69i9rx3s2vxw7h42q9l0ai")))
 (define-public linux-libre-6.18-pristine-source
   (let ((version linux-libre-6.18-version)
-        (hash (base32 "0lrm76rdlr92kjq3g410qdff9v49mpdf400lmsh7hq74k2ymlyl3")))
+        (hash (base32 "0309xd8ifsy9pa19s8qnsyxkmcqq4z3p16jckjnnhz6h3hkpibza")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.18)))
@@ -565,47 +565,47 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; Here are the support timelines:
 ;; <https://www.kernel.org/category/releases.html>
 
-(define-public linux-libre-6.12-version "6.12.79")
+(define-public linux-libre-6.12-version "6.12.77")
 (define-public linux-libre-6.12-gnu-revision "gnu")
 (define deblob-scripts-6.12
   (linux-libre-deblob-scripts
    linux-libre-6.12-version
    linux-libre-6.12-gnu-revision
    (base32 "168aykyvyyp34549hqhlprl0n052q8wdb2y3vyxqw40wpf2vw3ln")
-   (base32 "1x48hpmvajz7v5wn1vdd7l5r14mq4ngzh5npz3pj81z4f1g61i0a")))
+   (base32 "1v6glxf94p9z0yq5m102jwcpyh6anpbp3h8wwff9hxlfy2wdlzzk")))
 (define-public linux-libre-6.12-pristine-source
   (let ((version linux-libre-6.12-version)
-        (hash (base32 "02vrl0m5iw4jiyhpcni2l8kcfzq279s69yagrdz5sany6cgpbyjb")))
+        (hash (base32 "0rzz5hdixa5xmr99gja3xr9nxgpmrpxyg4llmvkl3vyawpmkd21m")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.12)))
 
-(define-public linux-libre-6.6-version "6.6.130")
+(define-public linux-libre-6.6-version "6.6.129")
 (define-public linux-libre-6.6-gnu-revision "gnu")
 (define deblob-scripts-6.6
   (linux-libre-deblob-scripts
    linux-libre-6.6-version
    linux-libre-6.6-gnu-revision
    (base32 "0y3lawljby2rl0mb0yjdyaasci4pl935y8xa0dnmbzff23knkxlw")
-   (base32 "0xp9b2vkrb0g0rn4i33b59rhp4sgh1dbwzk28vwz7kwac6l5rcpi")))
+   (base32 "0z47f6mkllk1fgpq04x73djl5gh3mj50bxj2rpg4jlzm0rcirrag")))
 (define-public linux-libre-6.6-pristine-source
   (let ((version linux-libre-6.6-version)
-        (hash (base32 "139480lyi3if8pd2j3yld5a01lk7113kbcn2kxpzyk29p5kslq14")))
+        (hash (base32 "12j42awg44w97zq8fzifpm300jm9q9ya7qkpn7xbnkr2480qz86a")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.6)))
 
-(define-public linux-libre-6.1-version "6.1.167")
+(define-public linux-libre-6.1-version "6.1.166")
 (define-public linux-libre-6.1-gnu-revision "gnu")
 (define deblob-scripts-6.1
   (linux-libre-deblob-scripts
    linux-libre-6.1-version
    linux-libre-6.1-gnu-revision
    (base32 "10gcbkd5jxfspa712kvb3qmsjgsapd9cz47pmpfk03bbfzf8ydlv")
-   (base32 "1w5pfws6l39dpc3lzazs1n6r4m96f6rdf6vb2scy5fhmrd933ldc")))
+   (base32 "1jiwwl5sgpc16x0v6phbknv94mc46gvwgc2z8s4pdgn4j54yrd8v")))
 (define-public linux-libre-6.1-pristine-source
   (let ((version linux-libre-6.1-version)
-        (hash (base32 "1jwqwp2fg3wdsh9w663rbnbv1rvsvksv1pj4bzns8swp0wy0a618")))
+        (hash (base32 "0jcl12gjlfdf9pwqg1m84rzwnrj3grxxgk5blrq8zlaq45sgr3c1")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.1)))
@@ -2690,7 +2690,7 @@ and should be used with caution, especially on untested models.")
 (define-public corefreq
   (package
     (name "corefreq")
-    (version "2.1.0")
+    (version "1.98.4")
     (source
      (origin
        (method git-fetch)
@@ -2699,7 +2699,7 @@ and should be used with caution, especially on untested models.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "054rnrwvkbfmy2maxjk928fh1p346313ixhkbjwcq7qjz3idjixl"))))
+        (base32 "0mxp5h23y09674syaj5gpdifr53zvgjv7g7hargwg6897883qfln"))))
     ;; The upstream Makefile is now such a proprietary mess that standard builds
     ;; as performed by our linux-module-build-system are more or less impossible
     ;; without heavy patching.  However, we still keep it as the main build
@@ -2731,12 +2731,14 @@ and should be used with caution, especially on untested models.")
                         (string-append = dir "\n"))
                        (("^([[:space:]]+)(.* modules_install.*)"
                          _ indent command)
-                        (string-append indent "echo skipping " command))))))
+                        (string-append indent "@echo skipping " command))))))
                (add-before 'build 'prepare
-                 (lambda* (#:key source-directory #:allow-other-keys)
+                 (lambda* (#:key source-directory make-flags #:allow-other-keys)
                    ;; Lazily fix another mismatch between what the kernel module
                    ;; build system expects and what this package provides.
-                   (symlink "source/build" source-directory)))
+                   (symlink "source/build" source-directory) ;$(BUILD)
+                   ;; Set up symbolic links inside $(BUILD), for some reason.
+                   (apply invoke "make" "prepare" make-flags)))
                (replace 'build (assoc-ref gnu:%standard-phases 'build))
                (add-before 'install 'resolve-symlink
                  ;; The build system silently fails to install from a symlink.
@@ -6019,7 +6021,7 @@ devices that can inject events directly into the input subsystem.")
 (define-public interception-dual-function-keys
   (package
     (name "interception-dual-function-keys")
-    (version "1.5.0")
+    (version "1.4.0")
     (home-page "https://gitlab.com/interception/linux/plugins/dual-function-keys")
     (source (origin
               (method git-fetch)
@@ -6029,7 +6031,7 @@ devices that can inject events directly into the input subsystem.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "17jc02wh45yk427qryb0ydyim16607i31wyghbsahahd6mrh9ylv"))))
+                "0s49vbg3j4rwh78i8rx8qr7myql09p7b3lhrjl0p7dd98xp6ann6"))))
     (build-system gnu-build-system)
     (inputs
      (list libevdev yaml-cpp))
@@ -11009,28 +11011,30 @@ compatible with Python's ConfigParser style of .INI files, including RFC
     (license license:bsd-3)))
 
 (define-public simpleini
-  (package
-    (name "simpleini")
-    (version "4.25")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/brofield/simpleini")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1v9s0kr5ca1gdbnlkdz7chzypy0wz95f09l0r6jnmff4qy6db56l"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list #:configure-flags #~(list "-DSIMPLEINI_USE_SYSTEM_GTEST=ON")))
-    (native-inputs (list googletest))
-    (home-page "https://github.com/brofield/simpleini")
-    (synopsis "Simple API to read and write INI-style files")
-    (description
-     "SimpleIni provides a simple API to read and write INI-style
+  (let ((commit "6048871ea9ee0ec24be5bd099d161a10567d7dc2")
+        (revision "1"))
+    (package
+      (name "simpleini")
+      (version (git-version "4.22" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/brofield/simpleini")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1szaflnrzw1zx9v5g6mbbiaf9wfglp4n4jjq2793k9ryz3qxil9j"))))
+      (build-system cmake-build-system)
+      (arguments
+       (list #:configure-flags #~(list "-DSIMPLEINI_USE_SYSTEM_GTEST=ON")))
+      (native-inputs (list googletest))
+      (home-page "https://github.com/brofield/simpleini")
+      (synopsis "Simple API to read and write INI-style files")
+      (description
+       "SimpleIni provides a simple API to read and write INI-style
 configuration files.  It supports data files in ASCII, MBCS and Unicode.")
-    (license license:expat)))
+      (license license:expat))))
 
 (define-public xfsprogs
   (package

gnu/packages/lisp.scm

@@ -495,7 +495,7 @@ interface.")
     (build-system trivial-build-system)
     (native-inputs
      `(("config-patch" ,@(search-patches "cl-asdf-config-directories.patch"))
-       ("patch" ,patch/pinned)))
+       ("patch" ,patch)))
     (arguments
      `(#:modules ((guix build utils)
                   (guix build lisp-utils))

gnu/packages/llvm.scm

@@ -1412,11 +1412,7 @@ Library.")
      (substitute-keyword-arguments arguments
        ((#:configure-flags flags)
         #~(append #$flags
-                  (list #$(string-append
-                           "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86"
-                           (if (string=? "X86" (system->llvm-target))
-                               ""
-                               (string-append ";" (system->llvm-target))))
+                  (list "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86"
                         "-DLLVM_VERSION_SUFFIX=")))))
     (properties `((hidden? . #t)
                   ,@(package-properties llvm-base)))

gnu/packages/lua.scm

@@ -26,7 +26,6 @@
 ;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Aaron Boyd <aaron.boyd.org@gmail.com>
-;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1202,105 +1201,6 @@ on numbers.")
 (define-public lua5.1-bitop
   (make-lua-bitop "lua5.1-bitop" lua-5.1))
 
-(define (make-lua-djot name lua)
-  (package
-    (name name)
-    (version "0.2.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/jgm/djot.lua")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256 (base32 "0kivx4yyj2zhj23d93h5rr0ab7gkazd3z7r7aqv1bgmigcw47pj2"))
-       (modules '((guix build utils)))
-       (snippet #~(begin
-                    (delete-file-recursively "clib")
-                    (delete-file-recursively "doc/api")
-                    (delete-file "doc/djot.1")))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-makefile
-            (lambda _
-              (substitute* "Makefile"
-                (("^all: .*") "all:\n"))))
-          (delete 'configure)
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "lua" "test.lua"))))
-          (replace 'install
-            (lambda _
-              (let ((lua-path
-                     (string-append
-                      #$output
-                      "/share/lua/"
-                      #$(version-major+minor (package-version lua)))))
-                (install-file "djot.lua" lua-path)
-                (copy-recursively "djot" (string-append lua-path "/djot"))))))))
-    (native-inputs (list lua))
-    (home-page "https://github.com/jgm/djot.lua")
-    (synopsis "Lua parser for the djot light markup language")
-    (description
-     "This package provides a Lua parser for djot, a light markup syntax.
-It can produce an AST, rendered HTML, or a stream of match tokens
-that identify elements by source position, which could be used
-for syntax highlighting or a linting tool.")
-    (license license:expat)))
-
-(define-public lua5.4-djot
-  (make-lua-djot "lua5.4-djot" lua-5.4))
-
-(define-public lua-djot
-  (make-lua-djot "lua-djot" lua))
-
-(define-public lua5.2-djot
-  (make-lua-djot "lua5.2-djot" lua-5.2))
-
-(define-public lua5.1-djot
-  (make-lua-djot "lua5.1-djot" lua-5.1))
-
-(define-public djot
-  (package
-    (inherit lua5.1-djot)
-    (name "djot")
-    (arguments
-     (substitute-keyword-arguments (package-arguments lua5.1-djot)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (replace 'patch-makefile
-              (lambda _
-                (substitute* "Makefile"
-                  (("^all: .*") "all: doc/djot.1\n"))))
-            (replace 'check
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  (invoke "luajit" "test.lua"))))
-            (add-after 'install 'install-bin-and-man
-              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((out-lua (string-append #$output "/share/lua/5.1"))
-                      (out-bin (string-append #$output "/bin/djot")))
-                  (copy-file "bin/main.lua" "bin/djot")
-                  (substitute* "bin/djot"
-                    (("^local djot = require" all)
-                     (string-append
-                      "#!"
-                      (search-input-file inputs "bin/luajit")
-                      "\n"
-                      all)))
-                  (install-file "bin/djot" (string-append #$output "/bin"))
-                  (chmod out-bin #o755)
-                  (wrap-program out-bin
-                    `("GUIX_LUA_PATH" ";" = (,out-lua))))
-                (install-file "doc/djot.1"
-                              (string-append #$output "/share/man/man1"))))))))
-    (native-inputs (list pandoc))
-    (inputs (list luajit))))
-
 (define-public lutok
   (package
     (name "lutok")

gnu/packages/m4.scm

@@ -30,14 +30,14 @@
 (define-public m4
   (package
    (name "m4")
-   (version "1.4.19")
+   (version "1.4.20")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/m4/m4-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "15mghcksh11saylpm86h1zkz4in0rbi0pk8i6nqxkdikdmfdxbk3"))))
+              "0axgilr6n88br7msm3ls8m4zlwgk4q3vcjqw1cknqpyg3hxfldp2"))))
    (build-system gnu-build-system)
    (arguments
     `(;; Explicitly disable tests when cross-compiling, otherwise 'make check'

gnu/packages/mail.scm

@@ -67,7 +67,6 @@
 ;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2026 Sergey Trofimov <sarg@sarg.org.ru>
-;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -94,7 +93,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 c)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages check)
@@ -769,7 +767,7 @@ operating systems.")
 (define-public neomutt
   (package
     (name "neomutt")
-    (version "20260105")
+    (version "20250404")
     (source
      (origin
        (method git-fetch)
@@ -778,21 +776,8 @@ operating systems.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1sg6ifabci7xyp3zds1w906vx6jsmyjlfr6bqld7m7hj07by9ndd"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet
-        #~(begin
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but "autosetup"
-              "mutt-gettext.tcl"
-              "mutt-iconv.tcl")))))
+        (base32
+          "1w53g6l98cd3x2a6m0q245fm5gln95vzpgskvg4dz9yysmbki9az"))))
     (build-system gnu-build-system)
     (inputs
      (list cyrus-sasl
@@ -808,19 +793,19 @@ operating systems.")
            libxml2
            lmdb
            notmuch
-           sqlite
            `(,zstd "lib")))
     (native-inputs
      `(("automake" ,automake)
-       ("autosetup" ,autosetup)
        ("gettext-minimal" ,gettext-minimal)
        ("pkg-config" ,pkg-config)
        ("docbook-xsl" ,docbook-xsl)
        ("docbook-xml" ,docbook-xml-4.2)
        ("w3m" ,w3m)
+       ("tcl" ,tcl)
+
        ;; Test file data for the unit tests included in the neomutt source.
        ("neomutt-test-files"
-        ,(let ((commit "c769cdefd45bcdfc4a72664821bd7f67ad4d5f6c"))
+        ,(let ((commit "8629adab700a75c54e8e28bf05ad092503a98f75"))
            (origin
              (method git-fetch)
              (uri (git-reference
@@ -829,62 +814,69 @@ operating systems.")
              (file-name (git-file-name "neomutt-test-files" commit))
              (sha256
               (base32
-               "0jvy9z2hmpvcxa10k7f68l2lqdxrppj36c4v8nmjrldkwgpkdaq3")))))))
+                "1ci04nqkab9mh60zzm66sd6mhsr6lya8wp92njpbvafc86vvwdlr")))))))
     (arguments
-     (list
-      #:test-target "test"
-      #:configure-flags
-      #~(list "--enable-autocrypt"
-              "--gpgme"
-              ;; Database, implies header caching.
-              "--disable-tokyocabinet"
-              "--disable-qdbm"
-              "--disable-bdb"
-              "--lmdb"
-              "--kyotocabinet"
+     `(#:test-target "test"
+       #:configure-flags
+       (list "--gpgme"
 
-              "--gdbm"
+             ;; Database, implies header caching.
+             "--disable-tokyocabinet"
+             "--disable-qdbm"
+             "--disable-bdb"
+             "--lmdb"
+             "--kyotocabinet"
 
-              "--gnutls"
-              "--sasl"
-              (string-append "--with-sasl="
-                             #$(this-package-input "cyrus-sasl"))
+             "--gdbm"
 
-              "--smime"
-              "--notmuch"
-              (string-append "--with-notmuch="
-                             #$(this-package-input "notmuch"))
+             "--gnutls"
+             "--ssl=1"
+             "--sasl"
+             (string-append "--with-sasl="
+                            (assoc-ref %build-inputs "cyrus-sasl"))
 
-              "--idn2"
+             "--smime"
+             "--notmuch"
+             (string-append "--with-notmuch="
+                            (assoc-ref %build-inputs "notmuch"))
 
-              ;; If we do not set this, neomutt wants to check
-              ;; whether the path exists, which it does not
-              ;; in the chroot.
-              "--with-mailpath=/var/mail"
-              (string-append "--with-ncurses="
-                             #$(this-package-input "ncurses"))
-              (string-append "--prefix=" #$output)
-              "--zstd=1")
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'configure
-            (lambda* (#:key configure-flags #:allow-other-keys)
-              (apply invoke "autosetup"
-                     (string-append "--prefix=" #$output)
-                     configure-flags)))
-          (add-before 'check 'prepare-test-files
-            (lambda _
-              (copy-recursively
-               #$(this-package-native-input "neomutt-test-files")
-               "tests")
-              ;; FIXME: investigate why tests are failing, Nix also disables
-              ;; (a different) one: test_expando_node_padding.
-              (substitute* "test/main.c"
-                (("NEOMUTT_TEST_ITEM\\(test_expando_filter\\)") "")
-                (("NEOMUTT_TEST_ITEM\\(test_mutt_path_tilde\\)") ""))
-              (with-directory-excursion "tests"
-                (setenv "NEOMUTT_TEST_DIR" (getcwd)) ; must be absolute
-                (invoke "bash" "setup.sh")))))))
+             "--idn2"
+
+             ;; If we do not set this, neomutt wants to check
+             ;; whether the path exists, which it does not
+             ;; in the chroot.
+             "--with-mailpath=/var/mail"
+
+             (string-append "--with-ncurses="
+                            (assoc-ref %build-inputs "ncurses"))
+             (string-append "--prefix="
+                            (assoc-ref %outputs "out"))
+             "--zstd=1")
+       #:phases
+       (modify-phases %standard-phases
+         ;; TODO: autosetup is meant to be included in the source,
+         ;; but we should package autosetup and use our own version of it.
+         (replace 'configure
+           (lambda* (#:key outputs inputs configure-flags #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (flags `(,@configure-flags))
+                    (bash (which "bash")))
+               (setenv "SHELL" bash)
+               (setenv "CONFIG_SHELL" bash)
+               (apply invoke bash
+                      (string-append (getcwd) "/configure")
+                      flags))))
+         (add-before 'check 'prepare-test-files
+           (lambda* (#:key inputs #:allow-other-keys)
+             (copy-recursively (assoc-ref inputs "neomutt-test-files") "tests")
+             ;; FIXME: investigate why tests are failing, Nix is also disabling one
+             (substitute* "test/main.c"
+                          (("NEOMUTT_TEST_ITEM\\(test_expando_filter\\)") "")
+                           (("NEOMUTT_TEST_ITEM\\(test_mutt_sig_exit_handler\\)") "")
+                           (("NEOMUTT_TEST_ITEM\\(test_mutt_path_tilde\\)") ""))
+             (with-directory-excursion "tests"
+               (setenv "NEOMUTT_TEST_DIR" (getcwd)) ; must be absolute
+               (invoke "bash" "setup.sh")))))))
     (home-page "https://neomutt.org/")
     (synopsis "Command-line mail reader based on Mutt")
     (description
@@ -1419,25 +1411,22 @@ attachments, create new maildirs, and so on.")
 (define-public alot
   (package
     (name "alot")
-    (version "0.12")
+    (version "v0.12")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
               (url "https://github.com/pazz/alot")
-              (commit (string-append "v" version))))
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32 "018zqpjrl3cggj1myysjj04a054mg890khhdh1qjmd70k8l3w1di"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      ;; tests: 299 passed, 39 deselected, 9 xfailed, 29 warnings, 11 subtests
+      ;; tests: 334 passed, 4 deselected, 9 xfailed, 29 warnings, 11 subtests
       #:test-flags
       #~(list
-         ;; Randomly fails with FileNotFoundError; does not happen
-         ;; in git checkout though, so no upstream issue.
-         "--deselect=tests/test_crypto.py"
          "-k" (string-join
                ;; alot.settings.errors.ConfigError: failed to read notmuch
                ;; config with command ...

gnu/packages/make-bootstrap.scm

@@ -7,6 +7,7 @@
 ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2026 Zheng Junjie <z572@z572.online>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -622,7 +623,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
 
       (propagated-inputs
        (modify-inputs propagated-inputs
-         (replace "libgc" libgc/static-libs)))
+         (replace "libgc" `(,libgc "static"))))
 
       (arguments
        (substitute-keyword-arguments arguments

gnu/packages/man.scm

@@ -410,7 +410,7 @@ on any distribution, and the nroff source is included."))))
   ;; input "locales" contain the original (English) text.
   (package
     (name "help2man")
-    (version "1.49.2")
+    (version "1.49.3")
     (source
      (origin
        (method url-fetch)
@@ -418,7 +418,7 @@ on any distribution, and the nroff source is included."))))
                            version ".tar.xz"))
        (sha256
         (base32
-         "0dnxx96lbcb8ab8yrdkqll14cl5n0bch8qpd9qj3c2ky78hhwbly"))))
+         "0kzxla1w0w4z5la255lg9q51wy3qx8f1b0i6gbhaz9pcybg4yzjd"))))
     (build-system gnu-build-system)
     (arguments
      (list

gnu/packages/maths.scm

@@ -9895,19 +9895,19 @@ also included.")
 (define-public cadical
   (package
     (name "cadical")
-    (version "2.2.1")
+    (version "2.0.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/arminbiere/cadical")
                     (commit (string-append "rel-" version))))
               (file-name (git-file-name name version))
+              (patches (search-patches "cadical-add-shared-library.patch"))
               (sha256
-               (base32 "09p4nm8jyvhnsgpmbawzlk8b932k33s922a2rxm77sy8s31mm13m"))))
+               (base32 "1dzjah3z34v89ka48hncwqkxrwl4xqn9947p0ipf39lxshrq91xa"))))
     (build-system gnu-build-system)
     (arguments
      (list #:test-target "test"
-           #:configure-flags #~(list "-shared")
            #:modules `(((guix build copy-build-system) #:prefix copy:)
                        (guix build gnu-build-system)
                        (guix build utils)
@@ -9917,7 +9917,16 @@ also included.")
            #~(modify-phases %standard-phases
                (replace 'configure
                  (lambda* (#:key configure-flags #:allow-other-keys)
+                   (setenv "CXXFLAGS" "-DPIC -fPIC")
                    (apply invoke "./configure" configure-flags)))
+               (replace 'check
+                 (lambda args
+                   ;; Tests are incorrectly linked upstream.
+                   ;; Since we don't install them, just work around this in the
+                   ;; check phase.
+                   (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/build"))
+                   (apply (assoc-ref %standard-phases 'check) args)
+                   (unsetenv "LD_LIBRARY_PATH")))
                (replace 'install
                  (lambda args
                    (apply
@@ -9935,39 +9944,6 @@ also included.")
 clause learning.")
     (license license:expat)))
 
-(define-public cadical-2.1
-  (package
-    (inherit cadical)
-    (name "cadical")
-    (version "2.1.3")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/arminbiere/cadical")
-                    (commit (string-append "rel-" version))))
-              (file-name (git-file-name name version))
-              (patches (search-patches "cadical-add-shared-library.patch"))
-              (sha256 (base32
-                       "1gl0xd6zyxb127w8k0mps9m2izaqb7im7j91by4lkknmm7xhwyav"))))
-    (arguments (substitute-keyword-arguments (package-arguments cadical)
-                 ((#:configure-flags _)
-                  #~(list))
-                 ((#:phases phases)
-                  #~(modify-phases #$phases
-                      (add-before 'configure 'set-shared-flags
-                        (lambda _
-                          (setenv "CXXFLAGS" "-DPIC -fPIC")))
-                      (replace 'check
-                        (lambda args
-                          ;; Tests are incorrectly linked upstream.
-                          ;; Since we don't install them, just work around this in the
-                          ;; check phase.
-                          (setenv "LD_LIBRARY_PATH"
-                                  (string-append (getcwd) "/build"))
-                          (apply (assoc-ref %standard-phases
-                                            'check) args)
-                          (unsetenv "LD_LIBRARY_PATH")))))))))
-
 (define-public cadiback
   (let ((commit "789329d8fcda851085ed72f1b07d8c3f46243b8a")
         (revision "1"))
@@ -10082,20 +10058,7 @@ true in all models.")
                  (add-after 'unpack 'no-tune-native
                    (lambda _
                      (substitute* "CMakeLists.txt"
-                       (("-mtune=native") ""))))
-                 ;; Refer to the library in ${LOUVAIN_COMMUNITIES_LIBRARIES} by
-                 ;; full path.  This ensures that we find references to it in
-                 ;; software using this library via CMake.
-                 ;;
-                 ;; CMake expects module to set this variable to a full path.
-                 ;; See <https://cmake.org/cmake/help/v4.3/module/SelectLibraryConfigurations.html#command:select_library_configurations>.
-                 (add-after 'unpack 'cmake-lib-full-path
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     (substitute* "louvain_communitiesConfig.cmake.in"
-                       (("louvain_communities")
-                        (string-append
-                          (assoc-ref outputs "out")
-                          "/lib/liblouvain_communities.so"))))))))
+                       (("-mtune=native") "")))))))
       (native-inputs (list python))
       (home-page "https://github.com/meelgroup/louvain-community")
       (synopsis "Multi-criteria community detection")

gnu/packages/matrix.scm

@@ -437,8 +437,7 @@ fetch and store media in Amazon S3.")
                  (apply (assoc-ref cargo:%standard-phases phase)
                         #:cargo-target #$(cargo-triplet)
                         args))
-               '(prepare-rust-crates
-                 unpack-rust-crates
+               '(unpack-rust-crates
                  configure
                  check-for-pregenerated-files
                  patch-cargo-checksums))))

gnu/packages/messaging.scm

@@ -1183,7 +1183,7 @@ of xmpppy.")
 (define-public gajim
   (package
     (name "gajim")
-    (version "2.4.5")
+    (version "2.4.4")
     (source
      (origin
        (method url-fetch)
@@ -1191,7 +1191,7 @@ of xmpppy.")
                            (version-major+minor version)
                            "/gajim-" version ".tar.gz"))
        (sha256
-         (base32 "1rkxzf1pfd29rip5bw4730fl7b2xk12zpiwnfkyzxlkmbh4j3kp2"))
+         (base32 "0s2jryg8c0ifgf88pfj7k1ifhl1l2fw4w8w80g7xh3qpk5gj7ml0"))
        (patches
          (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
     (build-system pyproject-build-system)
@@ -1261,7 +1261,7 @@ of xmpppy.")
           ;; FIXME: Cannot use this expression as it would
           ;; introduce a circular dependency at the top level.
           ;; (version-major+minor (package-version python))
-          "3.11"
+          "3.10"
           "/site-packages"))))))
     (native-inputs
      (list gettext-minimal
@@ -2356,11 +2356,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        (sha256
         (base32 "098jqccwsfbqkdpnhbych2rd076385wb51fx9qyjfiddidxv2mas"))
        (modules '((guix build utils)))
-       (snippet '(delete-file-recursively "third_party"))
-       ;; Release 0.12.1 has a major bug which prevents replies
-       ;; from rendering: https://github.com/Nheko-Reborn/nheko/issues/1944
-       ;; TODO: revaluate for future versions.
-       (patches (search-patches "nheko-0-12-1-fix-rendering-replies.patch"))))
+       (snippet '(delete-file-recursively "third_party"))))
     (arguments
      (list
       #:tests? #f                       ;no test target

gnu/packages/ncurses.scm

@@ -42,23 +42,10 @@
   #:use-module ((guix memoization) #:select (mlambda))
   #:use-module (ice-9 match))
 
-(define ncurses-rollup-patch
-  (mlambda (version)
-    (origin
-      (method url-fetch)
-      (uri (match (string-split (version-major+minor+point version) #\.)
-             ((major minor point)
-              (string-append "https://invisible-mirror.net/archives"
-                             "/ncurses/" major "." minor "/ncurses-"
-                             major "." minor "-" point "-patch.sh.bz2"))))
-      (sha256
-       (base32
-        "1b6522cvi4066bgh9lp93q8lk93zcjjssvnw1512z447xvazy2y6")))))
-
 (define-public ncurses
   (package
     (name "ncurses")
-    (version "6.2.20210619")
+    (version "6.6.20260103")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/ncurses/ncurses-"
@@ -66,7 +53,7 @@
                                   ".tar.gz"))
               (sha256
                (base32
-                "17bcm2z1rdx5gmzj5fb8cp7f28aw5b4g2z4qvvqg3yg0fq66wc1h"))))
+                "04gz96vhj83yls2czsajbmc65qsnfrxn2ijcl20h62w8xnxlqnrm"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc"))                ;1 MiB of man pages
@@ -91,18 +78,6 @@
                              (cons (string-append "--host=" target)
                                    configure-flags)
                              configure-flags)))))
-           (apply-rollup-patch-phase
-            ;; Ncurses distributes "stable" patchsets to be applied on top
-            ;; of the release tarball.  These are only available as shell
-            ;; scripts(!) so we decompress and apply them in a phase.
-            ;; See <https://invisible-mirror.net/archives/ncurses/6.1/README>.
-            #~(lambda* (#:key inputs native-inputs #:allow-other-keys)
-                (let ((rollup-patch #$(ncurses-rollup-patch
-                                       (package-version this-package))))
-                  (copy-file rollup-patch
-                             (string-append (getcwd) "/rollup-patch.sh.bz2"))
-                  (invoke "bzip2" "-d" "rollup-patch.sh.bz2")
-                  (invoke "sh" "rollup-patch.sh"))))
            (remove-shebang-phase
             #~(lambda _
                 ;; To avoid retaining a reference to the bootstrap Bash via the
@@ -205,8 +180,6 @@
                  #$@(if (target-mingw?) #~("--enable-term-driver") #~()))
              #:tests? #f                          ; no "check" target
              #:phases #~(modify-phases %standard-phases
-                          (add-after 'unpack 'apply-rollup-patch
-                            #$apply-rollup-patch-phase)
                           (replace 'configure #$configure-phase)
                           (add-after 'install 'post-install
                             #$post-install-phase)

gnu/packages/node-xyz.scm

@@ -2324,7 +2324,7 @@ a string consisting of a number and a time unit is converted to milliseconds.")
 (define-public node-nan
   (package
     (name "node-nan")
-    (version "2.26.2")
+    (version "2.22.0")
     (source
      (origin
        (method git-fetch)
@@ -2333,7 +2333,7 @@ a string consisting of a number and a time unit is converted to milliseconds.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "18xv0m40jgy3sc4pldw95w6p72ms5a5h0x2sm2mimlwlmxmrjlmb"))))
+        (base32 "02gqm23x26glffvyxrnk610hy3hg0kwh2v58dhnb032l0jhjzqvp"))))
     (build-system node-build-system)
     (arguments
      `(#:phases

gnu/packages/node.scm

@@ -274,7 +274,7 @@
                             (lambda (file stat)
                               (executable-file? file))
                             #:stat lstat)))))
-         (add-after 'install 'fix-node-gyp-reference
+         (add-after 'install 'install-npmrc
            ;; Note: programs like node-gyp only receive these values if
            ;; they are started via `npm` or `npx`.
            ;; See: https://github.com/nodejs/node-gyp#npm-configuration
@@ -482,7 +482,7 @@ Node.js and web browsers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nodejs/llparse-builder.git")
+             (url "https://github.com/indutny/llparse-builder.git")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -491,6 +491,10 @@ Node.js and web browsers.")
        (modules '((guix build utils)))
        (snippet
         '(begin
+           ;; FIXME: Unneeded runtime dependency.
+           ;; https://github.com/indutny/llparse-builder/pull/2
+           (substitute* "package.json"
+             (("\"@types/debug.*,") ""))
            ;; Fix imports for esbuild.
            ;; https://github.com/evanw/esbuild/issues/477
            (substitute* '("src/node/invoke.ts"
@@ -517,8 +521,7 @@ Node.js and web browsers.")
          (add-after 'patch-dependencies 'delete-dependencies
            (lambda _
              (modify-json (delete-dependencies
-                           `("@types/debug"
-                             "@types/mocha"
+                           `("@types/mocha"
                              "@types/node"
                              "mocha"
                              "ts-node"
@@ -536,7 +539,7 @@ Node.js and web browsers.")
      (list node-binary-search-bootstrap node-debug-bootstrap))
     (native-inputs
      (list esbuild))
-    (home-page "https://github.com/nodejs/llparse-builder#readme")
+    (home-page "https://github.com/indutny/llparse-builder#readme")
     (properties '((hidden? . #t)))
     (synopsis "Graph builder for consumption by llparse")
     (description "This package builds graphs for consumption by llparse.")
@@ -550,7 +553,7 @@ Node.js and web browsers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nodejs/llparse-frontend.git")
+             (url "https://github.com/indutny/llparse-frontend.git")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -599,7 +602,7 @@ Node.js and web browsers.")
      (list node-debug-bootstrap node-llparse-builder-bootstrap))
     (native-inputs
      (list esbuild))
-    (home-page "https://github.com/nodejs/llparse-frontend#readme")
+    (home-page "https://github.com/indutny/llparse-frontend#readme")
     (properties '((hidden? . #t)))
     (synopsis "Frontend for the llparse compiler")
     (description "This package is a frontend for the llparse compiler.")
@@ -608,17 +611,17 @@ Node.js and web browsers.")
 (define-public node-llparse-bootstrap
   (package
     (name "node-llparse")
-    (version "7.3.0")
+    (version "7.1.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nodejs/llparse.git")
+             (url "https://github.com/indutny/llparse.git")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "09hqjcynkz5iv7aydzdwgs42r7y2zylplv0ff7w0vkdsgb08j22a"))
+         "10da273iy2if88hp79cwms6c8qpsl1fkgzll6gmqyx5yxv5mkyp6"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -642,14 +645,10 @@ Node.js and web browsers.")
          (add-after 'patch-dependencies 'delete-dependencies
            (lambda args
              (modify-json (delete-dependencies
-                           `("@stylistic/eslint-plugin"
-                             "@typescript-eslint/eslint-plugin"
-                             "@typescript-eslint/parser"
-                             "@types/debug"
+                           `("@types/debug"
                              "@types/mocha"
                              "@types/node"
                              "esm"
-                             "eslint"
                              "llparse-test-fixture"
                              "mocha"
                              "ts-node"
@@ -677,7 +676,7 @@ parser definition into a C output.")
 (define-public llhttp-bootstrap
   (package
     (name "llhttp")
-    (version "9.3.0")
+    (version "9.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -686,7 +685,7 @@ parser definition into a C output.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0yz4ys94pjq2fs2pihpqjvmxj2mbpm8k5prlm445z4qlajzlr4kb"))
+                "0mzg19aqb1am498gms0z75cwd5kmfg9p78b1hhxw67019nsjcbac"))
               (patches (search-patches "llhttp-ponyfill-object-fromentries.patch"))
               (modules '((guix build utils)))
               (snippet
@@ -748,14 +747,14 @@ source files.")
 (define-public node-lts
   (package
     (inherit node-bootstrap)
-    (version "24.14.1")
+    (version "22.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://nodejs.org/dist/v" version
                                   "/node-v" version ".tar.gz"))
               (sha256
                (base32
-                "1cri5lp3a9jhh34dbd48hq2zyb7xjb9qs6zl36l3q2blawgwz642"))
+                "12msprh604s6qdsgwymxw4kl8ivaldbaydf4v37lbp02aznk2kkc"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -771,17 +770,13 @@ source files.")
                               "deps/icu-small"
                               "deps/nghttp2"
                               "deps/ngtcp2"
-                              "deps/llhttp"
                               "deps/uv"
-                              "deps/zlib"
-                              "deps/zstd"))))))
+                              "deps/zlib"))))))
     (arguments
      (substitute-keyword-arguments arguments
        ((#:configure-flags configure-flags)
         ''("--shared-cares"
            "--shared-libuv"
-           "--shared-http-parser"
-           "--shared-http-parser-libname=llhttp"
            "--shared-nghttp2"
            "--shared-openssl"
            "--shared-zlib"
@@ -789,7 +784,6 @@ source files.")
            "--with-intl=system-icu"
            "--shared-ngtcp2"
            "--shared-nghttp3"
-           "--shared-zstd"
            ;;Needed for correct snapshot checksums
            "--v8-enable-snapshot-compression"))
        ((#:phases phases)
@@ -852,11 +846,9 @@ source files.")
                (for-each delete-file
                          '("test/parallel/test-https-agent-unref-socket.js"))
 
-               ;; These tests are timing-sensitive, and fail sporadically on
+               ;; This test is timing-sensitive, and fails sporadically on
                ;; slow, busy, or even very fast machines.
-               (for-each delete-file
-                         '("test/parallel/test-fs-utimes.js"
-                           "test/sequential/test-performance-eventloopdelay.js"))
+               (delete-file "test/parallel/test-fs-utimes.js")
 
                ;; FIXME: This test fails randomly:
                ;; https://github.com/nodejs/node/issues/31213
@@ -907,6 +899,18 @@ source files.")
                      "test/parallel/test-http2-invalid-last-stream-id.js")
                  (("client\\.connect\\(address\\)")
                   "client.connect(address.port)"))))
+           (add-after 'delete-problematic-tests 'replace-llhttp-sources
+             (lambda* (#:key inputs #:allow-other-keys)
+               ;; Replace pre-generated llhttp sources
+               (let ((llhttp (assoc-ref inputs "llhttp")))
+                 (copy-file (string-append llhttp "/src/llhttp.c")
+                            "deps/llhttp/src/llhttp.c")
+                 (copy-file (string-append llhttp "/src/api.c")
+                            "deps/llhttp/src/api.c")
+                 (copy-file (string-append llhttp "/src/http.c")
+                            "deps/llhttp/src/http.c")
+                 (copy-file (string-append llhttp "/include/llhttp.h")
+                            "deps/llhttp/include/llhttp.h"))))
            ;; npm installs dependencies by copying their files over a tar
            ;; stream.  A file with more than one hardlink is marked as a
            ;; "Link".  pacote/lib/fetcher.js calls node-tar's extractor with a
@@ -931,22 +935,30 @@ source files.")
            ;;   https://github.com/npm/pacote/issues/285
            (add-after 'install 'ignore-number-of-hardlinks
              (lambda* (#:key outputs #:allow-other-keys)
-               (let ((dir (string-append (assoc-ref outputs "out")
-                                         "/lib/node_modules/npm/node_modules"
-                                         "/tar/dist")))
-                 (substitute*
-                     (list (string-append dir "/esm/write-entry.js")
-                           (string-append dir "/commonjs/write-entry.js"))
+               (let ((file (string-append (assoc-ref outputs "out")
+                                          "/lib/node_modules/npm/node_modules"
+                                          "/tar/lib/write-entry.js")))
+                 (substitute* file
                    (("this.stat.nlink > 1") "false")))))
-           (replace 'fix-node-gyp-reference
+           (add-after 'install 'install-node-gyp-wrapper
              (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 (for-each
-                  (lambda (spec)
-                    (wrap-program (string-append out spec)
-                      `("npm_package_config_node_gyp_nodedir" = (,out))))
-                  '("/bin/npm"
-                    "/bin/npx")))))))))
+               (let* ((out (assoc-ref outputs "out"))
+                      (dir (string-append out "/lib/node_modules/npm/bin/node-gyp-bin"))
+                      (file (string-append dir "/node-gyp")))
+                 (mkdir-p dir)
+                 ;; See https://github.com/npm/cli/issues/6842
+                 (call-with-output-file file
+                   (lambda (port)
+                     (format port "#!~a/bin/sh
+if [ \"x$npm_config_node_gyp\" = \"x\" ]; then
+  ~a/bin/node \"~a/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js\" \"$@\"
+else
+  \"$npm_config_node_gyp\" \"$@\"
+fi"
+                             (assoc-ref inputs "bash")
+                             out
+                             out)))
+                 (chmod file #o555))))))))
     (native-inputs
      (list ;; Runtime dependencies for binaries used as a bootstrap.
            c-ares-for-node-lts
@@ -962,8 +974,7 @@ source files.")
            pkg-config
            procps
            python
-           util-linux
-           gcc-14))
+           util-linux))
     (inputs
      (list bash-minimal
            coreutils
@@ -976,8 +987,7 @@ source files.")
            nghttp3
            `(,nghttp2 "lib")
            openssl
-           zlib
-           `(,zstd-1.5.7 "lib")))
+           zlib))
     (supported-systems
       (cons "riscv64-linux" (package-supported-systems node-bootstrap)))
     (properties (alist-delete 'hidden? (package-properties node-bootstrap)))))
@@ -993,6 +1003,6 @@ source files.")
         `(cons* "--shared" "--without-npm" ,flags))
        ((#:phases phases '%standard-phases)
         `(modify-phases ,phases
-           (delete 'fix-node-gyp-reference)
+           (delete 'install-npmrc)
            (delete 'patch-nested-shebangs)
            (delete 'ignore-number-of-hardlinks)))))))

gnu/packages/nss.scm

@@ -398,7 +398,7 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
 (define-public nsncd
   (package
     (name "nsncd")
-    (version "1.5.2")
+    (version "1.5.1")
     (source
      (origin
        (method git-fetch)
@@ -407,7 +407,7 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1kzwd5vlz5paal8k79dkamjqczz7k8azyc8zwjyhalcxzsjkdn0w"))))
+        (base32 "1qiphwlwbnni2vfqjbdzv2a1qgqv2ycmygmyrbx8pgaak9gl5hfi"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags

gnu/packages/patches/binutils-reproducible-tar.patch

@@ -0,0 +1,26 @@
+Ensure that the examples tarball is reproducible.
+
+See https://reproducible-builds.org/docs/archives/
+
+diff -upr a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
+--- a/gprofng/doc/Makefile.in	2025-02-02 01:00:00.000000000 +0100
++++ b/gprofng/doc/Makefile.in	2026-03-15 11:03:49.597737186 +0100
+@@ -894,14 +894,14 @@ gprofng-display-text.1: $(srcdir)/gprofn
+ 
+ info: $(man_MANS)
+ 
+-examples.tar.gz:
+-	$(AM_V_at)( tar czf $@ $(srcdir)/../examples )
++examples.tar:
++	$(AM_V_at)( tar --owner=0 --group=0 --sort=name --mtime='2015-10-21 00:00Z' -cf $@ $(srcdir)/../examples )
+ 
+ .PHONY: install-data-local
+ 
+-install-data-local:  examples.tar.gz
++install-data-local:  examples.tar
+ 	$(mkinstalldirs) $(DESTDIR)$(docdir)/gprofng
+-	$(INSTALL_DATA) examples.tar.gz $(DESTDIR)$(docdir)/gprofng
++	$(INSTALL_DATA) examples.tar $(DESTDIR)$(docdir)/gprofng
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

gnu/packages/patches/cadical-add-shared-library.patch

@@ -12,10 +12,10 @@ Liliana Marie Prikler <liliana.prikler@gmail.com>:
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/makefile.in b/makefile.in
-index 5e1c1b3a..de3fe975 100644
+index 291cb3e3..d179f591 100644
 --- a/makefile.in
 +++ b/makefile.in
-@@ -38,7 +38,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) -I../src
+@@ -34,7 +34,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) -I$(ROOT)/src
  
  #--------------------------------------------------------------------------#
  
@@ -24,23 +24,26 @@ index 5e1c1b3a..de3fe975 100644
  
  #--------------------------------------------------------------------------#
  
-@@ -53,14 +53,17 @@ all: libcadical.a cadical mobical
+@@ -54,10 +54,10 @@ contrib/%.o: $(ROOT)/contrib/%.cpp $(ROOT)/contrib/%.hpp $(ROOT)/src/*.hpp makef
  # tester 'mobical') and the library are the main build targets.
  
- cadical: cadical.o libcadical.a makefile
+ cadical: src/cadical.o libcadical.a makefile
 -	$(COMPILE) -o $@ $< -L. -lcadical $(LIBS)
 +	$(COMPILE) -static -o $@ $< -L. -lcadical $(LIBS)
  
- mobical: mobical.o libcadical.a makefile $(LIBS)
+ mobical: src/mobical.o libcadical.a makefile $(LIBS)
 -	$(COMPILE) -o $@ $< -L. -lcadical
 +	$(COMPILE) -static -o $@ $< -L. -lcadical
  
  libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile
  	ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)
+@@ -62,5 +62,8 @@ mobical: src/mobical.o libcadical.a makefile $(LIBS)
+ libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile
+ 	ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)
  
 +libcadical.so: $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS) makefile
 +	$(COMPILE) -shared -o $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS)
 +
  #--------------------------------------------------------------------------#
  
- # Note that 'build.hpp' is generated and resides in the build directory.
+ # Note that 'build.hpp' is generated and resides in the build directory.

gnu/packages/patches/flex-fix-make-dependencies.patch

@@ -0,0 +1,54 @@
+Retrieved from Poky:
+https://git.enea.com/cgit/linux/poky.git/plain/meta/recipes-devtools/flex/flex/0001-build-tests-add-missing-parser-scanner-dependencies.patch?id=bf94ea1cc4e966fa2cf55206389f9c34fbd5419d
+
+From 47e3916842ffefd7def84ae85758fdcceeb77839 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Thu, 20 Mar 2025 12:16:50 +0000
+Subject: [PATCH] build(tests): add missing parser->scanner dependencies
+
+With sufficient parallelism and `make --shuffle` to reorder builds the
+test suite occasionally fails to build with errors like this:
+
+ tests/bison_yylval_parser.y:36:10: fatal error: bison_yylval_scanner.h: No such file or directory
+    36 | #include "bison_yylval_scanner.h"
+
+Solve this by adding the missing dependencies to the *_parser.o targets
+on the _scanner.h files.
+
+Upstream-Status: Submitted [https://github.com/westes/flex/pull/702]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ tests/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 2cb51df..d0c199d 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -343,6 +343,7 @@ FLEX = $(top_builddir)/src/flex
+ 
+ bison_nr_main.$(OBJEXT): bison_nr_parser.h bison_nr_scanner.h
+ bison_nr_scanner.$(OBJEXT): bison_nr_parser.h
++bison_nr_parser.$(OBJEXT): bison_nr_scanner.h
+ 
+ bison_nr_scanner.h: bison_nr_scanner.c
+ 	@if test ! -f $@; then rm -f $<; else :; fi
+@@ -350,6 +351,7 @@ bison_nr_scanner.h: bison_nr_scanner.c
+ 
+ bison_yylloc_main.$(OBJEXT): bison_yylloc_parser.h bison_yylloc_scanner.h
+ bison_yylloc_scanner.$(OBJEXT): bison_yylloc_parser.h
++bison_yylloc_parser.$(OBJEXT): bison_yylloc_scanner.h
+ 
+ bison_yylloc_scanner.h: bison_yylloc_scanner.c
+ 	@if test ! -f $@; then rm -f $<; else :; fi
+@@ -357,6 +359,7 @@ bison_yylloc_scanner.h: bison_yylloc_scanner.c
+ 
+ bison_yylval_main.$(OBJEXT): bison_yylval_parser.h bison_yylval_scanner.h
+ bison_yylval_scanner.$(OBJEXT): bison_yylval_parser.h
++bison_yylval_parser.$(OBJEXT): bison_yylval_scanner.h
+ 
+ bison_yylval_scanner.h: bison_yylval_scanner.c
+ 	@if test ! -f $@; then rm -f $<; else :; fi
+-- 
+2.43.0
+

gnu/packages/patches/gawk-shell.patch

@@ -2,9 +2,20 @@ As for libc's `system', change Awk to look for `sh' in $PATH.  This patch is
 only meant to be used during bootstrapping, where we don't know in advance the
 absolute file name of `sh'.
 
---- gawk-4.1.3/io.c	2015-05-19 15:37:20.000000000 +0200
-+++ gawk-4.1.3/io.c	2015-06-09 18:39:36.918414881 +0200
-@@ -2025,7 +2025,7 @@
+--- gawk-5.3.2/builtin.c
++++ gawk-5.3.2/builtin.c
+@@ -3341,7 +3341,7 @@ gawk_system(const char *command)
+ 	if ((childpid = fork()) == 0) {
+ 		// child
+ 		set_sigpipe_to_default();
+-		execl("/bin/sh", "sh", "-c", command, NULL);
++		execlp("sh", "sh", "-c", command, NULL);
+ 		_exit(errno == ENOENT ? 127 : 126);
+ 	} else {
+ 		// parent
+--- gawk-5.3.2/io.c
++++ gawk-5.3.2/io.c
+@@ -2084,7 +2084,7 @@ fork_and_open_slave_pty(const char *slavenam, int master, const char *command, p
  
  		set_sigpipe_to_default();
  
@@ -13,7 +24,7 @@ absolute file name of `sh'.
  		_exit(errno == ENOENT ? 127 : 126);
  
  	case -1:
-@@ -2077,7 +2077,7 @@
+@@ -2136,7 +2136,7 @@ fork_and_open_slave_pty(const char *slavenam, int master, const char *command, p
  
  		signal(SIGPIPE, SIG_DFL);
  
@@ -22,21 +33,30 @@ absolute file name of `sh'.
  		_exit(errno == ENOENT ? 127 : 126);
  
  	case -1:
-@@ -2422,7 +2422,7 @@
- 			fatal(_("close of pipe failed (%s)"), strerror(errno));
+@@ -2475,7 +2475,7 @@ use_pipes:
+ 			fatal(_("close of pipe failed: %s"), strerror(errno));
  		/* stderr does NOT get dup'ed onto child's stdout */
  		set_sigpipe_to_default();
 -		execl("/bin/sh", "sh", "-c", str, NULL);
 +		execlp("sh", "sh", "-c", str, NULL);
  		_exit(errno == ENOENT ? 127 : 126);
  	}
- #endif /* NOT __EMX__, NOT __MINGW32__ */
-@@ -2659,7 +2659,7 @@
+ #endif /* NOT __MINGW32__ */
+@@ -2706,7 +2706,7 @@ gawk_popen(const char *cmd, struct redirect *rp)
  		if (close(p[0]) == -1 || close(p[1]) == -1)
- 			fatal(_("close of pipe failed (%s)"), strerror(errno));
+ 			fatal(_("close of pipe failed: %s"), strerror(errno));
  		set_sigpipe_to_default();
 -		execl("/bin/sh", "sh", "-c", cmd, NULL);
 +		execlp("sh", "sh", "-c", cmd, NULL);
  		_exit(errno == ENOENT ? 127 : 126);
  	}
- #endif /* NOT __EMX__, NOT __MINGW32__ */
+ #endif /* NOT __MINGW32__ */
+@@ -4642,7 +4642,7 @@ gawk_popen_write(const char *cmd)
+ 			fatal(_("gawk_popen_write: failed to move pipe fd to standard input"));
+ 		(void) close(pipefds[0]);
+ 		set_sigpipe_to_default();
+-		execl("/bin/sh", "sh", "-c", cmd, NULL);
++		execlp("sh", "sh", "-c", cmd, NULL);
+ 		_exit(errno == ENOENT ? 127 : 126);
+ 	} else if (childpid < 0) {
+ 		(void) close(pipefds[0]);

gnu/packages/patches/gcc-mangle-guix-store.patch

@@ -0,0 +1,70 @@
+Patch for GCC to mangle store item references to inputs introduced by __FILE__
+macros from derivation outputs.  This helps reduce the closure size of certain
+packages.
+
+This patch is based on:
+https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch
+
+At the time of writting, this patch applies successfuly for GCC versions from
+13 to 16.  The patch is not meant to be upstreamed, it provides a solution to
+a specific problem of Guix.
+---
+ gcc/file-prefix-map.cc | 28 ++++++++++++++++++++++++++--
+ 1 file changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/file-prefix-map.cc b/gcc/file-prefix-map.cc
+index 6b432e2a15a..6cc20bacd38 100644
+--- a/gcc/file-prefix-map.cc
++++ b/gcc/file-prefix-map.cc
+@@ -74,7 +74,7 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt)
+    remapping was performed.  */
+ 
+ static const char *
+-remap_filename (file_prefix_map *maps, const char *filename)
++remap_filename (file_prefix_map *maps, const char *filename, bool mangle_guix_store = false)
+ {
+   file_prefix_map *map;
+   char *s;
+@@ -102,6 +102,30 @@ remap_filename (file_prefix_map *maps, const char *filename)
+       break;
+   if (!map)
+     {
++      if (mangle_guix_store && getenv("GUIX_GCC_MANGLE_PREFIX_MAP"))
++	{
++	  /* Remap all fo $NIX_STORE/.{32} paths to uppercase
++	   *
++	   * That way we avoid argument parameters explosion
++	   * and still avoid embedding headers into runtime closure:
++	   *   https://gcc.gnu.org/PR111527
++	   */
++	   const char * guix_store = getenv("NIX_STORE") ? getenv("NIX_STORE") : "/gnu/store";
++	   size_t guix_store_len = guix_store ? strlen(guix_store) : 0;
++	   const char * name = realname ? realname : filename;
++	   size_t name_len = strlen(name);
++	   if (guix_store && name_len >= guix_store_len + 1 + 32 && memcmp(name, guix_store, guix_store_len) == 0)
++	     {
++		s = (char *) ggc_alloc_atomic (name_len + 1);
++		memcpy(s, name, name_len + 1);
++		for (size_t i = guix_store_len + 1; i < guix_store_len + 1 + 32; i++) {
++		  s[i] = TOUPPER(s[i]);
++		}
++		if (realname != filename)
++		  free (const_cast <char *> (realname));
++		return s;
++	     }
++	}
+       if (realname != filename)
+ 	free (const_cast <char *> (realname));
+       return filename;
+@@ -163,7 +187,7 @@ add_profile_prefix_map (const char *arg)
+ const char *
+ remap_macro_filename (const char *filename)
+ {
+-  return remap_filename (macro_prefix_maps, filename);
++  return remap_filename (macro_prefix_maps, filename, true);
+ }
+ 
+ /* Remap using -fdebug-prefix-map.  Return the GC-allocated new name
+-- 
+2.52.0
+

gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch

@@ -1,10 +0,0 @@
---- a/testsuite/tests/driver/recomp015/Makefile   2024-01-13 16:22:42.643106725 +0100
-+++ b/testsuite/tests/driver/recomp015/Makefile   2024-01-13 16:23:18.406867917 +0100
-@@ -26,6 +26,7 @@
- 	# number of sections)
- 	'$(TEST_HC)' $(TEST_HC_OPTS) Generate.hs
- 	./Generate > ManySections.s
-+	echo '.section .note.GNU-stack,"",@progbits' > ManySections.s
- 	echo 'main = putStrLn "Running main..."' > Main.hs
- 	'$(TEST_HC)' $(TEST_HC_OPTS) -c ManySections.s
- 	'$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ManySections.o

gnu/packages/patches/glibc-fix-path-attribute-in-getconf.patch

@@ -0,0 +1,23 @@
+This patch is based on patch from NixOS/nixpkgs
+pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch
+
+It adjusts the CS_PATH definition in sysdeps/unix/confstr.h so that getconf PATH
+includes /run/current-system/profile/bin, which is where Guix stores profile binaries.
+Unlike traditional distributions, Guix does not use /bin or /usr/bin as actual locations
+for executables. This change ensures that tools and scripts relying on getconf PATH
+receive a correct and functional PATH.
+
+
+From bff411feec1f381a51d7127971e5d6fda1167254 Mon Sep 17 00:00:00 2001
+From: Nikita Mitasov <me@ch4og.com>
+Date: Sun, 13 Jul 2025 17:48:19 +0300
+Subject: [PATCH] Add Guix profile path to getconf
+
+
+diff --git a/sysdeps/unix/confstr.h b/sysdeps/unix/confstr.h
+index 15859c3b..837837c7 100644
+--- a/sysdeps/unix/confstr.h
++++ b/sysdeps/unix/confstr.h
+@@ -1 +1 @@
+-#define	CS_PATH	"/bin:/usr/bin"
++#define	CS_PATH	"/run/current-system/profile/bin:/bin:/usr/bin"

gnu/packages/patches/ldc-i686-int128-alignment.patch

@@ -1,40 +0,0 @@
-Description: Adjust int128 alignment
-Author: Walter Bright <WalterBright@users.noreply.github.com>
-Origin: backport, https://github.com/ldc-developers/ldc/commit/f634e2a6542a8b563d9ba1b680afd5337b4c09ea
-Bug: https://github.com/ldc-developers/ldc/issues/1356
-Last-Update: 2024-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/dmd/common/int128.d
-+++ b/dmd/common/int128.d
-@@ -20,7 +20,29 @@
- alias U = ulong;
- enum Ubits = uint(U.sizeof * 8);
- 
--align(16) struct Cent
-+version (DigitalMars)
-+{
-+    /* The alignment should follow target.stackAlign(),
-+     * which is `isXmmSupported() ? 16 : (is64bit ? 8 : 4)
-+     */
-+    version (D_SIMD)
-+        private enum Cent_alignment = 16;
-+    else version (X86_64)
-+        private enum Cent_alignment = 8;
-+    else
-+        private enum Cent_alignment = 4;
-+}
-+else
-+{
-+    version (LDC) version (X86) version = LDC_X86;
-+
-+    version (X86_64)       private enum Cent_alignment = 16;
-+    // 32-bit x86: need default alignment due to https://github.com/ldc-developers/ldc/issues/1356
-+    else version (LDC_X86) private enum Cent_alignment = U.alignof;
-+    else                   private enum Cent_alignment = (size_t.sizeof * 2);
-+}
-+
-+align(Cent_alignment) struct Cent
- {
-     U lo;      // low 64 bits
-     U hi;      // high 64 bits

gnu/packages/patches/libtool-grep-compat.patch

@@ -1,51 +0,0 @@
-Don't escape forward slashes to prevent a warning from grep 3.8.
-
-diff --git a/tests/link-order.at b/tests/link-order.at
---- a/tests/link-order.at
-+++ b/tests/link-order.at
-@@ -99,12 +99,12 @@ aix* | interix*) ;;  # These systems have different path syntax
-   case $hardcode_direct$hardcode_direct_absolute in
-   yesno)
-     AT_CHECK([if $EGREP relinking stderr; then
--         $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout
-+         $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout
-        else :; fi], [0], [ignore], [], [echo "wrong link order"])
-     ;;
-   *)
-     AT_CHECK([if $EGREP relinking stderr; then
--         $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout
-+         $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout
-        else :; fi], [0], [ignore], [], [echo "wrong link order"])
-     ;;
-   esac
-diff --git a/tests/testsuite b/tests/testsuite
---- a/tests/testsuite
-+++ b/tests/testsuite
-@@ -20611,11 +20611,11 @@ aix* | interix*) ;;  # These systems have different path syntax
-   yesno)
-     { set +x
- $as_echo "$at_srcdir/link-order.at:101: if \$EGREP relinking stderr; then
--         \$EGREP \" .*\\/new\\/lib/libb\$shared_ext .*\\/old\\/lib/libcee\$shared_ext\" stdout
-+         \$EGREP \" .*/new/lib/libb\$shared_ext .*/old/lib/libcee\$shared_ext\" stdout
-        else :; fi"
- at_fn_check_prepare_notrace 'an embedded newline' "link-order.at:101"
- ( $at_check_trace; if $EGREP relinking stderr; then
--         $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout
-+         $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout
-        else :; fi
- ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
- at_status=$? at_failed=false
-@@ -20633,11 +20633,11 @@ $at_traceon; }
-   *)
-     { set +x
- $as_echo "$at_srcdir/link-order.at:106: if \$EGREP relinking stderr; then
--         \$EGREP \" -L.*\\/new\\/lib -lb -L.*\\/old\\/lib -lcee\" stdout
-+         \$EGREP \" -L.*/new\\/lib -lb -L.*/old/lib -lcee\" stdout
-        else :; fi"
- at_fn_check_prepare_notrace 'an embedded newline' "link-order.at:106"
- ( $at_check_trace; if $EGREP relinking stderr; then
--         $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout
-+         $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout
-        else :; fi
- ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
- at_status=$? at_failed=false

gnu/packages/patches/libtool-skip-tests2.patch

@@ -1,33 +0,0 @@
-Skip the nopic test on ARM, MIPS and RISC-V systems.
-
---- libtool-2.4.6/tests/demo.at.orig	2015-01-16 13:52:04.000000000 -0500
-+++ libtool-2.4.6/tests/demo.at	2015-02-16 10:48:51.435851966 -0500
-@@ -510,7 +510,7 @@
- AT_SETUP([force non-PIC objects])
- 
- AT_CHECK([case $host in
--hppa*|x86_64*|s390*)
-+hppa*|x86_64*|s390*|arm*|mips*|riscv*)
-   # These hosts cannot use non-PIC shared libs
-   exit 77 ;;
- *-solaris*|*-sunos*)
---- libtool-2.4.6/tests/testsuite.orig	2015-02-15 11:15:25.000000000 -0500
-+++ libtool-2.4.6/tests/testsuite	2015-02-16 10:50:58.736483216 -0500
-@@ -8741,7 +8741,7 @@
- 
- { set +x
- $as_echo "$at_srcdir/demo.at:513: case \$host in
--hppa*|x86_64*|s390*)
-+hppa*|x86_64*|s390*|arm*|mips*|riscv*)
-   # These hosts cannot use non-PIC shared libs
-   exit 77 ;;
- *-solaris*|*-sunos*)
-@@ -8766,7 +8766,7 @@
- "
- at_fn_check_prepare_notrace 'a `...` command substitution' "demo.at:513"
- ( $at_check_trace; case $host in
--hppa*|x86_64*|s390*)
-+hppa*|x86_64*|s390*|arm*|mips*|riscv*)
-   # These hosts cannot use non-PIC shared libs
-   exit 77 ;;
- *-solaris*|*-sunos*)

gnu/packages/patches/nheko-0-12-1-fix-rendering-replies.patch

@@ -1,290 +0,0 @@
-From 2769642d3c7bd3c0d830b2f18ef6b3bf6a710bf4 Mon Sep 17 00:00:00 2001
-From: Nicolas Werner <nicolas.werner@hotmail.de>
-Date: Sun, 14 Sep 2025 23:43:20 +0200
-Subject: [PATCH] Fix most reply rendering issues with qt 6.9.2
-
----
- resources/qml/TimelineBubbleMessageStyle.qml  | 31 ++++----
- resources/qml/TimelineDefaultMessageStyle.qml | 32 ++++-----
- resources/qml/TopBar.qml                      |  2 +-
- resources/qml/delegates/Reply.qml             | 70 ++++++++++---------
- 4 files changed, 65 insertions(+), 70 deletions(-)
-
-diff --git a/resources/qml/TimelineBubbleMessageStyle.qml b/resources/qml/TimelineBubbleMessageStyle.qml
-index 560cb1338..722718bc4 100644
---- a/resources/qml/TimelineBubbleMessageStyle.qml
-+++ b/resources/qml/TimelineBubbleMessageStyle.qml
-@@ -210,9 +210,10 @@ TimelineEvent {
- 
-                         AbstractButton {
-                             id: replyRow
--                            visible: wrapper.reply
-+                            visible: wrapper.replyTo
-+
-+                            leftPadding: Nheko.paddingSmall + 4
- 
--                            height: replyLine.height
-                             anchors.left: parent.left
-                             anchors.right: parent.right
- 
-@@ -225,19 +226,7 @@ TimelineEvent {
-                                 cursorShape: Qt.PointingHandCursor
-                             }
- 
--                            contentItem: Row {
--                                id: replyRowLay
--
--                                spacing: Nheko.paddingSmall
--
--                                Rectangle {
--                                    id: replyLine
--                                    height: Math.min( wrapper.reply?.height, timelineView.height / 10) + Nheko.paddingSmall + replyUserButton.height
--                                    color: replyRow.userColor
--                                    width: 4
--                                }
--
--                                Column {
-+                            contentItem: Column {
-                                     spacing: 0
- 
-                                     id: replyCol
-@@ -247,7 +236,7 @@ TimelineEvent {
- 
-                                         contentItem: Label {
-                                             id: userName_
--                                            text: wrapper.reply?.userName ?? ''
-+                                            text: wrapper.reply?.userName ?? 'missing name'
-                                             color: replyRow.userColor
-                                             textFormat: Text.RichText
-                                             width: wrapper.maxWidth
-@@ -259,12 +248,20 @@ TimelineEvent {
-                                         replyUserButton,
-                                         wrapper.reply,
-                                     ]
--                                }
-                             }
- 
-                             background: Rectangle {
-                                 //width: replyRow.implicitContentWidth
-                                 color: Qt.tint(palette.base, Qt.hsla(replyRow.userColor.hslHue, 0.5, replyRow.userColor.hslLightness, 0.1))
-+                                Rectangle {
-+                                    anchors.top: parent.top
-+                                    anchors.bottom: parent.bottom
-+                                    anchors.left: parent.left
-+
-+                                    id: replyLine
-+                                    color: replyRow.userColor
-+                                    width: 4
-+                                }
-                             }
- 
-                             onClicked: {
-diff --git a/resources/qml/TimelineDefaultMessageStyle.qml b/resources/qml/TimelineDefaultMessageStyle.qml
-index 2bc0171a8..49454ac0b 100644
---- a/resources/qml/TimelineDefaultMessageStyle.qml
-+++ b/resources/qml/TimelineDefaultMessageStyle.qml
-@@ -192,9 +192,9 @@ TimelineEvent {
- 
-                 AbstractButton {
-                     id: replyRow
--                    visible: wrapper.reply
-+                    visible: wrapper.replyTo
- 
--                    height: replyLine.height
-+                    leftPadding: Nheko.paddingSmall + 4
- 
-                     property color userColor: TimelineManager.userColor(wrapper.reply?.userId ?? '', palette.base)
- 
-@@ -205,19 +205,7 @@ TimelineEvent {
-                         cursorShape: Qt.PointingHandCursor
-                     }
- 
--                    contentItem: Row {
--                        id: replyRowLay
--
--                        spacing: Nheko.paddingSmall
--
--                        Rectangle {
--                            id: replyLine
--                            height: Math.min( wrapper.reply?.height, timelineView.height / 10) + Nheko.paddingSmall + replyUserButton.height
--                            color: replyRow.userColor
--                            width: 4
--                        }
--
--                        Column {
-+                    contentItem: Column {
-                             spacing: 0
- 
-                             id: replyCol
-@@ -227,7 +215,7 @@ TimelineEvent {
- 
-                                 contentItem: Label {
-                                     id: userName_
--                                    text: wrapper.reply?.userName ?? ''
-+                                    text: wrapper.reply?.userName ?? 'missing name'
-                                     color: replyRow.userColor
-                                     textFormat: Text.RichText
-                                     width: wrapper.maxWidth
-@@ -239,12 +227,20 @@ TimelineEvent {
-                                 replyUserButton,
-                                 wrapper.reply,
-                             ]
--                        }
-                     }
- 
-                     background: Rectangle {
--                        //width: replyRow.implicitContentWidth
-                         color: Qt.tint(palette.base, Qt.hsla(replyRow.userColor.hslHue, 0.5, replyRow.userColor.hslLightness, 0.1))
-+
-+                        Rectangle {
-+                            anchors.top: parent.top
-+                            anchors.bottom: parent.bottom
-+                            anchors.left: parent.left
-+
-+                            id: replyLine
-+                            color: replyRow.userColor
-+                            width: 4
-+                        }
-                     }
- 
-                     onClicked: {
-diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml
-index 900e59e8b..cd20e94ec 100644
---- a/resources/qml/TopBar.qml
-+++ b/resources/qml/TopBar.qml
-@@ -330,7 +330,7 @@ Pane {
-                         ImageButton {
-                             id: deletePinButton
- 
--                            Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-+                            Layout.alignment: Qt.AlignTop | Qt.AlignRight
-                             Layout.preferredHeight: 16
-                             Layout.preferredWidth: 16
-                             ToolTip.text: qsTr("Unpin")
-diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
-index 7ee2a0a14..77cad0f0a 100644
---- a/resources/qml/delegates/Reply.qml
-+++ b/resources/qml/delegates/Reply.qml
-@@ -5,6 +5,7 @@
- import QtQuick
- import QtQuick.Controls
- import QtQuick.Window
-+import QtQuick.Layouts
- import im.nheko
- import "../"
- 
-@@ -21,7 +22,11 @@ AbstractButton {
-     property string userId: eventId ? room.dataById(eventId, Room.UserId, "") : ""
-     property string userName: eventId ? room.dataById(eventId, Room.UserName, "") : ""
-     implicitHeight: replyContainer.height
--    implicitWidth: replyContainer.implicitWidth
-+    implicitWidth: replyContainer.implicitWidth + leftPadding + rightPadding
-+
-+    leftPadding: 4 + Nheko.paddingSmall
-+    rightPadding: Nheko.paddingSmall
-+
-     required property int maxWidth
-     property bool limitHeight: false
- 
-@@ -31,14 +36,14 @@ AbstractButton {
-     }
- 
-     onClicked: {
--        let link = reply.child.linkAt != undefined && reply.child.linkAt(pressX-colorline.width, pressY - userName_.implicitHeight);
-+        let link = timelineEvent.main.linkAt != undefined && timelineEvent.main.linkAt(pressX-colorline.width, pressY - userName_.implicitHeight);
-         if (link) {
-             Nheko.openLink(link)
-         } else {
-             room.showEvent(r.eventId)
-         }
-     }
--    onPressAndHold: replyContextMenu.show(reply.child.copyText, reply.child.linkAt(pressX-colorline.width, pressY - userName_.implicitHeight), r.eventId)
-+    onPressAndHold: replyContextMenu.show(timelineEvent.main.copyText, timelineEvent.main.linkAt(pressX-colorline.width, pressY - userName_.implicitHeight), r.eventId)
- 
-     contentItem: TimelineEvent {
-         id: timelineEvent
-@@ -51,49 +56,36 @@ AbstractButton {
-         maxWidth: r.maxWidth
-         limitAsReply: r.limitHeight
- 
--        //height: replyContainer.implicitHeight
--        data: Row {
-+        data: Column {
-             id: replyContainer
--
--            spacing: Nheko.paddingSmall
-+            spacing: 0
- 
-             clip: r.limitHeight
- 
-             height: r.limitHeight ? Math.min( timelineEvent.main?.height, timelineView.height / 10) + Nheko.paddingSmall + usernameBtn.height : undefined
- 
--            Rectangle {
--                id: colorline
--
--                width: 4
--                height: content.height
--
--                color: TimelineManager.userColor(r.userId, palette.base)
--            }
--
--            Column {
--                id: content
--                spacing: 0
-+            // FIXME: I have no idea, why this name doesn't render in the reply popup on Qt 6.9.2
-+            AbstractButton {
-+                id: usernameBtn
- 
--                AbstractButton {
--                    id: usernameBtn
-+                visible: r.eventId
- 
--
--                    contentItem: Label {
--                        id: userName_
--                        text: r.userName
--                        color: r.userColor
--                        textFormat: Text.RichText
--                        width: timelineEvent.main?.width
--                    }
--                    onClicked: room.openUserProfile(r.userId)
-+                contentItem: Label {
-+                    visible: r.eventId
-+                    id: userName_
-+                    text: r.userName
-+                    color: r.userColor
-+                    textFormat: Text.RichText
-+                    width: timelineEvent.main?.width
-                 }
--
--                data: [
--                    usernameBtn, timelineEvent.main,
--                ]
-+                onClicked: room.openUserProfile(r.userId)
-             }
- 
-+            data: [
-+                usernameBtn, timelineEvent.main,
-+            ]
-         }
-+
-     }
- 
-     background: Rectangle {
-@@ -103,6 +95,16 @@ AbstractButton {
-         property color userColor: TimelineManager.userColor(r.userId, palette.base)
-         property color bgColor: palette.base
-         color: Qt.tint(bgColor, Qt.hsla(userColor.hslHue, 0.5, userColor.hslLightness, 0.1))
-+
-+        Rectangle {
-+            anchors.top: parent.top
-+            anchors.bottom: parent.bottom
-+            anchors.left: parent.left
-+
-+            id: colorline
-+            color: backgroundItem.userColor
-+            width: 4
-+        }
-     }
- 
- }

gnu/packages/patches/tao-synth-include-string-you-use.patch

@@ -1,187 +0,0 @@
-Upstream-Status: not reported
-
-diff --git a/include/tao/bow.h b/include/tao/bow.h
-index 38c7081..0a35886 100644
---- a/include/tao/bow.h
-+++ b/include/tao/bow.h
-@@ -21,6 +21,7 @@
- 
- #include <tao/access_point.h>
- #include <tao/device.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/circle.h b/include/tao/circle.h
-index f3061ae..2f96c68 100644
---- a/include/tao/circle.h
-+++ b/include/tao/circle.h
-@@ -21,6 +21,7 @@
- 
- #include <tao/cell.h>
- #include <tao/instrument.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/connector.h b/include/tao/connector.h
-index 0c255f2..1cdcc13 100644
---- a/include/tao/connector.h
-+++ b/include/tao/connector.h
-@@ -21,6 +21,7 @@
- 
- #include <tao/access_point.h>
- #include <tao/device.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/device.h b/include/tao/device.h
-index 06d025c..9bb48aa 100644
---- a/include/tao/device.h
-+++ b/include/tao/device.h
-@@ -32,6 +32,7 @@
- #endif
- 
- #include <tao/access_point.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/ellipse.h b/include/tao/ellipse.h
-index ac3b849..c05fcf7 100644
---- a/include/tao/ellipse.h
-+++ b/include/tao/ellipse.h
-@@ -21,6 +21,7 @@
- 
- #include <tao/cell.h>
- #include <tao/instrument.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/graphics_engine.h b/include/tao/graphics_engine.h
-index bf67425..b2764aa 100644
---- a/include/tao/graphics_engine.h
-+++ b/include/tao/graphics_engine.h
-@@ -23,6 +23,7 @@
- #include <iomanip>
- #include <memory>
- #include <sstream>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/hammer.h b/include/tao/hammer.h
-index 172a8e8..0a4cf2d 100644
---- a/include/tao/hammer.h
-+++ b/include/tao/hammer.h
-@@ -20,6 +20,7 @@
- #define HAMMER_H
- 
- #include <tao/device.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/instrument.h b/include/tao/instrument.h
-index 3b23ac7..60cb6e0 100644
---- a/include/tao/instrument.h
-+++ b/include/tao/instrument.h
-@@ -26,6 +26,7 @@ extern "C" {
- #include <tao/access_point.h>
- #include <tao/pitch.h>
- #include <vector>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/output.h b/include/tao/output.h
-index db34e92..03e3224 100644
---- a/include/tao/output.h
-+++ b/include/tao/output.h
-@@ -23,6 +23,7 @@
- #include <fstream>
- #include <sstream>
- #include <vector>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/pitch.h b/include/tao/pitch.h
-index a76f5eb..fa31ab2 100644
---- a/include/tao/pitch.h
-+++ b/include/tao/pitch.h
-@@ -19,6 +19,8 @@
- #ifndef TAOPITCH_H
- #define TAOPITCH_H
- 
-+#include <string>
-+
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
- #else
-diff --git a/include/tao/rectangle.h b/include/tao/rectangle.h
-index 5c1e77c..0056dcd 100644
---- a/include/tao/rectangle.h
-+++ b/include/tao/rectangle.h
-@@ -21,6 +21,7 @@
- 
- #include <tao/cell.h>
- #include <tao/instrument.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/rgb_color.h b/include/tao/rgb_color.h
-index 69259b6..3f8f7b7 100644
---- a/include/tao/rgb_color.h
-+++ b/include/tao/rgb_color.h
-@@ -1,6 +1,8 @@
- #ifndef TAORGBCOLOR_H
- #define TAORGBCOLOR_H
- 
-+#include <string>
-+
- /*
- static struct colors=
- {
-diff --git a/include/tao/stop.h b/include/tao/stop.h
-index 85a6570..f6868f2 100644
---- a/include/tao/stop.h
-+++ b/include/tao/stop.h
-@@ -23,6 +23,7 @@
- #include <tao/device.h>
- #include <tao/pitch.h>
- #include <tao/strand.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/strand.h b/include/tao/strand.h
-index 65a0d30..1fe99a4 100644
---- a/include/tao/strand.h
-+++ b/include/tao/strand.h
-@@ -21,6 +21,7 @@
- 
- #include <tao/cell.h>
- #include <tao/instrument.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
-diff --git a/include/tao/triangle.h b/include/tao/triangle.h
-index 06d2b2c..9978f94 100644
---- a/include/tao/triangle.h
-+++ b/include/tao/triangle.h
-@@ -21,6 +21,7 @@
- 
- #include <tao/cell.h>
- #include <tao/instrument.h>
-+#include <string>
- 
- #ifdef WIN32
- #define DLLEXPORT __declspec(dllexport)
--- 
-2.52.0
-

gnu/packages/patchutils.scm

@@ -361,7 +361,7 @@ GiB).")
 (define-public meld
   (package
     (name "meld")
-    (version "3.23.1")
+    (version "3.23.0")
     (source
      (origin
        (method url-fetch)
@@ -369,7 +369,7 @@ GiB).")
                            (version-major+minor version)
                            "/meld-" version ".tar.xz"))
        (sha256
-        (base32 "0x1mhk39g98x2w54w7y82fmgx6ad622q6k57a6scdiv38s92gy3k"))))
+        (base32 "19n273shqs8l5lrlic0hr5iv1mp9223ijf3pkh8a49g08112lg4q"))))
     (build-system meson-build-system)
     (native-inputs
      (list desktop-file-utils

gnu/packages/perl.scm

@@ -128,126 +128,125 @@
                        "perl-reproducible-build-date.patch"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f
-       #:configure-flags
-       (let ((out  (assoc-ref %outputs "out"))
-             (libc (assoc-ref %build-inputs "libc")))
-         (list
-          (string-append "-Dprefix=" out)
-          (string-append "-Dman1dir=" out "/share/man/man1")
-          (string-append "-Dman3dir=" out "/share/man/man3")
-          "-de" "-Dcc=gcc"
-          "-Uinstallusrbinperl"
-          "-Dinstallstyle=lib/perl5"
-          "-Duseshrplib"
-          (string-append "-Dlocincpth=" libc "/include")
-          (string-append "-Dloclibpth=" libc "/lib")
-          "-Dusethreads"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'setup-configure
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; Use the right path for `pwd'.
-             (substitute* "dist/PathTools/Cwd.pm"
-               (("'/bin/pwd'")
-                (string-append "'" (search-input-file inputs "bin/pwd") "'")))
+     (list
+      #:tests? #f
+      #:configure-flags
+      #~(let* ((libc.so (search-input-file %build-inputs "/lib/libc.so"))
+               (libc (dirname (dirname libc.so))))
+          (list (string-append "-Dprefix=" #$output)
+                (string-append "-Dman1dir=" #$output "/share/man/man1")
+                (string-append "-Dman3dir=" #$output "/share/man/man3")
+                "-de" "-Dcc=gcc"
+                "-Uinstallusrbinperl"
+                "-Dinstallstyle=lib/perl5"
+                "-Duseshrplib"
+                (string-append "-Dlocincpth=" libc "/include")
+                (string-append "-Dloclibpth=" libc "/lib")
+                "-Dusethreads"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'setup-configure
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Use the right path for `pwd'.
+              (substitute* "dist/PathTools/Cwd.pm"
+                (("'/bin/pwd'")
+                 (string-append "'" (search-input-file inputs "bin/pwd") "'")))
 
-             ;; Build in GNU89 mode to tolerate C++-style comment in libc's
-             ;; <bits/string3.h>.
-             (substitute* "cflags.SH"
-               (("-std=c89")
-                "-std=gnu89"))))
-         ,@(if (%current-target-system)
-               `((add-after 'unpack 'unpack-cross
-                   (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                     (let ((cross-checkout
-                            (assoc-ref native-inputs "perl-cross")))
-                       (rename-file "Artistic" "Artistic.perl")
-                       (rename-file "Copying" "Copying.perl")
-                       (copy-recursively cross-checkout "."))
-                     (let ((bash (search-input-file inputs "bin/bash")))
-                       (substitute* '("Makefile.config.SH"
-                                      "cnf/config.guess"
-                                      "cnf/config.sub"
-                                      "cnf/configure"
-                                      "cnf/configure_misc.sh"
-                                      "miniperl_top")
-                         (("! */bin/sh") (string-append "! " bash))
-                         ((" /bin/sh") bash))
-                       (substitute* '("ext/Errno/Errno_pm.PL")
-                         (("\\$cpp < errno.c") "$Config{cc} -E errno.c")))))
-                 (replace 'configure
-                   (lambda* (#:key configure-flags outputs inputs #:allow-other-keys)
-                     (let* ((out (assoc-ref outputs "out"))
-                            (store-directory (%store-directory))
-                            (configure-flags
-                             (cons*
-                              ;; `perl-cross' confuses target and host
-                              (string-append "--target=" ,(%current-target-system))
-                              (string-append "--prefix=" out)
-                              (string-append "-Dcc=" ,(%current-target-system) "-gcc")
-                              "-Dbyteorder=1234"
-                              (filter (negate
-                                       (lambda (x) (or (string-prefix? "-d" x)
-                                                       (string-prefix? "-Dcc=" x))))
-                                      configure-flags)))
-                            (bash (assoc-ref inputs "bash-minimal")))
-                       (format (current-error-port)
-                               "running ./configure ~a\n"
-                               (string-join configure-flags))
-                       (apply invoke (cons "./configure" configure-flags))
-                       (substitute* "config.sh"
-                         (((string-append store-directory "/[^/]*-bash-[^/]*"))
-                          bash))
-                       (substitute* '("config.h")
-                         (("^#define SH_PATH .*")
-                          (string-append  "#define SH_PATH \""
-                                          bash "/bin/bash\"\n"))))))
-                 (add-after 'build 'touch-non-built-files-for-install
-                   (lambda _
-                     ;; `make install' wants to install these although they do
-                     ;; not get built...
-                     (with-directory-excursion "cpan"
-                       (mkdir-p "Pod-Usage/blib/script")
-                       (mkdir-p "Pod-Parser/blib/script")
-                       (for-each (lambda (file)
-                                   (call-with-output-file file
-                                     (lambda (port) (display "" port))))
-                                 '("Pod-Usage/blib/script/pod2text"
-                                   "Pod-Usage/blib/script/pod2usage"
-                                   "Pod-Checker/blib/script/podchecker"
-                                   "Pod-Parser/blib/script/podselect"))))))
-               `((replace 'configure
-                   (lambda* (#:key configure-flags #:allow-other-keys)
-                     (format #t "Perl configure flags: ~s~%" configure-flags)
-                     (apply invoke "./Configure" configure-flags)))))
-         (add-after 'install 'remove-extra-references
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out     (assoc-ref outputs "out"))
-                    (libc    (assoc-ref inputs
-                                        ,(if (%current-target-system)
-                                             "cross-libc" "libc")))
-                    (config1 (car (find-files (string-append out "/lib/perl5")
-                                              "^Config_heavy\\.pl$")))
-                    (config2 (find-files (string-append out "/lib/perl5")
-                                         "^Config\\.pm$")))
-               ;; Force the library search path to contain only libc because
-               ;; it is recorded in Config.pm and Config_heavy.pl; we don't
-               ;; want to keep a reference to everything that's in
-               ;; $LIBRARY_PATH at build time (GCC, Binutils, bzip2, file,
-               ;; etc.)
-               (substitute* config1
-                 (("^incpth=.*$")
-                  (string-append "incpth='" libc "/include'\n"))
-                 (("^(libpth|plibpth|libspath)=.*$" _ variable)
-                  (string-append variable "='" libc "/lib'\n")))
+              ;; Build in GNU89 mode to tolerate C++-style comment in libc's
+              ;; <bits/string3.h>.
+              (substitute* "cflags.SH"
+                (("-std=c89")
+                 "-std=gnu89"))))
+          #$@(if (%current-target-system)
+                 #~((add-after 'unpack 'unpack-cross
+                      (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                        (let ((cross-checkout
+                               (assoc-ref native-inputs "perl-cross")))
+                          (rename-file "Artistic" "Artistic.perl")
+                          (rename-file "Copying" "Copying.perl")
+                          (copy-recursively cross-checkout "."))
+                        (let ((bash (search-input-file inputs "bin/bash")))
+                          (substitute* '("Makefile.config.SH"
+                                         "cnf/config.guess"
+                                         "cnf/config.sub"
+                                         "cnf/configure"
+                                         "cnf/configure_misc.sh"
+                                         "miniperl_top")
+                            (("! */bin/sh")
+                             (string-append "! " bash))
+                            ((" /bin/sh")
+                             bash))
+                          (substitute* '("ext/Errno/Errno_pm.PL")
+                            (("\\$cpp < errno.c")
+                             "$Config{cc} -E errno.c")))))
+                    (replace 'configure
+                      (lambda* (#:key configure-flags inputs #:allow-other-keys)
+                        (let* ((store-directory (%store-directory))
+                               (configure-flags
+                                (cons*
+                                 ;; `perl-cross' confuses target and host
+                                 (string-append "--target=" #$(%current-target-system))
+                                 (string-append "--prefix=" #$output)
+                                 (string-append "-Dcc=" #$(%current-target-system) "-gcc")
+                                 "-Dbyteorder=1234"
+                                 (remove (lambda (x) (or (string-prefix? "-d" x)
+                                                         (string-prefix? "-Dcc=" x)))
+                                         configure-flags)))
+                               (bash (assoc-ref inputs "bash-minimal")))
+                          (format (current-error-port)
+                                  "running ./configure ~a\n"
+                                  (string-join configure-flags))
+                          (apply invoke (cons "./configure" configure-flags))
+                          (substitute* "config.sh"
+                            (((string-append store-directory "/[^/]*-bash-[^/]*"))
+                             bash))
+                          (substitute* '("config.h")
+                            (("^#define SH_PATH .*")
+                             (string-append "#define SH_PATH \""
+                                            bash "/bin/bash\"\n"))))))
+                    (add-after 'build 'touch-non-built-files-for-install
+                      (lambda _
+                        ;; `make install' wants to install these although they do
+                        ;; not get built...
+                        (with-directory-excursion "cpan"
+                          (mkdir-p "Pod-Usage/blib/script")
+                          (mkdir-p "Pod-Parser/blib/script")
+                          (for-each (lambda (file)
+                                      (call-with-output-file file
+                                        (lambda (port) (display "" port))))
+                                    '("Pod-Usage/blib/script/pod2text"
+                                      "Pod-Usage/blib/script/pod2usage"
+                                      "Pod-Checker/blib/script/podchecker"
+                                      "Pod-Parser/blib/script/podselect"))))))
+                 #~((replace 'configure
+                      (lambda* (#:key configure-flags #:allow-other-keys)
+                        (format #t "Perl configure flags: ~s~%" configure-flags)
+                        (apply invoke "./Configure" configure-flags)))))
+          (add-after 'install 'remove-extra-references
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let* ((lib-perl5 (string-append #$output "/lib/perl5"))
+                     (libc.so   (search-input-file
+                                 #$(if (%current-target-system)
+                                       #~%build-target-inputs
+                                       #~%build-inputs)
+                                 "/lib/libc.so"))
+                     (libc    (dirname (dirname libc.so)))
+                     (config1 (find-files lib-perl5 "^Config_heavy\\.pl$"))
+                     (config2 (find-files lib-perl5 "^Config\\.pm$")))
+                ;; Force the library search path to contain only libc because
+                ;; it is recorded in Config.pm and Config_heavy.pl; we don't
+                ;; want to keep a reference to everything that's in
+                ;; $LIBRARY_PATH at build time (GCC, Binutils, bzip2, file,
+                ;; etc.)
+                (substitute* (car config1)
+                  (("^incpth=.*$")
+                   (string-append "incpth='" libc "/include'\n"))
+                  (("^(libpth|plibpth|libspath)=.*$" _ variable)
+                   (string-append variable "='" libc "/lib'\n")))
 
-               (for-each (lambda (file)
-                           (substitute* config2
-                             (("libpth => .*$")
-                              (string-append "libpth => '" libc
-                                             "/lib',\n"))))
-                         config2)))))))
+                (substitute* config2
+                  (("libpth => .*$")
+                   (string-append "libpth => '" libc "/lib',\n")))))))))
     (inputs
      (if (%current-target-system)
        (list bash-minimal coreutils-minimal)
@@ -296,46 +295,44 @@ more.")
     (properties `((release-date . "2013-03-10")))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out  (assoc-ref outputs "out"))
-                   (libc (assoc-ref inputs "libc")))
-               ;; Use the right path for `pwd'.
-               (substitute* "dist/Cwd/Cwd.pm"
-                 (("/bin/pwd")
-                  (which "pwd")))
+     (list
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'configure
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((libc (assoc-ref inputs "libc")))
+                ;; Use the right path for `pwd'.
+                (substitute* "dist/Cwd/Cwd.pm"
+                  (("/bin/pwd")
+                   (which "pwd")))
 
-               (invoke "./Configure"
-                       (string-append "-Dprefix=" out)
-                       (string-append "-Dman1dir=" out "/share/man/man1")
-                       (string-append "-Dman3dir=" out "/share/man/man3")
-                       "-de" "-Dcc=gcc"
-                       "-Uinstallusrbinperl"
-                       "-Dinstallstyle=lib/perl5"
-                       "-Duseshrplib"
-                       (string-append "-Dlocincpth=" libc "/include")
-                       (string-append "-Dloclibpth=" libc "/lib")
+                (invoke "./Configure"
+                        (string-append "-Dprefix=" #$output)
+                        (string-append "-Dman1dir=" #$output "/share/man/man1")
+                        (string-append "-Dman3dir=" #$output "/share/man/man3")
+                        "-de" "-Dcc=gcc"
+                        "-Uinstallusrbinperl"
+                        "-Dinstallstyle=lib/perl5"
+                        "-Duseshrplib"
+                        (string-append "-Dlocincpth=" libc "/include")
+                        (string-append "-Dloclibpth=" libc "/lib")
 
-                       ;; Force the library search path to contain only libc
-                       ;; because it is recorded in Config.pm and
-                       ;; Config_heavy.pl; we don't want to keep a reference
-                       ;; to everything that's in $LIBRARY_PATH at build
-                       ;; time (Binutils, bzip2, file, etc.)
-                       (string-append "-Dlibpth=" libc "/lib")
-                       (string-append "-Dplibpth=" libc "/lib")))))
+                        ;; Force the library search path to contain only libc
+                        ;; because it is recorded in Config.pm and
+                        ;; Config_heavy.pl; we don't want to keep a reference
+                        ;; to everything that's in $LIBRARY_PATH at build
+                        ;; time (Binutils, bzip2, file, etc.)
+                        (string-append "-Dlibpth=" libc "/lib")
+                        (string-append "-Dplibpth=" libc "/lib")))))
 
-         (add-before 'strip 'make-shared-objects-writable
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; The 'lib/perl5' directory contains ~50 MiB of .so.  Make them
-             ;; writable so that 'strip' actually strips them.
-             (let* ((out (assoc-ref outputs "out"))
-                    (lib (string-append out "/lib")))
-               (for-each (lambda (dso)
-                           (chmod dso #o755))
-                         (find-files lib "\\.so$"))))))))
+          (add-before 'strip 'make-shared-objects-writable
+            (lambda _
+              ;; The 'lib/perl5' directory contains ~50 MiB of .so.  Make them
+              ;; writable so that 'strip' actually strips them.
+              (for-each
+               (lambda (dso) (chmod dso #o755))
+               (find-files (string-append #$output "/lib") "\\.so$")))))))
     (native-inputs
      (list gcc-7))
     (native-search-paths (list (search-path-specification
@@ -366,55 +363,55 @@ more.")
                   (hidden? . #t))) ;only for GHC 4.
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out  (assoc-ref outputs "out"))
-                   (libc (assoc-ref inputs "libc")))
-               ;; Use the right path for `pwd'.
-               (substitute* "lib/Cwd.pm"
-                 (("/bin/pwd")
-                  (which "pwd")))
+     (list
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'configure
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((libc (assoc-ref inputs "libc")))
+                ;; Use the right path for `pwd'.
+                (substitute* "lib/Cwd.pm"
+                  (("/bin/pwd")
+                   (which "pwd")))
 
-               (invoke "./Configure"
-                       (string-append "-Dprefix=" out)
-                       (string-append "-Dman1dir=" out "/share/man/man1")
-                       (string-append "-Dman3dir=" out "/share/man/man3")
-                       "-de" "-Dcc=gcc -std=c90"
-                       "-Uinstallusrbinperl"
-                       "-Dinstallstyle=lib/perl5"
-                       "-Duseshrplib"
-                       (string-append "-Dlocincpth=" libc "/include")
-                       (string-append "-Dloclibpth=" libc "/lib")
+                (invoke "./Configure"
+                        (string-append "-Dprefix=" #$output)
+                        (string-append "-Dman1dir=" #$output "/share/man/man1")
+                        (string-append "-Dman3dir=" #$output "/share/man/man3")
+                        "-de" "-Dcc=gcc -std=c90"
+                        "-Uinstallusrbinperl"
+                        "-Dinstallstyle=lib/perl5"
+                        "-Duseshrplib"
+                        (string-append "-Dlocincpth=" libc "/include")
+                        (string-append "-Dloclibpth=" libc "/lib")
 
-                       ;; Force the library search path to contain only libc
-                       ;; because it is recorded in Config.pm and
-                       ;; Config_heavy.pl; we don't want to keep a reference
-                       ;; to everything that's in $LIBRARY_PATH at build
-                       ;; time (Binutils, bzip2, file, etc.)
-                       (string-append "-Dlibpth=" libc "/lib")
-                       (string-append "-Dplibpth=" libc "/lib")))))
-         (add-after 'configure 'bleh
-           (lambda _
-             (substitute* '("makefile"
-                            "x2p/makefile")
-               ((".*\\<command-line>.*") ""))
-             ;; Don't look for /usr/include/errno.h.
-             (substitute* "ext/Errno/Errno_pm.PL"
-               (("O eq 'linux'") "O eq 'loonix'"))
-             (substitute* "ext/IPC/SysV/SysV.xs"
-               ((".*asm/page.h.*") ""))))
-         (add-before 'strip 'make-shared-objects-writable
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; The 'lib/perl5' directory contains ~50 MiB of .so.  Make them
-             ;; writable so that 'strip' actually strips them.
-             (let* ((out (assoc-ref outputs "out"))
-                    (lib (string-append out "/lib")))
-               (for-each (lambda (dso)
-                           (chmod dso #o755))
-                         (find-files lib "\\.so$"))))))))
+                        ;; Force the library search path to contain only libc
+                        ;; because it is recorded in Config.pm and
+                        ;; Config_heavy.pl; we don't want to keep a reference
+                        ;; to everything that's in $LIBRARY_PATH at build
+                        ;; time (Binutils, bzip2, file, etc.)
+                        (string-append "-Dlibpth=" libc "/lib")
+                        (string-append "-Dplibpth=" libc "/lib")))))
+          (add-after 'configure 'bleh
+            (lambda _
+              (substitute* '("makefile" "x2p/makefile")
+                ((".*\\<command-line>.*")
+                 ""))
+              ;; Don't look for /usr/include/errno.h.
+              (substitute* "ext/Errno/Errno_pm.PL"
+                (("O eq 'linux'")
+                 "O eq 'loonix'"))
+              (substitute* "ext/IPC/SysV/SysV.xs"
+                ((".*asm/page.h.*")
+                 ""))))
+          (add-before 'strip 'make-shared-objects-writable
+            (lambda _
+              ;; The 'lib/perl5' directory contains ~50 MiB of .so.  Make them
+              ;; writable so that 'strip' actually strips them.
+              (for-each
+               (lambda (dso) (chmod dso #o755))
+               (find-files (string-append #$output "/lib") "\\.so$")))))))
     (native-inputs '())))
 
 (define-public perl-algorithm-c3

gnu/packages/pkg-config.scm

@@ -205,28 +205,3 @@ provides access to most of pkgconf's functionality, to allow other tooling
 such as compilers and IDEs to discover and use libraries configured by
 pkgconf.")
     (license isc)))
-
-(define-public pkgconf-as-pkg-config
-  (package/inherit pkgconf
-    (name "pkgconf-as-pkg-config")
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)
-          (delete 'build)
-          (replace 'install
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((pkgconf (search-input-file inputs "bin/pkgconf")))
-                (mkdir-p (string-append #$output "/bin"))
-                (symlink pkgconf (string-append #$output "/bin/pkg-config"))
-                ;; Also make 'pkg.m4' available, some packages might expect it.
-                (mkdir-p (string-append #$output "/share"))
-                (symlink (string-append (dirname (dirname pkgconf))
-                                        "/share/aclocal")
-                         (string-append #$output "/share/aclocal"))))))))
-    (native-inputs '())
-    (inputs (list pkgconf))
-    (propagated-inputs '())))