This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 4962cb0ad2 gnu: gnulib: Update to 2025-06-30-1.9297749.
4962cb0ad2 is described below
commit 4962cb0ad24b4425ea77823c35eb88aaadaf790b
Author: Maxim Cournoyer <ma...@guixotic.coop>
AuthorDate: Sun Jul 20 18:42:34 2025 +0900
gnu: gnulib: Update to 2025-06-30-1.9297749.
* gnu/packages/build-tools.scm (gnulib): Update to 2025-06-30-1.9297749.
(gnulib-checkout) [phases] {regenerate-unicode}: Update.
* gnu/packages/patches/gnulib-bootstrap.patch: Rebase patch.
Change-Id: I7e2a538f99b0ba2d3de4a5376f617f73b027e1a6
---
gnu/packages/build-tools.scm | 14 ++++----
gnu/packages/patches/gnulib-bootstrap.patch | 52 ++++++++++++++++++++---------
2 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 167e0380ef..77c64fb1a3 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2020 Jakub Kądziołka <k...@kadziolka.net>
;;; Copyright © 2020, 2023 Efraim Flashner <efr...@flashner.co.il>
;;; Copyright © 2021 qblade <qbl...@protonmail.com>
-;;; Copyright © 2021, 2023, 2024, 2025 Maxim Cournoyer
<maxim.courno...@gmail.com>
+;;; Copyright © 2021, 2023, 2024, 2025 Maxim Cournoyer <ma...@guixotic.coop>
;;; Copyright © 2022, 2023 Juliana Sims <j...@incana.org>
;;; Copyright © 2024 Evgeny Pisemsky <m...@pisemsky.site>
;;; Copyright © 2024 Janneke Nieuwenhuizen <jann...@gnu.org>
@@ -1016,9 +1016,9 @@ Makefiles, JSON Compilation Database, and experimentally
Ninja.")
"CaseFolding.txt")
(list #$(package-version (this-package-native-input
"ucd")))))
(invoke "clisp" "-C" "uniname/gen-uninames.lisp"
- (find-ucd-file "UnicodeData.txt")
- "uniname/uninames.h"
- (find-ucd-file "NameAliases.txt"))
+ (find-ucd-file "UnicodeData.txt") ;input file
+ (find-ucd-file "NameAliases.txt") ;alias file
+ "uniname/uninames.h") ;output file
(for-each
(match-lambda
((ucd-file . directory)
@@ -1069,9 +1069,9 @@ maintenance-related files, for convenience.")
(define-public gnulib
(gnulib-checkout
- #:version "2024-05-30"
- #:commit "ac4b301ae15223c98b51cd5a0eda2e2cf57c817b"
- #:hash (base32 "0f4w56fc97clg13mmdghx84dh9xqmaqr3j672ppfh3h66gmmmvzs")))
+ #:version "2025-06-30" ;date from last commit on stable-202507 branch
+ #:commit "9297749090b01720888dceeb5f6dab3d52dcef40"
+ #:hash (base32 "10qyhji7q71fhq2956aszj6bipbf11hn0xcrrpkwj9azwindw7ch")))
(define-public pdpmake
(package
diff --git a/gnu/packages/patches/gnulib-bootstrap.patch
b/gnu/packages/patches/gnulib-bootstrap.patch
index c0c9a5e732..26a10c2ab7 100644
--- a/gnu/packages/patches/gnulib-bootstrap.patch
+++ b/gnu/packages/patches/gnulib-bootstrap.patch
@@ -1,6 +1,6 @@
-From adbf7ce2c2b03ce5ee25d4c68f9bb247b0dcbc2b Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.courno...@gmail.com>
-Date: Thu, 30 May 2024 14:48:04 -0400
+From bf900311b84185b01dd4d03c0ff6f3a6e0ade2ed Mon Sep 17 00:00:00 2001
+From: Maxim Cournoyer <ma...@guixotic.coop>
+Date: Wed, 16 Jul 2025 09:55:22 +0900
Subject: [PATCH] bootstrap: Use gnulib-tool from PATH if available.
Some distributions such as GNU Guix include in their package for
@@ -14,28 +14,32 @@ mechanism to support such installation layout.
* build-aux/bootstrap (autogen) <gnulib_tool>: Prefer to use from
PATH, else from $GNULIB_SRCDIR/../../bin/gnulib-tool, else from
-$GNULIB_SRCDIR/gnulib-tool.
+$GNULIB_SRCDIR/gnulib-tool. Invoke script via 'sh' from PATH, for
+portability.
* gnulib-tool.sh (func_gnulib_dir): Honor GNULIB_SRCDIR to locate
gnulib's main directory.
+(func_version): Explicitly invoke git-version-gen via 'sh' to avoid
+relying on the exact location of 'sh' hard-coded in the script
+shebang.
---
- build-aux/bootstrap | 11 +++++++++--
- gnulib-tool.sh | 6 +++++-
- 2 files changed, 14 insertions(+), 3 deletions(-)
+ build-aux/bootstrap | 13 ++++++++++---
+ gnulib-tool.sh | 8 ++++++--
+ 2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
-index 6295b8a128..06271eea8b 100755
+index dc9fb43834..5b2984316c 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -3,7 +3,7 @@
# Bootstrap this package from checked-out sources.
--scriptversion=2024-04-13.15; # UTC
-+scriptversion=2024-05-30.20; # UTC
+-scriptversion=2025-06-10.02; # UTC
++scriptversion=2025-07-16.00; # UTC
- # Copyright (C) 2003-2024 Free Software Foundation, Inc.
+ # Copyright (C) 2003-2025 Free Software Foundation, Inc.
#
-@@ -1164,7 +1164,14 @@ autogen()
+@@ -1211,7 +1211,14 @@ autogen()
fi
if $use_gnulib; then
@@ -51,10 +55,28 @@ index 6295b8a128..06271eea8b 100755
<$gnulib_tool || return
fi
+@@ -1297,7 +1304,7 @@ autogen()
+ esac
+ fi
+ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+- $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
++ sh $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+ || die "gnulib-tool failed"
+
+ if test $with_gettext = yes && test ! -f $m4_base/gettext.m4; then
diff --git a/gnulib-tool.sh b/gnulib-tool.sh
-index 12f0b82461..0aefbe2b2b 100755
+index e0a8cbba82..c4b05195b5 100755
--- a/gnulib-tool.sh
+++ b/gnulib-tool.sh
+@@ -360,7 +360,7 @@ q
+ date=`cd "$gnulib_dir" && git log -n 1 --format=medium --date=iso
ChangeLog | sed -n -e "$sed_extract_first_date"`
+ # Use GNU date to compute the time in GMT.
+ date=`date -d "$date" -u +"%Y-%m-%d %H:%M:%S"`
+- version=' '`cd "$gnulib_dir" && ./build-aux/git-version-gen /dev/null |
sed -e 's/-dirty/-modified/'`
++ version=' '`cd "$gnulib_dir" && sh ./build-aux/git-version-gen /dev/null
| sed -e 's/-dirty/-modified/'`
+ else
+ # gnulib copy without versioning information.
+ date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog`
@@ -518,7 +518,11 @@ func_gnulib_dir ()
* ) self_abspathname=`echo "$self_abspathname" | sed -e
's,/[^/]*$,,'`/"$linkval" ;;
esac
@@ -68,8 +90,6 @@ index 12f0b82461..0aefbe2b2b 100755
}
# func_tmpdir
-
-base-commit: ac4b301ae15223c98b51cd5a0eda2e2cf57c817b
--
-2.41.0
+2.50.1
