gnu: libsigsegv: Update to 2.15.

* gnu/packages/libsigsegv.scm (libsigsegv): Update to 2.15.

Change-Id: Ie0bc45e925bfc41d5fe0a9d05d854fdfcd8ae50b
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

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

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	\
@@ -1824,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			\

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/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"))
+                "0xb64rhambx6mhxwr613xgyad7ybs5hgmpmd9gccf2vbcrh5h7zq"))))
-              (patches (search-patches "libtool-skip-tests2.patch"
-                                       "libtool-grep-compat.patch"))))
     (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.
+     (list ;; Libltdl is provided as a separate package, so don't install it here.
-       #:configure-flags '("--disable-ltdl-install")
+           #:configure-flags #~'("--disable-ltdl-install")
 
-       ;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
+           ;; The 'libtool' script refers to the toolchain; tolerate it.
-       ;; <http://hydra.gnu.org/build/181662>.
+           #:disallowed-references '()
-       ;; Also, do not run tests when cross compiling
-       #:tests? ,(not (or (%current-target-system)
-                          (string-prefix? "mips64"
-                                          (%current-system))))
 
-       #:phases
+           ;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
-       (modify-phases %standard-phases
+           ;; <http://hydra.gnu.org/build/181662>.
-         (add-before 'check 'pre-check
+           ;; Also, do not run tests when cross compiling
-           (lambda* (#:key inputs native-inputs parallel-tests? #:allow-other-keys)
+           #:tests? (not (or (%current-target-system)
-             ;; Run the test suite in parallel, if possible.
+                             (string-prefix? "mips64"
-             (setenv "TESTSUITEFLAGS"
+                                             (%current-system))))
-                     (string-append
+
-                      "-j"
+           #:phases
-                      (if parallel-tests?
+           #~(modify-phases %standard-phases
-                        (number->string (parallel-job-count))
+               (add-after 'unpack 'skip-some-tests-on-extra-archs
-                        "1")))
+                 (lambda _
-           ;; Patch references to /bin/sh.
+                   (with-directory-excursion "tests"
-           (let ((/bin/sh (search-input-file (or native-inputs inputs) "bin/sh")))
+                     (substitute* '("demo.at" "testsuite")
-             (substitute* "tests/testsuite"
+                       (("hppa\\*\\|amd64\\*\\|x86_64\\*\\|s390\\*"
-               (("/bin/sh") /bin/sh)))))
+                         all)
-         ;; These files may be copied into source trees by libtoolize,
+                        (string-append all "|arm*|mips*|riscv*"))))))
-         ;; therefore they must not point to store file names that would be
+               (add-before 'check 'pre-check
-         ;; leaked with tarballs generated by make dist.
+                 (lambda* (#:key inputs native-inputs parallel-tests?
-         (add-after 'install 'restore-build-aux-shebang
+                           #:allow-other-keys)
-           (lambda* (#:key outputs #:allow-other-keys)
+                   ;; Run the test suite in parallel, if possible.
-             (let* ((out (assoc-ref outputs "out"))
+                   (setenv "TESTSUITEFLAGS"
-                    (dir (string-append out "/share/libtool/build-aux")))
+                           (string-append
-               (for-each (lambda (file)
+                            "-j"
-                           (format #t "restoring shebang on `~a'~%" file)
+                            (if parallel-tests?
-                           (substitute* file
+                                (number->string (parallel-job-count))
-                             (("^#!.*/bin/sh") "#!/bin/sh")))
+                                "1")))
-                         (find-files dir))))))))
+                   ;; 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
+    (append
-          ((target-hurd?)
+     (cond
-           '(#:make-flags
+      ((target-hurd?)
-             (list (string-append
+       '(#:make-flags
-                     "TESTSUITEFLAGS= -k '"
+         (list (string-append
-                     "!sparse"
+                "TESTSUITEFLAGS= -k '"
-                     ",!renamed dirs in incrementals"
+                "!sparse"
-                     ",!--exclude-tag option in incremental pass"
+                ",!renamed dirs in incrementals"
-                     ",!incremental dumps with -C"
+                ",!--exclude-tag option in incremental pass"
-                     ",!incremental dumps of nested directories"
+                ",!incremental dumps with -C"
-                     ",!incremental restores with -C"
+                ",!incremental dumps of nested directories"
-                     ",!concatenated incremental archives (renames)"
+                ",!incremental restores with -C"
-                     ",!renamed directory containing subdirectories"
+                ",!concatenated incremental archives (renames)"
-                     ",!renamed subdirectories"
+                ",!renamed directory containing subdirectories"
-                     ",!chained renames"
+                ",!renamed subdirectories"
-                     ",!Directory"
+                ",!chained renames"
-                     "'"))))
+                ",!Directory"
-          ;; 'storing sparse files > 8G' fails on powerpc-linux, likely
+                "'"))))
-          ;; due to the small HDD and RAM present on these devices.
+      ;; 'storing sparse files > 8G' fails on powerpc-linux, likely
-          ((target-ppc32?)
+      ;; due to the small HDD and RAM present on these devices.
-           '(#:make-flags (list (string-append "TESTSUITEFLAGS= -k "
+      ((target-ppc32?)
-                                               "'!tricky time stamps"
+       '(#:make-flags (list (string-append "TESTSUITEFLAGS= -k "
-                                               ",!storing sparse files > 8G'"))))
+                                           "'!tricky time stamps"
-          ;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
+                                           ",!storing sparse files > 8G'"))))
-          ;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
+      ;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
-          ;; skipping the test for this release on 32-bit systems.
+      ;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
-          ((target-32bit?)
+      ;; skipping the test for this release on 32-bit systems.
-           '(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
+      ((not (target-64bit?))
-          (else '()))
+       '(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
-      ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
+      (else '()))
-      ,@(if (target-hurd32?)
+     ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
-            (list #:configure-flags ''("--disable-year2038"))
+     (if (target-hurd32?)
-            '())
+         (list #:configure-flags #~(list "--disable-year2038"))
-      #:phases (modify-phases %standard-phases
+         '())
-                 (add-before 'build 'set-shell-file-name
+     (list
-                   (lambda* (#:key inputs #:allow-other-keys)
+      #:phases
-                     ;; Do not use "/bin/sh" to run programs.
+      #~(modify-phases %standard-phases
-                     (let ((bash (assoc-ref inputs "bash")))
+          (add-before 'build 'set-shell-file-name
-                       (substitute* "src/system.c"
+            (lambda* (#:key inputs #:allow-other-keys)
-                         (("/bin/sh")
+              ;; Do not use "/bin/sh" to run programs.
-                          (string-append bash "/bin/sh")))))))))
+              (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)
+     (list
-       ((#:configure-flags flags #~'())
+      #:configure-flags
-        (if (target-hurd32?)
+      #~(append
-            #~(cons* "--disable-year2038"
+         (if #$(%current-target-system)
-                     #$flags)
+             (list "gl_cv_func_working_mktime=yes")
-            flags))))
+             '())
+         (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
@@ -632,20 +616,21 @@ standard.")
    (inputs (list guile-3.0))
    (outputs '("out" "debug"))
    (arguments
-    `(,@(if (target-hurd?)
+    (append
-            '(#:configure-flags '("CFLAGS=-D__alloca=alloca"
+     (if (target-hurd?)
-                                  "ac_cv_func_posix_spawn=no"))
+         (list #:configure-flags '("CFLAGS=-D__alloca=alloca"
-            '())
+                                   "ac_cv_func_posix_spawn=no"))
+         (list))
+     (list
       #:phases
-      (modify-phases %standard-phases
+      #~(modify-phases %standard-phases
-        (add-before 'build 'set-default-shell
+          (add-before 'build 'set-default-shell
-          (lambda* (#:key inputs #:allow-other-keys)
+            (lambda* (#:key inputs #:allow-other-keys)
-            ;; Change the default shell from /bin/sh.
+              ;; Change the default shell from /bin/sh.
-            (let ((bash (assoc-ref inputs "bash")))
               (substitute* "src/job.c"
                 (("default_shell =.*$")
-                 (format #f "default_shell = \"~a/bin/sh\";\n"
+                 (format #f "default_shell = \"~a\";\n"
-                         bash)))))))))
+                         (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 +654,17 @@ change.  GNU make offers many powerful extensions over the standard utility.")
                (base32
                 "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"))))
     (arguments
-     `(#:configure-flags '("CFLAGS=-D__alloca=alloca -D__stat=stat")
+     (list
-       #:phases
+      #:configure-flags #~(list "CFLAGS=-D__alloca=alloca -D__stat=stat")
-       (modify-phases %standard-phases
+      #:phases
-         (add-before 'build 'set-default-shell
+      #~(modify-phases %standard-phases
-           (lambda* (#:key inputs #:allow-other-keys)
+          (add-before 'build 'set-default-shell
-             ;; Change the default shell from /bin/sh.
+            (lambda* (#:key inputs #:allow-other-keys)
-             (let ((bash (assoc-ref inputs "bash")))
+              ;; Change the default shell from /bin/sh.
-               (substitute* "job.c"
+              (substitute* "job.c"
-                 (("default_shell =.*$")
+                (("default_shell =.*$")
-                  (format #f "default_shell = \"~a/bin/sh\";\n"
+                 (format #f "default_shell = \"~a\";\n"
-                          bash)))))))))))
+                         (search-input-file inputs "/bin/sh")))))))))))
 
 (define-public binutils
   (package
@@ -693,6 +678,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 +714,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 +895,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 +945,257 @@ 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
+     ;; 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
+     ;; libraries (libdl-2.24.so, etc.) have ld.so marked as NEEDED.  Since
-      ;; these libraries are always going to be found anyway, just skip
+     ;; these libraries are always going to be found anyway, just skip
-      ;; RUNPATH checks.
+     ;; RUNPATH checks.
-      #:validate-runpath? #f
+     #: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:
+     ;; Strip binaries but preserve the symbol table needed by Valgrind:
-      ;; <https://lists.gnu.org/archive/html/help-guix/2022-03/msg00036.html>.
+     ;; <https://lists.gnu.org/archive/html/help-guix/2022-03/msg00036.html>.
-      #:strip-flags '("--strip-debug")
+     #:strip-flags #~'("--strip-debug")
 
-      #:configure-flags
+     #:configure-flags
-      (list "--sysconfdir=/etc"
+     #~(list "--sysconfdir=/etc"
 
-            ;; Installing a locale archive with all the locales is to
+             ;; Installing a locale archive with all the locales is to
-            ;; expensive (~100 MiB), so we rely on users to install the
+             ;; expensive (~100 MiB), so we rely on users to install the
-            ;; locales they really want.
+             ;; locales they really want.
-            ;;
+             ;;
-            ;; Set the default locale path.  In practice, $LOCPATH may be
+             ;; Set the default locale path.  In practice, $LOCPATH may be
-            ;; defined to point whatever locales users want.  However, setuid
+             ;; defined to point whatever locales users want.  However, setuid
-            ;; binaries don't honor $LOCPATH, so they'll instead look into
+             ;; binaries don't honor $LOCPATH, so they'll instead look into
-            ;; $libc_cv_complocaledir; we choose /run/current-system/locale/X.Y,
+             ;; $libc_cv_complocaledir; we choose /run/current-system/locale/X.Y,
-            ;; with the idea that it is going to be populated by the sysadmin.
+             ;; with the idea that it is going to be populated by the sysadmin.
-            ;; The "X.Y" sub-directory is because locale data formats are
+             ;; The "X.Y" sub-directory is because locale data formats are
-            ;; incompatible across libc versions; see
+             ;; incompatible across libc versions; see
-            ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>.
+             ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>.
-            ;;
+             ;;
-            ;; `--localedir' is not honored, so work around it.
+             ;; `--localedir' is not honored, so work around it.
-            ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
+             ;; See <http://sourceware.org/ml/libc-alpha/2013-03/msg00093.html>.
-            (string-append "libc_cv_complocaledir=/run/current-system/locale/"
+             (string-append "libc_cv_complocaledir=/run/current-system/locale/"
-                           ,(version-major+minor version))
+                            #$(version-major+minor version))
 
-            (string-append "--with-headers="
+             ;; Here we need to refer to kernel headers and not glibc-mesboot
-                           (assoc-ref ,(if (%current-target-system)
+             (string-append
-                                           '%build-target-inputs
+              "--with-headers="
-                                           '%build-inputs)
+              (and=>
-                                      "kernel-headers")
+               (find
-                           "/include")
+                (match-lambda
+                  ((label . input)
+                   (and (file-exists?
+                         (string-append input "/include/asm/ioctl.h"))
+                        ;; 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,
+             ;; This is the default for most architectures as of GNU libc 2.26,
-            ;; but we specify it explicitly for clarity and consistency.  See
+             ;; but we specify it explicitly for clarity and consistency.  See
-            ;; "kernel-features.h" in the GNU libc for details.
+             ;; "kernel-features.h" in the GNU libc for details.
-            "--enable-kernel=3.2.0"
+             "--enable-kernel=3.2.0"
 
-            ;; Use our Bash instead of /bin/sh.
+             ;; Use our Bash instead of /bin/sh.
-            (string-append "BASH_SHELL="
+             (string-append "BASH_SHELL="
-                           (assoc-ref %build-inputs "bash")
+                            (search-input-file %build-inputs "/bin/bash"))
-                           "/bin/bash")
 
-            ;; On GNU/Hurd we get discarded-qualifiers warnings for
+             ;; On GNU/Hurd we get discarded-qualifiers warnings for
-            ;; 'device_write_inband' among other things.  Ignore them.
+             ;; 'device_write_inband' among other things.  Ignore them.
-            ,@(if (target-hurd?)
+             #$@(if (target-hurd?)
-                  `("--disable-werror")
+                    #~("--disable-werror")
-                  '()))
+                    #~()))
 
-      #:tests? #f                                 ; XXX
+     #:tests? #f ; XXX
-      #:phases (modify-phases %standard-phases
+     #:phases
-                 (add-before
+     #~(modify-phases %standard-phases
-                  'configure 'pre-configure
+         (add-before 'configure 'pre-configure
-                  (lambda* (#:key inputs native-inputs outputs
+           (lambda* (#:key inputs native-inputs #:allow-other-keys)
-                                  #:allow-other-keys)
+             (let* ((bin (string-append #$output "/bin"))
-                    (let* ((out  (assoc-ref outputs "out"))
+                    (bash (find
-                           (bin  (string-append out "/bin"))
+                           (match-lambda
-                           ;; FIXME: Normally we would look it up only in INPUTS
+                             ((label . input)
-                           ;; but cross-base uses it as a native input.
+                              (let ((sh (string-append input "/bin/sh")))
-                           (bash (or (assoc-ref inputs "static-bash")
+                                (and (file-exists? sh)
-                                     (assoc-ref native-inputs "static-bash"))))
+                                     ;; Is it bash-static specifically? The
-                      ;; Install the rpc data base file under `$out/etc/rpc'.
+                                     ;; label can't be used because of
-                      (substitute* "inet/Makefile"
+                                     ;; bash-mesboot during the bootstrap.
-                        (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
+                                     (not (file-dynamic-info sh))))))
-                         (string-append out "/etc/rpc" suffix "\n"))
+                           inputs))
-                        (("^install-others =.*$")
+                    (bash (and=> bash cdr)))
-                         (string-append "install-others = " out "/etc/rpc\n")))
+               ;; 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"
+               (substitute* "Makeconfig"
-                        ;; According to
+                 ;; According to
-                        ;; <http://www.linuxfromscratch.org/lfs/view/stable/chapter05/glibc.html>,
+                 ;; <http://www.linuxfromscratch.org/lfs/view/stable/chapter05/glibc.html>,
-                        ;; linking against libgcc_s is not needed with GCC
+                 ;; linking against libgcc_s is not needed with GCC
-                        ;; 4.7.1.
+                 ;; 4.7.1.
-                        ((" -lgcc_s") ""))
+                 ((" -lgcc_s") ""))
 
-                      ;; Tell the ld.so cache code where the store is.
+               ;; Tell the ld.so cache code where the store is.
-                      (substitute* "elf/dl-cache.c"
+               (substitute* "elf/dl-cache.c"
-                        (("@STORE_DIRECTORY@")
+                 (("@STORE_DIRECTORY@")
-                         (string-append "\"" (%store-directory) "\"")))
+                  (string-append "\"" (%store-directory) "\"")))
 
-                      ;; Have `system' use that Bash.
+               ;; Have `system' use that Bash.
-                      (substitute* "sysdeps/posix/system.c"
+               (substitute* "sysdeps/posix/system.c"
-                        (("#define[[:blank:]]+SHELL_PATH.*$")
+                 (("#define[[:blank:]]+SHELL_PATH.*$")
-                         (format #f "#define SHELL_PATH \"~a/bin/bash\"\n"
+                  (format #f "#define SHELL_PATH \"~a/bin/bash\"\n" bash)))
-                                 bash)))
 
-                      ;; Same for `popen'.
+               ;; Same for `popen'.
-                      (substitute* "libio/iopopen.c"
+               (substitute* "libio/iopopen.c"
-                        (("/bin/sh")
+                 (("/bin/sh")
-                         (string-append bash "/bin/sh")))
+                  (string-append bash "/bin/sh")))
 
-                      ;; Same for the shell used by the 'exec' functions for
+               ;; Same for the shell used by the 'exec' functions for
-                      ;; scripts that lack a shebang.
+               ;; scripts that lack a shebang.
-                      (substitute* (find-files "." "^paths\\.h$")
+               (substitute* (find-files "." "^paths\\.h$")
-                        (("#define[[:blank:]]+_PATH_BSHELL[[:blank:]].*$")
+                 (("#define[[:blank:]]+_PATH_BSHELL[[:blank:]].*$")
-                         (string-append "#define _PATH_BSHELL \""
+                  (string-append "#define _PATH_BSHELL \""
-                                        bash "/bin/sh\"\n")))
+                                 bash "/bin/sh\"\n")))
 
-                      ;; Make sure we don't retain a reference to the
+               ;; Make sure we don't retain a reference to the
-                      ;; bootstrap Perl.
+               ;; bootstrap Perl.
-                      (substitute* "malloc/mtrace.pl"
+               (substitute* "malloc/mtrace.pl"
-                        (("^#!.*")
+                 (("^#!.*")
-                         ;; The shebang can be omitted, because there's the
+                  ;; The shebang can be omitted, because there's the
-                         ;; "bilingual" eval/exec magic at the top of the file.
+                  ;; "bilingual" eval/exec magic at the top of the file.
-                         "")
+                  "")
-                        (("exec @PERL@")
+                 (("exec @PERL@")
-                         "exec perl")))))
+                  "exec perl")))))
 
-                 (add-after 'install 'move-static-libs
+         (add-after 'install 'move-static-libs
-                   (lambda* (#:key outputs #:allow-other-keys)
+           (lambda _
-                     ;; Move static libraries to the "static" output.
+             ;; Move static libraries to the "static" output.
-                     ;; Note: As of GNU libc 2.34, the contents of some ".a"
+             ;; Note: As of GNU libc 2.34, the contents of some ".a"
-                     ;; files have been moved into "libc.so", and *both* empty
+             ;; files have been moved into "libc.so", and *both* empty
-                     ;; ".so" and ".a" files have been introduced to avoid
+             ;; ".so" and ".a" files have been introduced to avoid
-                     ;; breaking existing executables and existing builds
+             ;; breaking existing executables and existing builds
-                     ;; respectively.  The intent of the seemingly redundant
+             ;; respectively.  The intent of the seemingly redundant
-                     ;; empty ".a" files is to avoid newly-compiled executables
+             ;; empty ".a" files is to avoid newly-compiled executables
-                     ;; from having dependencies on the empty shared libraries,
+             ;; from having dependencies on the empty shared libraries,
-                     ;; and as such, it is useful to have these ".a" files in
+             ;; and as such, it is useful to have these ".a" files in
-                     ;; OUT in addition to STATIC.
+             ;; OUT in addition to STATIC.
 
-                     (define (empty-static-library? file)
+             (define (empty-static-library? file)
-                       ;; Return true if FILE is an 'ar' archive with nothing
+               ;; Return true if FILE is an 'ar' archive with nothing
-                       ;; beyond the header.
+               ;; beyond the header.
-                       (let ((file (string-append (assoc-ref outputs "out")
+               (let ((file (string-append #$output "/lib/" file)))
-                                                  "/lib/" file)))
+                 (and (ar-file? file)
-                         (and (ar-file? file)
+                      (= (stat:size (stat file)) 8))))
-                              (= (stat:size (stat file)) 8))))
 
-                     (define (static-library? file)
+             (define (static-library? file)
-                       ;; Return true if FILE is a static library.  The
+               ;; Return true if FILE is a static library.  The
-                       ;; "_nonshared.a" files are referred to by libc.so,
+               ;; "_nonshared.a" files are referred to by libc.so,
-                       ;; libpthread.so, etc., which are in fact linker
+               ;; libpthread.so, etc., which are in fact linker
-                       ;; scripts.
+               ;; scripts.
-                       (and (string-suffix? ".a" file)
+               (and (string-suffix? ".a" file)
-                            (not (string-contains file "_nonshared"))
+                    (not (string-contains file "_nonshared"))
-                            (not (empty-static-library? file))))
+                    (not (empty-static-library? file))))
 
-                     (define (linker-script? file)
+             (define (linker-script? file)
-                       ;; Guess whether FILE, a ".a" file, is actually a
+               ;; Guess whether FILE, a ".a" file, is actually a
-                       ;; linker script.
+               ;; linker script.
-                       (and (not (ar-file? file))
+               (and (not (ar-file? file))
-                            (not (elf-file? file))))
+                    (not (elf-file? file))))
 
-                     (let* ((out    (assoc-ref outputs "out"))
+             (let* ((lib (string-append #$output "/lib"))
-                            (lib    (string-append out "/lib"))
+                    (files (scandir lib static-library?))
-                            (files  (scandir lib static-library?))
+                    (empty (scandir lib empty-static-library?))
-                            (empty  (scandir lib empty-static-library?))
+                    (slib (string-append #$output:static "/lib")))
-                            (static (assoc-ref outputs "static"))
+               (mkdir-p slib)
-                            (slib   (string-append static "/lib")))
+               (for-each (lambda (base)
-                       (mkdir-p slib)
+                           (rename-file (string-append lib "/" base)
-                       (for-each (lambda (base)
+                                        (string-append slib "/" base)))
-                                   (rename-file (string-append lib "/" base)
+                         files)
-                                                (string-append slib "/" base)))
+               (for-each (lambda (base)
-                                 files)
+                           (copy-file (string-append lib "/" base)
-                       (for-each (lambda (base)
+                                      (string-append slib "/" base)))
-                                   (copy-file (string-append lib "/" base)
+                         empty)
-                                              (string-append slib "/" base)))
-                                 empty)
 
-                       ;; Usually libm.a is a linker script so we need to
+               ;; Usually libm.a is a linker script so we need to
-                       ;; change the file names in there to refer to STATIC
+               ;; change the file names in there to refer to STATIC
-                       ;; instead of OUT.
+               ;; instead of OUT.
-                       (for-each (lambda (ld-script)
+               (for-each (lambda (ld-script)
-                                   (substitute* ld-script
+                           (substitute* ld-script
-                                     ((out) static)))
+                             ((#$output)
-                                 (filter linker-script?
+                              #$output:static)))
-                                         (map (cut string-append slib "/" <>)
+                         (filter linker-script?
-                                              files))))))
+                                 (map (cut string-append slib "/" <>)
+                                      files))))))
 
-                 (add-after 'install 'install-utf8-c-locale
+         (add-after 'install 'install-utf8-c-locale
-                   (lambda* (#:key outputs #:allow-other-keys)
+           (lambda _
-                     ;; Install the C.UTF-8 locale so there's always a UTF-8
+             ;; Install the C.UTF-8 locale so there's always a UTF-8
-                     ;; locale around.
+             ;; locale around.
-                     (let* ((out (assoc-ref outputs "out"))
+             (let ((bin (string-append #$output "/bin"))
-                            (bin (string-append out "/bin"))
+                   (locale (string-append #$output "/lib/locale/"
-                            (locale (string-append out "/lib/locale/"
+                                          #$(package-version
-                                                   ,(package-version
+                                             this-package))))
-                                                     this-package))))
+               (mkdir-p locale)
-                       (mkdir-p locale)
 
-                       ;; FIXME: When cross-compiling, attempt to use
+               ;; FIXME: When cross-compiling, attempt to use
-                       ;; 'localedef' from the same libc version.
+               ;; 'localedef' from the same libc version.
-                       (invoke ,(if (%current-target-system)
+               (invoke #$(if (%current-target-system)
-                                    "true"
+                             "true"
-                                    '(string-append bin "/localedef"))
+                             #~(string-append bin "/localedef"))
-                               "--no-archive" "--prefix" locale
+                       "--no-archive" "--prefix" locale
-                               "-i" "C" "-f" "UTF-8"
+                       "-i" "C" "-f" "UTF-8"
-                               (string-append locale "/C.UTF-8")))))
+                       (string-append locale "/C.UTF-8")))))
 
-                 ,@(if (target-hurd?)
+         #$@(if (target-hurd?)
-                       `((add-after 'install 'augment-libc.so
+                `((add-after 'install 'augment-libc.so
-                           (lambda* (#:key outputs #:allow-other-keys)
+                    (lambda _
-                             (let ((out (assoc-ref outputs "out")))
+                      (substitute* (string-append #$output "/lib/libc.so")
-                               (substitute* (string-append out "/lib/libc.so")
+                        (("/[^ ]+/lib/libc.so.0.3")
-                                 (("/[^ ]+/lib/libc.so.0.3")
+                         (string-append #$output "/lib/libc.so.0.3"
-                                  (string-append out "/lib/libc.so.0.3"
+                                        " libmachuser.so libhurduser.so")))))
-                                                 " libmachuser.so libhurduser.so"))))))
+                  (add-after 'install 'create-machine-symlink
-                         (add-after 'install 'create-machine-symlink
+                    (lambda _
-                           (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((cpu #$(match (or (%current-target-system)
-                             (let* ((out (assoc-ref outputs "out"))
+                                               (%current-system))
-                                    (cpu ,(match (or (%current-target-system)
+                                      ((? target-x86-32?)
-                                                     (%current-system))
+                                       "i386")
-                                            ((? target-x86-32?)
+                                      ((? target-x86-64?)
-                                             "i386")
+                                       "x86_64")))
-                                            ((? target-x86-64?)
+                             (machine (string-append #$output
-                                             "x86_64")))
+                                                     "/include/mach/machine")))
-                                    (machine (string-append
+                        (unless (file-exists? machine)
-                                              out "/include/mach/machine")))
+                          (symlink cpu 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)
+   (native-inputs
-                    ("perl" ,perl)
+    (append
-                    ("bison" ,bison)
+     (list bison
-                    ("gettext" ,gettext-minimal)
+           gettext-minimal
-                    ("python" ,python-minimal)
+           perl
-
+           python-minimal
-                    ,@(if (target-hurd?)
+           texinfo)
-                          `(("mig" ,mig)
+     (if (target-hurd?)
-                            ("perl" ,perl))
+         (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 +1298,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
+        #~(modify-phases #$phases
-           (delete 'install-utf8-c-locale)))))))
+            (delete 'install-utf8-c-locale)))))))
 
 (define-public glibc-2.33
   (package
@@ -1342,9 +1340,9 @@ with the Linux kernel.")
                  "libc_cv_cxx_link_ok=no"
                  #$flags))
        ((#:phases phases)
-        `(modify-phases ,phases
+        #~(modify-phases #$phases
-           ;; This phase fails trying to create /etc/ld.so.cache
+            ;; This phase fails trying to create /etc/ld.so.cache
-           (delete 'install-utf8-c-locale)))))))
+            (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
+(define %patch-series-5.3
-  ;; This is the current patches series for 5.2, generated using
+  ;; This is the current patches series for 5.3, generated using
   ;; 'download-patches' below.
   (patch-series
-   (1 "02iibpd3jq8p1bhdzgik8ps6gi1145vr463a82gj1hivjbp2ybzl")
+   (1 "0zr8wgg1gb67vxn7ws971n1znrdinczymc688ndnpy2a6qs88q0z")
-   (2 "1f6p1z85qh1lavdp3xikgp0bfv0vqhvgpgwmdzlywl35hwdmxk25")
+   (2 "009051z55plsy4jmmjdb3ys7li2jraynz99qg7n6a1qk025591g3")
-   (3 "1zxsi869jd90hksx3nyypgyqwrxhw2ws3r6hmk76yc1lsgdhq2ba")
+   (3 "1vb0gnrkmz49rcfpxjcxy0v0k5278wrlkljk9gc20nizvk3xjigj")))
-   (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")))
 
 (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))))
+                             %patch-series-5.3))))
-     (version (string-append version "." (number->string (length %patch-series-5.2))))
+     (version (string-append version "." (number->string (length %patch-series-5.3))))
      (build-system gnu-build-system)
 
       (outputs '("out"

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 licenses) #:prefix license:)
-  #:use-module (guix packages)
+  #:use-module (gnu packages flex)
-  #:use-module (guix download)
-  #:use-module (guix utils)
-  #:use-module (guix build-system gnu)
   #: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
+     (list
-       ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or
+      ;; Building in parallel on many-core systems may cause an error such as
-       ;; directory".  See <https://bugs.gnu.org/36238>.
+      ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or
-       #:parallel-build? #f
+      ;; directory".  See <https://bugs.gnu.org/36238>.
-       ;; Similarly, when building tests in parallel, Make may produce this error:
+      #:parallel-build? #f
-       ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file
+      ;; Similarly, when building tests in parallel, Make may produce this error:
-       ;; or directory".  Full log in <https://bugs.gnu.org/36238>.
+      ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file
-       #:parallel-tests? #f
+      ;; or directory".  Full log in <https://bugs.gnu.org/36238>.
-       ;; On the Hurd with glibc 2.41 bison uses weak symbols from pthread
+      #:parallel-tests? #f
-       ;; but does not link to it.
+      #:configure-flags
-       ,@(if (target-hurd?)
+      ;; On the Hurd with glibc 2.41 bison uses weak symbols from pthread
-             (list #:configure-flags ''("LIBS=-lpthread"))
+      ;; but does not link to it.
-             '())))
+      (if (target-hurd?)
-    (native-inputs (list perl
+          #~(list "LIBS=-lpthread")
-                         ;; m4 is not present in PATH when cross-building.
+          #~(list))))
-                         m4))
+    (native-inputs
-    (inputs (list flex))
+     (list perl
-    (propagated-inputs (list m4))
+           ;; 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
+           (file-name (string-append "bootstrap-" program))
-           ;; (string-append "bootstrap-" program), and drop the additional
-           ;; file-name argument.
-           (file-name file-name)
            (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
+     (list
-       #:modules ((guix build utils))
+      #:guile %bootstrap-guile
-       #:builder
+      #:modules '((guix build utils))
-       (begin
+      #:builder
-         (use-modules (guix build utils))
+      #~(begin
+          (use-modules (guix build utils))
 
-         (let ((out     (assoc-ref %outputs "out"))
+          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
-              (tar     (assoc-ref %build-inputs "tar"))
+                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
-              (xz      (assoc-ref %build-inputs "xz"))
+                (tarball (assoc-ref %build-inputs
-              (tarball (assoc-ref %build-inputs "tarball")))
+                                    #$(string-append name ".tar.xz"))))
 
-          (mkdir out)
+            (mkdir #$output)
-          (copy-file tarball "binaries.tar.xz")
+            (copy-file tarball "binaries.tar.xz")
-          (invoke xz "-d" "binaries.tar.xz")
+            (invoke xz "-d" "binaries.tar.xz")
-          (let ((builddir (getcwd)))
+            (let ((builddir (getcwd)))
-            (with-directory-excursion out
+              (with-directory-excursion #$output
-              (invoke tar "xvf"
+                (invoke tar "xvf"
-                      (string-append builddir "/binaries.tar"))
+                        (string-append builddir "/binaries.tar"))
-              ,@(if snippet (list snippet) '())
+                #$@(if snippet (list snippet) '())
-              (or (not ,program-to-test)
+                (or (not #$program-to-test)
-                  (invoke (string-append "bin/" ,program-to-test)
+                    (invoke (string-append "bin/" #$program-to-test)
-                          "--version"))))))))
+                            "--version"))))))))
     (inputs
-     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
+     (list (bootstrap-executable "tar" (%current-system))
-       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
+           (bootstrap-executable "xz" (%current-system))
-       ("tarball" ,(bootstrap-origin (source (%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
+                            (base32
-                              ("x86_64-linux"
+                             (match system
-                               (base32
+                               ("x86_64-linux"
-                                "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4"))
+                                "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4")
-                              ("i686-linux"
+                               ("i686-linux"
-                               (base32
+                                "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak")
-                                "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak"))
+                               ("armhf-linux"
-                              ("armhf-linux"
+                                "0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5")
-                               (base32
+                               ("aarch64-linux"
-                                "0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5"))
+                                "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh")
-                              ("aarch64-linux"
+                               ("powerpc64le-linux"
-                               (base32
+                                "0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v")
-                                "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh"))
+                               ("i586-gnu"
-                              ("powerpc64le-linux"
+                                "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")
-                               (base32
+                               ("x86_64-gnu"
-                                "0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v"))
+                                "04zksa2457h1vcl5ry2hyzhhsg8fckvfdgadp0viba3anwms2463")
-                              ("i586-gnu"
+                               ("powerpc-linux"
-                               (base32
+                                "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")
-                                "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn"))
+                               ("riscv64-linux"
-                              ("x86_64-gnu"
+                                "0x0xjlpmyh6rkr51p00gp6pscgl6zjida1rsg8vk3rinyi6rrbkg")
-                               (base32
+                               ("mips64el-linux"
-                                "0xnw5p6279m8xazbhal5ld5qxsya0249z2l6jcc7w9ndh2gnx07v"))
-                              ("powerpc-linux"
-                               (base32
-                                "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m"))
-                              ("riscv64-linux"
-                               (base32
-                                "0x0xjlpmyh6rkr51p00gp6pscgl6zjida1rsg8vk3rinyi6rrbkg"))
-                              ("mips64el-linux"
-                               (base32
                                 "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"
+  (package-from-tarball
-                        (lambda (system)
+   "binutils-bootstrap"
-                          (origin
+   (lambda (system)
-                           (method url-fetch)
+     (origin
-                           (uri (map (cut string-append <> "/" system
+       (method url-fetch)
-                                          (match system
+       (uri (map (cut string-append <> "/" system
-                                            ("armhf-linux"
+                      (match system
-                                             "/20150101/binutils-2.25.tar.xz")
+                        ("armhf-linux"
-                                            ("aarch64-linux"
+                         "/20150101/binutils-2.25.tar.xz")
-                                             "/20170217/binutils-2.27.tar.xz")
+                        ("aarch64-linux"
-                                            ("powerpc64le-linux"
+                         "/20170217/binutils-2.27.tar.xz")
-                                             "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz")
+                        ("powerpc64le-linux"
-                                            ("i586-gnu"
+                         "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz")
-                                             "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
+                        ("i586-gnu"
-                                            ("x86_64-gnu"
+                         "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz")
-                                             "/20260302/binutils-static-stripped-2.44-x86_64-pc-gnu.tar.xz")
+                        ("x86_64-gnu"
-                                            ("powerpc-linux"
+                         "/20241122/binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz")
-                                             "/20200923/binutils-2.35.1.tar.xz")
+                        ("powerpc-linux"
-                                            ("riscv64-linux"
+                         "/20200923/binutils-2.35.1.tar.xz")
-                                             "/20210725/binutils-2.34.tar.xz")
+                        ("riscv64-linux"
-                                            (_
+                         "/20210725/binutils-2.34.tar.xz")
-                                             "/20131110/binutils-2.23.2.tar.xz")))
+                        (_
-                                     %bootstrap-base-urls))
+                         "/20131110/binutils-2.23.2.tar.xz")))
-                           (sha256
+                 %bootstrap-base-urls))
-                            (match system
+       (file-name "binutils-bootstrap.tar.xz")
-                              ("x86_64-linux"
+       (sha256
-                               (base32
+        (base32
-                                "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20"))
+         (match system
-                              ("i686-linux"
+           ("x86_64-linux"
-                               (base32
+            "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20")
-                                "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9"))
+           ("i686-linux"
-                              ("armhf-linux"
+            "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9")
-                               (base32
+           ("armhf-linux"
-                                "1v7dj6bzn6m36f20gw31l99xaabq4xrhrx3gwqkhhig0mdlmr69q"))
+            "1v7dj6bzn6m36f20gw31l99xaabq4xrhrx3gwqkhhig0mdlmr69q")
-                              ("aarch64-linux"
+           ("aarch64-linux"
-                               (base32
+            "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n")
-                                "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n"))
+           ("powerpc64le-linux"
-                              ("powerpc64le-linux"
+            "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz")
-                               (base32
+           ("riscv64-linux"
-                                "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz"))
+            "0n9qf4vbilfmh1lknhw000waakj4q6s50pnjazr5137skm976z5m")
-                              ("riscv64-linux"
+           ("i586-gnu"
-                               (base32
+            "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")
-                                "0n9qf4vbilfmh1lknhw000waakj4q6s50pnjazr5137skm976z5m"))
+           ("x86_64-gnu"
-                              ("i586-gnu"
+            "1fasv76rppnqlshjqc7dbzngic9cqswi5ydzg6w9rc075daqk8kb")
-                               (base32
+           ("powerpc-linux"
-                                "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs"))
+            "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8")
-                              ("x86_64-gnu"
+           ("mips64el-linux"
-                               (base32
+            "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7"))))))
-                                "033bgmaa012b2lw8g76b02mjgzdnzv2yd3jvaqbhqrr5q9r3xn04"))
+   "ld"                      ; the program to test
-                              ("powerpc-linux"
+   "Bootstrap binaries of the GNU Binutils"))
-                               (base32
-                                "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8"))
-                              ("mips64el-linux"
-                               (base32
-                                "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
+     (list
-       #:modules ((guix build utils))
+      #:guile %bootstrap-guile
-       #:builder
+      #:modules '((guix build utils))
-       (begin
+      #:builder
-         (use-modules (guix build utils))
+      #~(begin
+          (use-modules (guix build utils))
 
-         (let ((out     (assoc-ref %outputs "out"))
+          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
-              (tar     (assoc-ref %build-inputs "tar"))
+                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
-              (xz      (assoc-ref %build-inputs "xz"))
+                (tarball (assoc-ref %build-inputs "glibc.tar.xz")))
-              (tarball (assoc-ref %build-inputs "tarball")))
 
-          (mkdir out)
+            (mkdir #$output)
-          (copy-file tarball "binaries.tar.xz")
+            (copy-file tarball "binaries.tar.xz")
-          (invoke xz "-d" "binaries.tar.xz")
+            (invoke xz "-d" "binaries.tar.xz")
-          (let ((builddir (getcwd)))
+            (let ((builddir (getcwd)))
-            (with-directory-excursion out
+              (with-directory-excursion #$output
-              (invoke tar "xvf"
+                (invoke tar "xvf"
-                      (string-append builddir
+                        (string-append builddir
-                                     "/binaries.tar"))
+                                       "/binaries.tar"))
-              (chmod "lib" #o755)
+                (chmod "lib" #o755)
 
-              ;; Patch linker scripts so they refer to the right file-names.
+                ;; Patch linker scripts so they refer to the right file-names.
-              (substitute* ,(cond ((target-hurd64?)
+                (substitute* #$(cond ((target-hurd64?)
-                                   ''("lib/libc.so" "lib/libm.so"))
+                                      ''("lib/libc.so" "lib/libm.so"))
-                                  ((and (not (target-hurd?))
+                                     ((and (not (target-hurd?))
-                                        (or (target-x86?)
+                                           (or (target-x86?)
-                                            (target-arm?)))
+                                               (target-arm?)))
-                                   ''("lib/libc.so" "lib/libpthread.so"))
+                                      ''("lib/libc.so" "lib/libpthread.so"))
-                                  (else
+                                     (else
-                                   ''("lib/libc.so")))
+                                      ''("lib/libc.so")))
-                (("/[^ ]+/lib/(libc|libh|libm|libpthread|ld)" _ prefix)
+                  (("/[^ ]+/lib/(libc|libh|libm|libpthread|ld)" _ prefix)
-                 (string-append out "/lib/" prefix)))
+                   (string-append #$output "/lib/" prefix)))
-              ,@(if (target-arm32?)
+                #$@(if (target-arm32?)
-                    `((substitute* "lib/libpthread.so"
+                       #~((substitute* "lib/libpthread.so"
-                        (("/[^ ]+/lib/libpthread_nonshared\\.a") "")))
+                            (("/[^ ]+/lib/libpthread_nonshared\\.a") "")))
-                    `())))))))
+                       #~())))))))
     (inputs
-     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
+     (list (bootstrap-executable "tar" (%current-system))
-       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
+           (bootstrap-executable "xz" (%current-system))
-       ("tarball" ,(bootstrap-origin
+           (bootstrap-origin
-                    (origin
+            (origin
-                     (method url-fetch)
+              (method url-fetch)
-                     (uri (map (cut string-append <> "/" (%current-system)
+              (uri (map (cut string-append <> "/" (%current-system)
-                                    (match (%current-system)
+                             (match (%current-system)
-                                      ("armhf-linux"
+                               ("armhf-linux"
-                                       "/20150101/glibc-2.20.tar.xz")
+                                "/20150101/glibc-2.20.tar.xz")
-                                      ("aarch64-linux"
+                               ("aarch64-linux"
-                                       "/20170217/glibc-2.25.tar.xz")
+                                "/20170217/glibc-2.25.tar.xz")
-                                      ("powerpc64le-linux"
+                               ("powerpc64le-linux"
-                                       "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz")
+                                "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz")
-                                      ("i586-gnu"
+                               ("i586-gnu"
-                                       "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz")
+                                "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz")
-                                      ("x86_64-gnu"
+                               ("x86_64-gnu"
-                                       "/20260302/glibc-stripped-2.41-x86_64-pc-gnu.tar.xz")
+                                "/20241122/glibc-stripped-2.39-x86_64-pc-gnu.tar.xz")
-                                      ("powerpc-linux"
+                               ("powerpc-linux"
-                                       "/20200923/glibc-2.32.tar.xz")
+                                "/20200923/glibc-2.32.tar.xz")
-                                      ("riscv64-linux"
+                               ("riscv64-linux"
-                                       "/20210725/glibc-2.31.tar.xz")
+                                "/20210725/glibc-2.31.tar.xz")
-                                      (_
+                               (_
-                                       "/20131110/glibc-2.18.tar.xz")))
+                                "/20131110/glibc-2.18.tar.xz")))
-                               %bootstrap-base-urls))
+                        %bootstrap-base-urls))
-                     (sha256
+              (file-name "glibc.tar.xz")
-                      (match (%current-system)
+              (sha256
-                        ("x86_64-linux"
+               (base32
-                         (base32
+                (match (%current-system)
-                          "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v"))
+                  ("x86_64-linux"
-                        ("i686-linux"
+                   "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")
-                         (base32
+                  ("i686-linux"
-                          "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w"))
+                   "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")
-                        ("armhf-linux"
+                  ("armhf-linux"
-                         (base32
+                   "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn")
-                          "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn"))
+                  ("aarch64-linux"
-                        ("aarch64-linux"
+                   "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")
-                         (base32
+                  ("powerpc64le-linux"
-                          "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c"))
+                   "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")
-                        ("powerpc64le-linux"
+                  ("riscv64-linux"
-                         (base32
+                   "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm")
-                          "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz"))
+                  ("i586-gnu"
-                        ("riscv64-linux"
+                   "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2")
-                         (base32
+                  ("x86_64-gnu"
-                          "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm"))
+                   "1w4h91kxl64a62l646966i73zp2cj6w4dmyc64fh0c1hhdykxass")
-                        ("i586-gnu"
+                  ("powerpc-linux"
-                         (base32
+                   "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")
-                          "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2"))
+                  ("mips64el-linux"
-                        ("x86_64-gnu"
+                   "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))
-                         (base32
-                          "1lpvk0l7qqvz46cnxm64a1a40zg0gj90j3glyk67i1sh5r4znlmy"))
-                        ("powerpc-linux"
-                         (base32
-                          "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb"))
-                        ("mips64el-linux"
-                         (base32
-                          "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
+     (list
-       #:modules ((guix build utils))
+      #:guile %bootstrap-guile
-       #:builder
+      #:modules '((guix build utils))
-       (begin
+      #:builder
-         (use-modules (guix build utils)
+      #~(begin
-                      (ice-9 popen))
+          (use-modules (guix build utils)
+                       (ice-9 popen))
 
-         (let ((out     (assoc-ref %outputs "out"))
+          (let ((tar     (assoc-ref %build-inputs "bootstrap-tar"))
-               (tar     (assoc-ref %build-inputs "tar"))
+                (xz      (assoc-ref %build-inputs "bootstrap-xz"))
-               (xz      (assoc-ref %build-inputs "xz"))
+                (bash    (assoc-ref %build-inputs "bootstrap-bash"))
-               (bash    (assoc-ref %build-inputs "bash"))
+                (libc    (assoc-ref %build-inputs "glibc-bootstrap"))
-               (libc    (assoc-ref %build-inputs "libc"))
+                (tarball (assoc-ref %build-inputs "gcc.tar.xz")))
-               (tarball (assoc-ref %build-inputs "tarball")))
 
-           (mkdir out)
+            (mkdir #$output)
-           (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link
+            (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link
-           (invoke xz "-d" "binaries.tar.xz")
+            (invoke xz "-d" "binaries.tar.xz")
-           (let ((builddir (getcwd))
+            (let ((builddir (getcwd))
-                 (bindir   (string-append out "/bin")))
+                  (bindir   (string-append #$output "/bin")))
 
-             (define (wrap-program program)
+              (define (wrap-program program)
-               (let ((wrapped (format #f ".~a-wrapped" program)))
+                (let ((wrapped (format #f ".~a-wrapped" program)))
-                 (rename-file program wrapped)
+                  (rename-file program wrapped)
-                 (call-with-output-file program
+                  (call-with-output-file program
-                   (lambda (p)
+                    (lambda (p)
-                     (format p "#!~a
+                      (format p "#!~a
 exec ~a/bin/~a -B~a/lib \
      -Wl,-rpath -Wl,~a/lib \
      -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
-                             bash
+                              bash
-                             out wrapped
+                              #$output wrapped
-                             libc libc libc
+                              libc libc libc
-                             ,(glibc-dynamic-linker)))))
+                              #$(glibc-dynamic-linker)))))
-               (chmod program #o555))
+                (chmod program #o555))
 
-             (with-directory-excursion out
+              (with-directory-excursion #$output
-               (invoke tar "xvf"
+                (invoke tar "xvf"
-                       (string-append builddir "/binaries.tar")))
+                        (string-append builddir "/binaries.tar")))
 
-             (with-directory-excursion bindir
+              (with-directory-excursion bindir
-               (chmod "." #o755)
+                (chmod "." #o755)
-               (for-each wrap-program
+                (for-each wrap-program
-                         ,(if (target-hurd64?)
+                          #$(if (target-hurd64?)
-                              ''("gcc" "g++")
+                                ''("gcc" "g++")
-                              ''("gcc")))))))))
+                                ''("gcc")))))))))
     (inputs
-     `(("tar" ,(bootstrap-executable "tar" (%current-system)))
+     (list (bootstrap-executable "tar" (%current-system))
-       ("xz"  ,(bootstrap-executable "xz" (%current-system)))
+           (bootstrap-executable "xz" (%current-system))
-       ("bash" ,(bootstrap-executable "bash" (%current-system)))
+           (bootstrap-executable "bash" (%current-system))
-       ("libc" ,%bootstrap-glibc)
+           %bootstrap-glibc
-       ("tarball" ,(bootstrap-origin
+           (bootstrap-origin
-                    (origin
+            (origin
-                      (method url-fetch)
+              (method url-fetch)
-                      (uri (map (cut string-append <> "/" (%current-system)
+              (uri (map (cut string-append <> "/" (%current-system)
-                                     (match (%current-system)
+                             (match (%current-system)
-                                       ("armhf-linux"
+                               ("armhf-linux"
-                                        "/20150101/gcc-4.8.4.tar.xz")
+                                "/20150101/gcc-4.8.4.tar.xz")
-                                       ("aarch64-linux"
+                               ("aarch64-linux"
-                                        "/20170217/gcc-5.4.0.tar.xz")
+                                "/20170217/gcc-5.4.0.tar.xz")
-                                       ("powerpc64le-linux"
+                               ("powerpc64le-linux"
-                                        "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz")
+                                "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz")
-                                       ("i586-gnu"
+                               ("i586-gnu"
-                                        "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
+                                "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz")
-                                       ("x86_64-gnu"
+                               ("x86_64-gnu"
-                                        "/20260302/gcc-stripped-14.3.0-x86_64-pc-gnu.tar.xz")
+                                "/20241122/gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz")
-                                       ("powerpc-linux"
+                               ("powerpc-linux"
-                                        "/20200923/gcc-5.5.0.tar.xz")
+                                "/20200923/gcc-5.5.0.tar.xz")
-                                       ("riscv64-linux"
+                               ("riscv64-linux"
-                                        "/20210725/gcc-7.5.0.tar.xz")
+                                "/20210725/gcc-7.5.0.tar.xz")
-                                       (_
+                               (_
-                                        "/20131110/gcc-4.8.2.tar.xz")))
+                                "/20131110/gcc-4.8.2.tar.xz")))
-                                %bootstrap-base-urls))
+                        %bootstrap-base-urls))
-                      (sha256
+              (file-name "gcc.tar.xz")
-                       (match (%current-system)
+              (sha256
-                         ("x86_64-linux"
+               (base32
-                          (base32
+                (match (%current-system)
-                           "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls"))
+                  ("x86_64-linux"
-                         ("i686-linux"
+                   "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")
-                          (base32
+                  ("i686-linux"
-                           "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw"))
+                   "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")
-                         ("armhf-linux"
+                  ("armhf-linux"
-                          (base32
+                   "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v")
-                           "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v"))
+                  ("aarch64-linux"
-                         ("aarch64-linux"
+                   "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")
-                          (base32
+                  ("powerpc64le-linux"
-                           "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1"))
+                   "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1")
-                         ("powerpc64le-linux"
+                  ("riscv64-linux"
-                          (base32
+                   "1k4mbnb54wj2q37fgshf5dfixixqnhn002vhzvi9pnb57xb9v14d")
-                           "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1"))
+                  ("i586-gnu"
-                         ("riscv64-linux"
+                   "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")
-                          (base32
+                  ("x86_64-gnu"
-                           "1k4mbnb54wj2q37fgshf5dfixixqnhn002vhzvi9pnb57xb9v14d"))
+                   "1cgbhc76hlccx6v2z7kk7z173lryyq3la5mmbwivl6hbl1zcqg3m")
-                         ("i586-gnu"
+                  ("powerpc-linux"
-                          (base32
+                   "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w")
-                           "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5"))
+                  ("mips64el-linux"
-                         ("x86_64-gnu"
+                   "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))
-                          (base32
-                           "1fhi7f5zld08b6qsyv1d48ha7z0vr8pxr4kf8x7aq1a3kbcv5rkz"))
-                         ("powerpc-linux"
-                          (base32
-                           "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w"))
-                         ("mips64el-linux"
-                          (base32
-                           "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)
+     (list %bootstrap-glibc
-       ("gcc" ,%bootstrap-gcc)
+           %bootstrap-gcc
-       ("binutils" ,%bootstrap-binutils)
+           %bootstrap-binutils
-       ("coreutils&co" ,%bootstrap-coreutils&co)
+           %bootstrap-coreutils&co))))
-       ;; In gnu-build-system.scm, we rely on the availability of Bash.
-       ("bash" ,%bootstrap-coreutils&co)))))
 
 (define %bootstrap-inputs-for-tests
   ;; These are bootstrap inputs that are cheap to produce (no compilation

gnu/packages/compression.scm

@@ -406,10 +406,9 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
 
            ;; Don't attempt to run the tests when cross-compiling.
            #:tests? (not (%current-target-system))))
-    (inputs
+    (inputs (if (%current-target-system)
-     `(,@(if (%current-target-system)
+                (list bash-minimal)
-             `(("bash" ,bash-minimal))
+                (list)))
-             '())))
     (outputs '("out" "static"))
     (synopsis "High-quality data compression program")
     (description
@@ -554,7 +553,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 +562,7 @@ formats, including zstd, xz, gzip, and bgzf.")
                                       version ".tar.gz")))
             (sha256
              (base32
-              "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k"))))
+              "0hsmg58a27jd1vq0lc6yp405978c1nfhqwndl7f10v1mk6sjay2h"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
@@ -581,7 +580,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 +597,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/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
+          #~(modify-phases #$phases
-             (add-after 'unpack 'set-cross-headers-path
+              (add-after 'unpack 'set-cross-headers-path
-               (lambda* (#:key inputs #:allow-other-keys)
+                (lambda* (#:key inputs #:allow-other-keys)
-                 (let* ((mach (assoc-ref inputs "gnumach-headers"))
+                  (let* ((mach (assoc-ref inputs "gnumach-headers"))
-                        (hurd (assoc-ref inputs "hurd-headers"))
+                         (hurd (assoc-ref inputs "hurd-headers"))
-                        (cpath (string-append mach "/include:"
+                         (cpath (string-append mach "/include:"
-                                              hurd "/include")))
+                                               hurd "/include")))
-                   (for-each (cut setenv <> cpath)
+                    (for-each (cut setenv <> cpath)
-                             ',%gcc-cross-include-paths)
+                              '#$%gcc-cross-include-paths))))))
-                   #t)))))
          ((#: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.)
+           `(;; Disable stripping (see above.)
-           #:strip-binaries? #f
+             #:strip-binaries? #f
 
-           ;; This package is used as a target input, but it should not have
+                               ;; This package is used as a target input, but it should not have
-           ;; the usual cross-compilation inputs since that would include
+                               ;; the usual cross-compilation inputs since that would include
-           ;; itself.
+                               ;; itself.
-           #:implicit-cross-inputs? #f
+                               #:implicit-cross-inputs? #f
 
-           ;; We need SRFI 26.
+                               ;; We need SRFI 26.
-           #:modules ((guix build gnu-build-system)
+                               #:modules ((guix build gnu-build-system)
-                      (guix build utils)
+                                          (guix build utils)
-                      (srfi srfi-26))
+                                          (srfi srfi-26))
 
-               ,@(package-arguments libc))
+                               ,@(package-arguments libc))
-           ((#:configure-flags flags)
+         ((#:configure-flags flags)
-            `(cons ,(string-append "--host=" target)
+          #~(cons #$(string-append "--host=" target)
-                   ,(if (target-hurd? target)
+                  #$(if (target-hurd? target)
-                        `(append (list "--disable-werror")
+                        #~(append (list "--disable-werror")
-                                 ,flags)
+                                  #$flags)
                         flags)))
-           ((#:phases phases)
+         ((#:phases phases)
-            `(modify-phases ,phases
+          #~(modify-phases #$phases
-               (add-before 'configure 'set-cross-kernel-headers-path
+              (add-before 'configure 'set-cross-kernel-headers-path
-                 (lambda* (#:key inputs #:allow-other-keys)
+                (lambda* (#:key inputs #:allow-other-keys)
-                   (let* ((kernel (assoc-ref inputs "kernel-headers"))
+                  (let* ((kernel (assoc-ref inputs "kernel-headers"))
-                          (cpath (string-append kernel "/include")))
+                         (cpath (string-append kernel "/include")))
-                     (for-each (cut setenv <> cpath)
+                    (for-each (cut setenv <> cpath)
-                               ',%gcc-cross-include-paths)
+                              '#$%gcc-cross-include-paths)
-                     (setenv "CROSS_LIBRARY_PATH"
+                    (setenv "CROSS_LIBRARY_PATH"
-                             (string-append kernel "/lib")) ; for Hurd's libihash
+                            (string-append kernel "/lib"))))) ; for Hurd's libihash
-                     #t)))
+              (add-before 'configure 'add-cross-binutils-to-PATH
-               (add-before 'configure 'add-cross-binutils-to-PATH
+                (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                 (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                  ;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc
-                   ;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc
+                  ;; -print-prog-name=objdump' returns the correct name.  See
-                   ;; -print-prog-name=objdump' returns the correct name.  See
+                  ;; <https://inbox.sourceware.org/libc-alpha/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/>.
-                   ;; <https://inbox.sourceware.org/libc-alpha/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/>.
+                  (define cross-objdump
-                   (define cross-objdump
+                    (search-input-file
-                     (search-input-file
+                     (or native-inputs inputs)
-                      (or native-inputs inputs)
+                     (string-append #$target "/bin/objdump")))
-                      (string-append ,target "/bin/objdump")))
 
-                   (define cross-binutils
+                  (define cross-binutils
-                     (dirname cross-objdump))
+                    (dirname cross-objdump))
 
-                   (format #t "adding '~a' to the front of 'PATH'~%"
+                  (format #t "adding '~a' to the front of 'PATH'~%"
-                           cross-binutils)
+                          cross-binutils)
-                   (setenv "PATH" (string-append cross-binutils ":"
+                  (setenv "PATH" (string-append cross-binutils ":"
-                                                 (getenv "PATH")))))
+                                                (getenv "PATH")))))
 
-               ;; This phase would require running 'localedef' built for
+              ;; This phase would require running 'localedef' built for
-               ;; TARGET, which is impossible by definition.
+              ;; TARGET, which is impossible by definition.
-               (delete 'install-utf8-c-locale)
+              (delete 'install-utf8-c-locale)
 
-               ,@(if (target-hurd? target)
+              #$@(if (target-hurd? target)
-                     `((add-after 'install 'augment-libc.so
+                     #~((add-after 'install 'augment-libc.so
-                         (lambda* (#:key outputs #:allow-other-keys)
+                          (lambda _
-                           (let ((out (assoc-ref outputs "out")))
+                            (substitute* (string-append #$output "/lib/libc.so")
-                             (substitute* (string-append out "/lib/libc.so")
+                              (("/[^ ]+/lib/libc.so.0.3")
-                               (("/[^ ]+/lib/libc.so.0.3")
+                               (string-append #$output "/lib/libc.so.0.3"
-                                (string-append out "/lib/libc.so.0.3"
+                                              " libmachuser.so libhurduser.so")))))
-                                               " libmachuser.so libhurduser.so"))))))
+                        (add-after 'install 'create-machine-symlink
-                       (add-after 'install 'create-machine-symlink
+                          (lambda _
-                         (lambda* (#:key outputs #:allow-other-keys)
+                            (let ((cpu #$(match target
-                           (let* ((out (assoc-ref outputs "out"))
+                                           ((? target-x86-32?)
-                                  (cpu ,(match target
+                                            "i386")
-                                          ((? target-x86-32?)
+                                           ((? target-x86-64?)
-                                           "i386")
+                                            "x86_64")))
-                                          ((? target-x86-64?)
-                                           "x86_64")))
                                   (machine (string-append
-                                            out "/include/mach/machine")))
+                                            #$output
-                             (unless (file-exists? machine)
+                                            "/include/mach/machine")))
-                               (symlink cpu 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/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)
+                     (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"))))))
                #$@(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)
+                     (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"))))))
                (add-before 'configure 'pre-configure
                  (lambda _
                    (chdir "dist")

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 #:configure-flags #~(list "-DBUILD_TESTING=OFF"))
+           #~(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/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
+     "Flex is a tool for generating scanners.  A scanner, sometimes called a
-called a tokenizer, is a program which recognizes lexical patterns in
+tokenizer, is a program which recognizes lexical patterns in text.  The flex
-text.  The flex program reads user-specified input files, or its standard
+program reads user-specified input files, or its standard input if no file
-input if no file names are given, for a description of a scanner to
+names are given, for a description of a scanner to generate.  The description
-generate.  The description is in the form of pairs of regular expressions
+is in the form of pairs of regular expressions and C code, called rules.  Flex
-and C code, called rules.  Flex generates a C source file named,
+generates a C source file named @file{lex.yy.c}, which defines the function
-\"lex.yy.c\", which defines the function yylex().  The file \"lex.yy.c\"
+@code{yylex()}.  The @file{lex.yy.c} can be compiled and linked to produce an
-can be compiled and linked to produce an executable.  When the executable
+executable.  When the executable is run, it analyzes its input for occurrences
-is run, it analyzes its input for occurrences of text matching the
+of text matching the regular expressions for each rule.  Whenever it finds a
-regular expressions for each rule.  Whenever it finds a match, it
+match, it executes the corresponding C code.")
-executes the corresponding C code.")
     (license (non-copyleft "file://COPYING"
                            "See COPYING in the distribution."))))

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"
+         #~(list "--with-arch=armv7-a"
-           "--with-float=hard"
+                 "--with-float=hard"
-           "--with-mode=thumb"
+                 "--with-mode=thumb"
-           "--with-fpu=neon"))
+                 "--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))))
+                  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))))))
     (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
+        (list
-          #:configure-flags ,(configure-flags)
+         #:out-of-source? #t
+         #:configure-flags
+         #~(append
+            (list "--enable-plugin"
+                  "--enable-languages=c,c++,objc,obj-c++"
+                  "--disable-multilib"
+                  "--with-system-zlib"
 
-          #:make-flags
+                  ;; No pre-compiled libstdc++ headers, to save space.
-          ;; None of the flags below are needed when doing a Canadian cross.
+                  "--disable-libstdcxx-pch"
-          ;; 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)))
-                          '())
 
-                    ;; Native programs like 'genhooks' also need that right.
+                  "--with-local-prefix=/no-gcc-local-prefix"
-                    ,(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")))))
 
-          #: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
+                  (let ((libc (assoc-ref %build-inputs "libc")))
-          (modify-phases %standard-phases
+                    (if libc
-            (add-before 'configure 'relax-gcc-14s-strictness
+                        (string-append "--with-native-system-header-dir=" libc
-              (lambda* (#:key inputs #:allow-other-keys)
+                                       "/include")
-                (let ((bash (assoc-ref inputs "bash"))
+                        "--without-headers")))
-                      (wrapper (string-append (getcwd) "/gcc.sh"))
+
-                      (stage-wrapper (string-append (getcwd) "/stage-gcc.sh")))
+            ;; Pass the right options for the target triplet.
-                  (with-output-to-file wrapper
+            #$(gcc-configure-flags-for-triplet
-                    (lambda _
+               (or (%current-target-system)
-                      (format #t "#! ~a/bin/bash
+                   (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)))
+                               bash)))
-                  (chmod wrapper #o555)
+                   (chmod wrapper #o555)
-                  (with-output-to-file stage-wrapper
+                   (with-output-to-file stage-wrapper
-                    (lambda _
+                     (lambda _
-                      (format #t "#! ~a/bin/bash
+                       (format #t "#! ~a
 exec \"$@\" \
     -Wno-error=implicit-function-declaration"
-                              bash)))
+                               bash)))
-                  (chmod stage-wrapper #o555)
+                   (chmod stage-wrapper #o555)
-                  ;; Rather than adding CC to #:configure-flags and
+                   ;; Rather than adding CC to #:configure-flags and
-                  ;; STAGE_CC_WRAPPER to #:make-flags, we add them to the
+                   ;; STAGE_CC_WRAPPER to #:make-flags, we add them to the
-                  ;; environment in this easily removable stage.
+                   ;; environment in this easily removable stage.
-                  (cond (,(%current-target-system) ;cross-build?
+                   (cond (#$(%current-target-system) ;cross-build?
-                         (setenv "CC_FOR_BUILD" wrapper))
+                          (setenv "CC_FOR_BUILD" wrapper))
-                        (else
+                         (else
-                         (setenv "CC" wrapper)
+                          (setenv "CC" wrapper)
-                         (setenv "STAGE_CC_WRAPPER" stage-wrapper))))))
+                          (setenv "STAGE_CC_WRAPPER" stage-wrapper))))))
-            (add-before 'configure 'pre-configure
+             (add-before 'configure 'pre-configure
-              (lambda* (#:key inputs outputs #:allow-other-keys)
+               (lambda* (#:key inputs outputs #:allow-other-keys)
-                (let ((libdir ,(libdir))
+                 (let ((libdir #$(libdir))
-                      (libc   (assoc-ref inputs "libc")))
+                       (libc   (assoc-ref inputs "libc")))
-                  (when libc
+                   (when libc
-                    ;; The following is not performed for `--without-headers'
+                     ;; The following is not performed for `--without-headers'
-                    ;; cross-compiler builds.
+                     ;; cross-compiler builds.
 
-                    ;; Join multi-line definitions of GLIBC_DYNAMIC_LINKER* into a
+                     ;; Join multi-line definitions of GLIBC_DYNAMIC_LINKER* into a
-                    ;; single line, to allow the next step to work properly.
+                     ;; single line, to allow the next step to work properly.
-                    (for-each
+                     (for-each
-                     (lambda (x)
+                      (lambda (x)
-                       (substitute* (find-files "gcc/config"
+                        (substitute* (find-files "gcc/config"
-                                                "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
+                                                 "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
-                         (("(#define (GLIBC|GNU_USER)_DYNAMIC_LINKER.*)\\\\\n$" _ line)
+                          (("(#define (GLIBC|GNU_USER)_DYNAMIC_LINKER.*)\\\\\n$" _ line)
-                          line)))
+                           line)))
-                     '(1 2 3))
+                      '(1 2 3))
 
-                    ;; Fix the dynamic linker's file name.
+                     ;; Fix the dynamic linker's file name.
-                    (substitute* (find-files "gcc/config"
+                     (substitute* (find-files "gcc/config"
-                                             "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
+                                              "^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
-                      (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ \t]*).*$"
+                       (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ \t]*).*$"
-                        _ gnu-user suffix)
+                         _ gnu-user suffix)
-                       (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
+                        (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
-                               gnu-user suffix
+                                gnu-user suffix
-                               (string-append libc ,(glibc-dynamic-linker)))))
+                                (string-append libc #$(glibc-dynamic-linker)))))
 
-                    ;; Tell where to find libstdc++, libc, and `?crt*.o', except
+                     ;; Tell where to find libstdc++, libc, and `?crt*.o', except
-                    ;; `crt{begin,end}.o', which come with GCC.
+                     ;; `crt{begin,end}.o', which come with GCC.
-                    (substitute* (find-files "gcc/config"
+                     (substitute* (find-files "gcc/config"
-                                             "^gnu-user.*\\.h$")
+                                              "^gnu-user.*\\.h$")
-                      (("#define GNU_USER_TARGET_LIB_SPEC (.*)$" _ suffix)
+                       (("#define GNU_USER_TARGET_LIB_SPEC (.*)$" _ suffix)
-                       ;; Help libgcc_s.so be found (see also below.)  Always use
+                        ;; Help libgcc_s.so be found (see also below.)  Always use
-                       ;; '-lgcc_s' so that libgcc_s.so is always found by those
+                        ;; '-lgcc_s' so that libgcc_s.so is always found by those
-                       ;; programs that use 'pthread_cancel' (glibc dlopens
+                        ;; programs that use 'pthread_cancel' (glibc dlopens
-                       ;; libgcc_s.so when pthread_cancel support is needed, but
+                        ;; libgcc_s.so when pthread_cancel support is needed, but
-                       ;; having it in the application's RUNPATH isn't enough; see
+                        ;; having it in the application's RUNPATH isn't enough; see
-                       ;; <http://sourceware.org/ml/libc-help/2013-11/msg00023.html>.)
+                        ;; <http://sourceware.org/ml/libc-help/2013-11/msg00023.html>.)
-                       ;;
+                        ;;
-                       ;; NOTE: The '-lgcc_s' added below needs to be removed in a
+                        ;; NOTE: The '-lgcc_s' added below needs to be removed in a
-                       ;; later phase of %gcc-static.  If you change the string
+                        ;; later phase of %gcc-static.  If you change the string
-                       ;; below, make sure to update the relevant code in
+                        ;; below, make sure to update the relevant code in
-                       ;; %gcc-static package as needed.
+                        ;; %gcc-static package as needed.
-                       (format #f "#define GNU_USER_TARGET_LIB_SPEC \
+                        (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))
+                                libc libc libdir suffix))
-                      (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
+                       (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
-                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
+                        (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
+                     ;; The rs6000 (a.k.a. powerpc) config in GCC does not use
-                    ;; GNU_USER_* defines.  Do the above for this case.
+                     ;; GNU_USER_* defines.  Do the above for this case.
-                    (substitute*
+                     (substitute*
-                        "gcc/config/rs6000/sysv4.h"
+                         "gcc/config/rs6000/sysv4.h"
-                      (("#define LIB_LINUX_SPEC (.*)$" _ suffix)
+                       (("#define LIB_LINUX_SPEC (.*)$" _ suffix)
-                       (format #f "#define LIB_LINUX_SPEC \
+                        (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))
+                                libc libc libdir suffix))
-                      (("#define	STARTFILE_LINUX_SPEC.*$" line)
+                       (("#define	STARTFILE_LINUX_SPEC.*$" line)
-                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib/\"
+                        (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")
+                   (when (file-exists? "gcc/config/rs6000")
-                    ;; Force powerpc libdir to be /lib and not /lib64
+                     ;; Force powerpc libdir to be /lib and not /lib64
-                    (substitute* (find-files "gcc/config/rs6000")
+                     (substitute* (find-files "gcc/config/rs6000")
-                      (("/lib64") "/lib")))
+                       (("/lib64") "/lib")))
 
-                  ;; Don't retain a dependency on the build-time sed.
+                   ;; Don't retain a dependency on the build-time sed.
-                  (substitute* "fixincludes/fixincl.x"
+                   (substitute* "fixincludes/fixincl.x"
-                    (("static char const sed_cmd_z\\[\\] =.*;")
+                     (("static char const sed_cmd_z\\[\\] =.*;")
-                     "static char const sed_cmd_z[] = \"sed\";"))
+                      "static char const sed_cmd_z[] = \"sed\";"))
 
-                  ;; Aarch64 support didn't land in GCC until the 4.8 series.
+                   ;; Aarch64 support didn't land in GCC until the 4.8 series.
-                  (when (file-exists? "gcc/config/aarch64")
+                   (when (file-exists? "gcc/config/aarch64")
-                    ;; Force Aarch64 libdir to be /lib and not /lib64
+                     ;; Force Aarch64 libdir to be /lib and not /lib64
-                    (substitute* "gcc/config/aarch64/t-aarch64-linux"
+                     (substitute* "gcc/config/aarch64/t-aarch64-linux"
-                      (("lib64") "lib")))
+                       (("lib64") "lib")))
 
-                  ;; The STARTFILE_PREFIX_SPEC prevents gcc from finding the
+                   ;; The STARTFILE_PREFIX_SPEC prevents gcc from finding the
-                  ;; gcc:lib output, which causes ld to not find -lgcc_s.
+                   ;; gcc:lib output, which causes ld to not find -lgcc_s.
-                  (when (file-exists? "gcc/config/riscv")
+                   (when (file-exists? "gcc/config/riscv")
-                    (substitute* '("gcc/config/riscv/linux.h"
+                     (substitute* '("gcc/config/riscv/linux.h"
-                                   "gcc/config/riscv/riscv.h")  ; GCC < 10
+                                    "gcc/config/riscv/riscv.h")  ; GCC < 10
-                      (("define STARTFILE_PREFIX_SPEC")
+                       (("define STARTFILE_PREFIX_SPEC")
-                      "define __STARTFILE_PREFIX_SPEC")))
+                        "define __STARTFILE_PREFIX_SPEC")))
 
-                  (when (file-exists? "libbacktrace")
+                   (when (file-exists? "libbacktrace")
-                    ;; GCC 4.8+ comes with libbacktrace.  By default it builds
+                     ;; GCC 4.8+ comes with libbacktrace.  By default it builds
-                    ;; with -Werror, which fails with a -Wcast-qual error in glibc
+                     ;; with -Werror, which fails with a -Wcast-qual error in glibc
-                    ;; 2.21's stdlib-bsearch.h.  Remove -Werror.
+                     ;; 2.21's stdlib-bsearch.h.  Remove -Werror.
-                    (substitute* "libbacktrace/configure"
+                     (substitute* "libbacktrace/configure"
-                      (("WARN_FLAGS=(.*)-Werror" _ flags)
+                       (("WARN_FLAGS=(.*)-Werror" _ flags)
-                       (string-append "WARN_FLAGS=" flags)))
+                        (string-append "WARN_FLAGS=" flags)))
 
-                    (when (file-exists? "libsanitizer/libbacktrace")
+                     (when (file-exists? "libsanitizer/libbacktrace")
-                      ;; Same in libsanitizer's bundled copy (!) found in 4.9+.
+                       ;; Same in libsanitizer's bundled copy (!) found in 4.9+.
-                      (substitute* "libsanitizer/libbacktrace/Makefile.in"
+                       (substitute* "libsanitizer/libbacktrace/Makefile.in"
-                        (("-Werror")
+                         (("-Werror")
-                         ""))))
+                          ""))))
 
-                  ;; Add a RUNPATH to libstdc++.so so that it finds libgcc_s.
+                   ;; Add a RUNPATH to libstdc++.so so that it finds libgcc_s.
-                  ;; See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354>
+                   ;; See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354>
-                  ;; and <http://bugs.gnu.org/20358>.
+                   ;; and <http://bugs.gnu.org/20358>.
-                  (substitute* "libstdc++-v3/src/Makefile.in"
+                   (substitute* "libstdc++-v3/src/Makefile.in"
-                    (("^OPT_LDFLAGS = ")
+                     (("^OPT_LDFLAGS = ")
-                     "OPT_LDFLAGS = -Wl,-rpath=$(libdir) "))
+                      "OPT_LDFLAGS = -Wl,-rpath=$(libdir) "))
 
-                  ;; Move libstdc++*-gdb.py to the "lib" output to avoid a
+                   ;; Move libstdc++*-gdb.py to the "lib" output to avoid a
-                  ;; circularity between "out" and "lib".  (Note:
+                   ;; circularity between "out" and "lib".  (Note:
-                  ;; --with-python-dir is useless because it imposes $(prefix) as
+                   ;; --with-python-dir is useless because it imposes $(prefix) as
-                  ;; the parent directory.)
+                   ;; the parent directory.)
-                  (substitute* "libstdc++-v3/python/Makefile.in"
+                   (substitute* "libstdc++-v3/python/Makefile.in"
-                    (("pythondir = .*$")
+                     (("pythondir = .*$")
-                     (string-append "pythondir = " libdir "/share"
+                      (string-append "pythondir = " libdir "/share"
-                                    "/gcc-$(gcc_version)/python\n")))
+                                     "/gcc-$(gcc_version)/python\n")))
 
-                  ;; Avoid another circularity between the outputs: this #define
+                   ;; Avoid another circularity between the outputs: this #define
-                  ;; ends up in auto-host.h in the "lib" output, referring to
+                   ;; ends up in auto-host.h in the "lib" output, referring to
-                  ;; "out".  (This variable is used to augment cpp's search path,
+                   ;; "out".  (This variable is used to augment cpp's search path,
-                  ;; but there's nothing useful to look for here.)
+                   ;; but there's nothing useful to look for here.)
-                  (substitute* "gcc/config.in"
+                   (substitute* "gcc/config.in"
-                    (("PREFIX_INCLUDE_DIR")
+                     (("PREFIX_INCLUDE_DIR")
-                     "PREFIX_INCLUDE_DIR_isnt_necessary_here")))))
+                      "PREFIX_INCLUDE_DIR_isnt_necessary_here")))))
 
-            (add-after 'configure 'post-configure
+             (add-after 'configure 'post-configure
-              (lambda _
+               (lambda _
-                ;; Don't store configure flags, to avoid retaining references to
+                 ;; Don't store configure flags, to avoid retaining references to
-                ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
+                 ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
-                (substitute* "Makefile"
+                 (substitute* "Makefile"
-                  (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
+                   (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
-                   "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))))))
+                    "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
+            #~(modify-phases #$phases
-               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                 (lambda* (#:key inputs #:allow-other-keys)
+                  (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libc (assoc-ref inputs "libc"))
+                    (let ((libc (assoc-ref inputs "libc"))
-                         (gcc (assoc-ref inputs  "gcc")))
+                          (gcc (assoc-ref inputs  "gcc")))
-                     (setenv "CPLUS_INCLUDE_PATH"
+                      (setenv "CPLUS_INCLUDE_PATH"
-                             (string-join (fold delete
+                              (string-join (fold delete
-                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                 (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                              #\:)
+                                                               #\:)
-                                                (list (string-append libc "/include")
+                                                 (list (string-append libc "/include")
-                                                      (string-append gcc "/include/c++")))
+                                                       (string-append gcc "/include/c++")))
-                                          ":"))
+                                           ":"))
-                     (format #t
+                      (format #t
-                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                              "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
+                              (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
+            #~(modify-phases #$phases
-               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                 (lambda* (#:key inputs #:allow-other-keys)
+                  (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libc (assoc-ref inputs "libc"))
+                    (let ((libc (assoc-ref inputs "libc"))
-                         (gcc (assoc-ref inputs  "gcc")))
+                          (gcc (assoc-ref inputs  "gcc")))
-                     (setenv "CPLUS_INCLUDE_PATH"
+                      (setenv "CPLUS_INCLUDE_PATH"
-                             (string-join (fold delete
+                              (string-join (fold delete
-                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                 (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                              #\:)
+                                                               #\:)
-                                                (list (string-append libc "/include")
+                                                 (list (string-append libc "/include")
-                                                      (string-append gcc "/include/c++")))
+                                                       (string-append gcc "/include/c++")))
-                                          ":"))
+                                           ":"))
-                     (format #t
+                      (format #t
-                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                              "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
+                              (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

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.
+           libtextstyle))
-           ;; The next version of gettext can use a separate libtextstyle,
-           ;; but for now we include it here in 'gettext-minimal'.
-           ncurses))
     (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"
@@ -124,6 +122,14 @@
                                    ;; 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 +157,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"))
+                "0j8fijicvg8jkrisgsqbpnbmfb2mz3gx2p6pcwip82731yb7i9aj"))))
-              (patches (search-patches "gettext-libunicode-update.patch"))))
     (arguments
      (substitute-keyword-arguments arguments
-       ((#:phases phases)
+       ((#:make-flags flags)
-        #~(modify-phases #$phases
+        ;; these gnulib tests fail with newer libunistring
-            (add-after 'unpack 'touch-test
+        #~(cons (string-append "XFAIL_TESTS="
-              (lambda _
+                               "test-uc_tolower "
-                (with-output-to-file "gettext-tools/gnulib-tests/test-execute.sh"
+                               "test-ctype_alnum "
-                  (lambda _ (display "")))))
+                               "test-ctype_alpha "
-            (add-before 'check 'patch-test
+                               "test-ctype_graph "
-              (lambda _
+                               "test-ctype_lower "
-                ;; This test fails with ggc-14.
+                               "test-ctype_print "
-                (substitute* "gettext-tools/tests/xgettext-javascript-6"
+                               "test-ctype_punct "
-                  (("^#!.*" all) (string-append all "exit 77;\n")))))))))))
+                               "test-ctype_upper") #$flags))))))
 
 ;; Use that name to avoid clashes with Guile's 'gettext' procedure.
 ;;
@@ -203,22 +210,17 @@ translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
 (define-public libtextstyle
   (package
     (name "libtextstyle")
-    (version "0.21")
+    (version (package-version gnu-gettext))
-    (source (origin
+    (source (package-source gnu-gettext))
-              (inherit (package-source gnu-gettext))
-              (uri (string-append "mirror://gnu/gettext/gettext-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-static")
+     (list
-       #:phases (modify-phases %standard-phases
+      #:configure-flags #~(list "--disable-static")
-                  (add-after 'unpack 'chdir
+      #:phases
-                    (lambda _
+      #~(modify-phases %standard-phases
-                      (chdir "libtextstyle")
+          (add-after 'unpack 'chdir
-                      #t)))))
+            (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/guile-xyz.scm

@@ -3941,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.
-
+            (substitute* "module/ice-9/popen.scm"
-            ;; TODO: On the next rebuild cycle, unconditionally use
+              (("/bin/sh")
-            ;; 'search-input-file' instead of 'assoc-ref'.
+               (search-input-file inputs "/bin/bash")))))
-            (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)))
         (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")

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-grep-compat.patch"))
-                                    "ghc-testsuite-recomp015-execstack.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-grep-compat.patch"))
-                                    "ghc-testsuite-recomp015-execstack.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-grep-compat.patch"))
-                                    "ghc-testsuite-recomp015-execstack.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"
+           (patches (search-patches "ghc-9.2-grep-warnings.patch"))
-                                    "ghc-testsuite-recomp015-execstack.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"
+             (patches (search-patches "ghc-9.2-grep-warnings.patch"))))
-                                      "ghc-testsuite-recomp015-execstack.patch"))))
          ,@(filter (match-lambda
                      (("ghc-bootstrap" . _) #f)
                      (("ghc-testsuite" . _) #f)

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)

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/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/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/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/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/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-5.3.2/builtin.c
-+++ gawk-4.1.3/io.c	2015-06-09 18:39:36.918414881 +0200
++++ gawk-5.3.2/builtin.c
-@@ -2025,7 +2025,7 @@
+@@ -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 @@
+@@ -2475,7 +2475,7 @@ use_pipes:
- 			fatal(_("close of pipe failed (%s)"), strerror(errno));
+ 			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__ */
+ #endif /* NOT __MINGW32__ */
-@@ -2659,7 +2659,7 @@
+@@ -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/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/perl.scm

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

gnu/packages/readline.scm

@@ -4,6 +4,7 @@
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -50,22 +51,10 @@
   (list (readline-patch version seqno (base32 hash))
         ...))
 
-(define %patch-series-8.2
+(define %patch-series-8.3
   (patch-series
-   "8.2"
+   "8.3"
-   (1 "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv")
+   (1 "1pl4midx7kc56bw4ansrdpdjpanv1vmp0p6jghrrgrnv0qqs1w11")))
-   (2 "0ly0siy6qy3l7hv12847adpfa34yq1w4qz9qkw6vrxv25j106rg0")
-   (3 "1c5cwvvkx9mfmpaapymq9cavmzh4fnagkjlchsqx4vml8sx8gx94")
-   (4 "1b15sndx9v5vj3x1f3h73099nlagknx4rbfpd5ldrbw2xgm2wmvr")
-   (5 "16ac25jz1a1mgkpfp1sydqf6qpsfh0s0dcmrnjpqbhg5va3s6av2")
-   (6 "18gmh6y3klh0vv28cyqz4is3rlb32pl7f1kf5r482kfjq3w5zd67")
-   (7 "1xmnpahs983n4w0gn3j0wr8nh1dpva33yj7fvfmhm46ph2wsa4ar")
-   (8 "0smjjzhwxi2ibpdisnk53lh1pzgka6rhlqyh3662xy69v34ysxx1")
-   (9 "05m1fwbs7mbs3pz3pg87gbbayandrrcgaqawzliqb6g1jbk8b61x")
-   (10 "0k3vyrjs2g6y2cfs03l2gp37fhxgqpiwvxb1c7z4q88cbb32x3km")
-   (11 "1msdahvz56l9m5m69a87zp2c7qrfv0dxwd09rj1697isgy83s0g0")
-   (12 "1lybzig73pqpcbw79im0kn6299lkcbnh24yigygn5jm2sj7dz2kc")
-   (13 "1a48lyrhvn6nbj5qhradfpbbs3md5maz7wb32yvaghvfgnak990y")))
 
 (define %patch-series-7.0
   (patch-series
@@ -79,16 +68,16 @@
 (define-public readline
   (package
     (name "readline")
-    (version (string-append "8.2."
+    (version (string-append "8.3."
-                            (number->string (length %patch-series-8.2))))
+                            (number->string (length %patch-series-8.3))))
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/readline/readline-"
                                   (version-major+minor version) ".tar.gz"))
               (sha256
                (base32
-                "0dbw02ai0z8x6d9s14pl0hnaa2g1kdxnv8qqra1fx13ay5qp3srz"))
+                "1k31j1prf9zn86hccay2i49vlzks0cy1v3gfjpa8r0k78hh86lzy"))
-              (patches (append %patch-series-8.2
+              (patches (append %patch-series-8.3
                                (search-patches "readline-link-ncurses.patch")))
               (patch-flags '("-p0"))))
     (build-system gnu-build-system)

gnu/packages/shells.scm

@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2013, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2016, 2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
 ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
@@ -1046,23 +1046,22 @@ JavaScript users who avoid shell.")
 (define-public gash
   (package
     (name "gash")
-    (version "0.3.1")
+    (version "0.3.2")
     (source
-     ;; Use a copy built from the unofficial 'EBADF-fixes' branch,
+     ;; Note: Pre-built tarballs are no longer hosted at
-     ;; <https://codeberg.org/civodul/gash/commit/7c9bf2110cfe85424fba0cd14445d5f0926c3fbd>.
+     ;; <https://savannah.nongnu.org/projects/gash>.
-     ;; See <https://issues.guix.gnu.org/75658>.
      (origin (method url-fetch)
              (uri (string-append "mirror://gnu/guix/mirror/gash-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "069wizkfkkifij9n0r6fkwbgcnjyr6xvnjid11ckppx0waixc0s7"))))
+               "1r74k5qms2rrpx7cywpg9hdywd3y893rl1f4467l86h1gpkih368"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
     (inputs
      (list guile-3.0))
-    (home-page "https://savannah.nongnu.org/projects/gash/")
+    (home-page "https://codeberg.org/guix/gash")
     (synopsis "POSIX-compatible shell written in Guile Scheme")
     (description "Gash is a POSIX-compatible shell written in Guile
 Scheme.  It provides both the shell interface, as well as a Guile

gnu/packages/text-editors.scm

@@ -140,24 +140,18 @@
 (define-public ed
   (package
     (name "ed")
-    (version "1.21")
+    (version "1.22.5")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/ed/ed-"
                                  version ".tar.lz"))
              (sha256
               (base32
-               "0xddpcdsdhf1cx7izk9l5dmf8vakjx5ncm1cy1f3libxfac4kqk0"))))
+               "1k2ql71ybnsfwh81f95qwcg9wl2ijyziav1pj1kav7gjqbfhgqan"))))
     (build-system gnu-build-system)
     (native-inputs (list lzip))
     (arguments
-     `(#:configure-flags (list ,(string-append "CC=" (cc-for-target)))
+     `(#:configure-flags (list ,(string-append "CC=" (cc-for-target)))))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'patch-source-shebangs 'patch-test-suite
-                     (lambda _
-                       (substitute* "testsuite/check.sh"
-                         (("/bin/sh") (which "sh"))))))))
     (home-page "https://www.gnu.org/software/ed/")
     (synopsis "Line-oriented text editor")
     (description

gnu/packages/version-control.scm

@@ -67,6 +67,7 @@
 ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2025 Matthew Elwin <elwin@northwestern.edu>
 ;;; Copyright © 2026 Ingar <ingar@onionmail.info>
+;;; Copyright © 2026 Robin Templeton <robin@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -443,6 +444,16 @@ Python 3.3 and later, rather than on Python 2.")
                      "MINGW"
                      "GNU")))           ;matched against '*'
 
+              ;; Patch git-sh-i18n.sh to source gettext.sh from
+              ;; gettext-minimal.  By default, it uses gettext.sh from $PATH
+              ;; if available, and falls back to English if not.
+              (let ((gettext-sh (search-input-file inputs "bin/gettext.sh")))
+                (substitute* "git-sh-i18n.sh"
+                  (("type gettext.sh")
+                   (format #f "type ~a" gettext-sh))
+                  (("\\. gettext.sh")
+                   (format #f ". ~a" gettext-sh))))
+
               ;; git-submodule sources 'git-sh-setup.sh', but not before
               ;; invoking the basename and sed commands... patch them to their
               ;; absolute location.
@@ -583,6 +594,7 @@ Python 3.3 and later, rather than on Python 2.")
            coreutils-minimal
            curl                         ;for HTTP(S) access
            expat                        ;for 'git push' over HTTP(S)
+           gettext-minimal              ;for gettext.sh
            openssl
            perl
            sed

guix/build-system/cmake.scm

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013-2015, 2020-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2015, 2020-2022, 2026 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
@@ -123,7 +123,6 @@
   "Return a bag for NAME."
   (define private-keywords
     `(#:cmake #:inputs #:native-inputs
-      #:implicit-inputs? #:implicit-cross-inputs?
       ,@(if target '() '(#:target))))
 
   (bag
@@ -162,7 +161,10 @@
 
 (define* (cmake-build name inputs
                       #:key guile source
-                      (outputs '("out")) (configure-flags ''())
+                      (outputs '("out"))
+                      (implicit-inputs? #t)
+                      (implicit-cross-inputs? #t)
+                      (configure-flags ''())
                       (search-paths '())
                       (make-flags ''())
                       (out-of-source? #t)
@@ -231,7 +233,11 @@ provides a 'CMakeLists.txt' file as its build system."
                       #:graft? #f
                       #:substitutable? substitutable?
                       #:allowed-references allowed-references
-                      #:disallowed-references disallowed-references
+                      #:disallowed-references
+                      (or disallowed-references
+                          (and implicit-inputs?
+                               (not allowed-references)
+                               (default-disallowed-references system)))
                       #:guile-for-build guile)))
 
 
@@ -244,6 +250,8 @@ provides a 'CMakeLists.txt' file as its build system."
                             target
                             build-inputs target-inputs host-inputs
                             source guile
+                            (implicit-inputs? #t)
+                            (implicit-cross-inputs? #t)
                             (outputs '("out"))
                             (configure-flags ''())
                             (search-paths '())

guix/build-system/gnu.scm

@@ -37,6 +37,7 @@
             gnu-build-system
             standard-packages
             standard-cross-packages
+            default-disallowed-references
             package-with-explicit-inputs
             package-with-extra-configure-variable
             static-libgcc-package
@@ -275,6 +276,20 @@ standard packages used as implicit inputs of the GNU build system."
   (let ((distro (resolve-module '(gnu packages commencement))))
     ((module-ref distro '%final-inputs) system)))
 
+(define default-disallowed-references
+  (mlambda (system)
+    "Return the set of disallowed references for SYSTEM--i.e., build-time
+dependencies that build outputs should not refer to by default."
+    ;; XXX: Ideally we would mark all of them but this is too ambitious at
+    ;; this stage: many packages keep a reference to coreutils, grep, etc.
+    (filter-map (match-lambda
+                  (("gcc" gcc) gcc)
+                  (("binutils" binutils) binutils)
+                  (("ld-wrapper" ld-wrapper) ld-wrapper)
+                  (("libc:static" libc "static") (gexp-input libc "static"))
+                  (_ #f))
+                (standard-packages system))))
+
 (define* (lower name
                 #:key source inputs native-inputs outputs target
                 (implicit-inputs? #t) (implicit-cross-inputs? #t)
@@ -284,7 +299,6 @@ standard packages used as implicit inputs of the GNU build system."
   "Return a bag for NAME from the given arguments."
   (define private-keywords
     `(#:inputs #:native-inputs #:outputs
-      #:implicit-inputs? #:implicit-cross-inputs?
       ,@(if target '() '(#:target))))
 
   (bag
@@ -341,6 +355,8 @@ standard packages used as implicit inputs of the GNU build system."
                     guile source
                     (outputs '("out"))
                     (search-paths '())
+                    (implicit-inputs? #t)
+                    (implicit-cross-inputs? #t)
                     (bootstrap-scripts %bootstrap-scripts)
                     (configure-flags ''())
                     (make-flags ''())
@@ -433,7 +449,11 @@ are allowed to refer to."
                       #:graft? #f
                       #:substitutable? substitutable?
                       #:allowed-references allowed-references
-                      #:disallowed-references disallowed-references
+                      #:disallowed-references
+                      (or disallowed-references
+                          (and implicit-inputs?
+                               (not allowed-references)
+                               (default-disallowed-references system)))
                       #:guile-for-build guile)))
 
 
@@ -478,6 +498,8 @@ is one of `host' or `target'."
                           target
                           build-inputs target-inputs host-inputs
                           guile source
+                          (implicit-inputs? #t)
+                          (implicit-cross-inputs? #t)
                           (outputs '("out"))
                           (search-paths '())
                           (native-search-paths '())

guix/build/gnu-build-system.scm

@@ -62,6 +62,14 @@ that incorporate timestamps as a way to tell them to use a fixed timestamp.
 See https://reproducible-builds.org/specs/source-date-epoch/."
   (setenv "SOURCE_DATE_EPOCH" "1"))
 
+(define* (set-GUIX_GCC_MANGLE_PREFIX_MAP #:rest _)
+  "Set the 'GUIX_GCC_MANGLE_PREFIX_MAP' environment variable.
+Guix applies 'gcc-mangle-guix-store.patch' to ensure that there are no
+hardcoded references to inputs from the store in derivation outputs due to
+macro expansions of __FILE__.  Prefix mangling is enabled when this variable
+is set.  See https://codeberg.org/guix/guix/issues/2394."
+  (setenv "GUIX_GCC_MANGLE_PREFIX_MAP" "1"))
+
 (define (first-subdirectory directory)
   "Return the file name of the first sub-directory of DIRECTORY or false, when
 there are none."
@@ -936,7 +944,8 @@ that traversing all the RUNPATH entries entails."
   (let-syntax ((phases (syntax-rules ()
                          ((_ p ...) `((p . ,p) ...)))))
     (phases separate-from-pid1
-            set-SOURCE-DATE-EPOCH set-paths install-locale unpack
+            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

guix/packages.scm

@@ -964,7 +964,7 @@ identifiers.  The result is inferred from the file names of patches."
       ("gzip"  ,(ref '(gnu packages compression) 'gzip))
       ("lzip"  ,(ref '(gnu packages compression) 'lzip))
       ("unzip" ,(ref '(gnu packages compression) 'unzip))
-      ("patch" ,(ref '(gnu packages base) 'patch/pinned)))))
+      ("patch" ,(ref '(gnu packages base) 'patch)))))
 
 (define (default-guile)
   "Return the default Guile package used to run the build code of

guix/tests.scm

@@ -437,25 +437,22 @@ default values, and with EXTRA-FIELDS set as specified."
      (inherit gnu-make)
      (name "make-test-boot0")
      (arguments
-      `(#:guile ,%bootstrap-guile
+      (cons*
-        #:implicit-inputs? #f
+       #:guile %bootstrap-guile
-        #:tests? #f                               ;cannot run "make check"
+       #:implicit-inputs? #f
-        ,@(substitute-keyword-arguments (package-arguments gnu-make)
+       #:tests? #f                               ;cannot run "make check"
-            ((#:configure-flags flags ''())
+       (substitute-keyword-arguments (package-arguments gnu-make)
-             ;; As in 'gnu-make-boot0', work around a 'config.status' defect.
+         ((#:configure-flags flags ''())
-             `(cons "--disable-dependency-tracking" ,flags))
+          ;; As in 'gnu-make-boot0', work around a 'config.status' defect.
-            ((#:phases phases)
+          #~(cons "--disable-dependency-tracking" #$flags))
-             `(modify-phases ,phases
+         ((#:phases phases)
-                (replace 'build
+          #~(modify-phases #$phases
-                  (lambda _
+              (replace 'build
-                    (invoke "./build.sh")
+                (lambda _
-                    #t))
+                  (invoke "./build.sh")))
-                (replace 'install
+              (replace 'install
-                  (lambda* (#:key outputs #:allow-other-keys)
+                (lambda _
-                    (let* ((out (assoc-ref outputs "out"))
+                  (install-file "make" (string-append #$output "/bin")))))))))
-                           (bin (string-append out "/bin")))
-                      (install-file "make" bin)
-                      #t))))))))
      (native-inputs '())                          ;no need for 'pkg-config'
      (inputs %bootstrap-inputs-for-tests))))