From 29695ad07420d31b9b0bee87496970a17cc026ab Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Thu, 5 Mar 2026 23:10:04 -0500
Subject: [PATCH] fix(guix): patch release configure for guile-gcrypt check

---
 .../fix-guile-gcrypt-configure-check.patch    | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/steps-guix/guix-1.5.0/patches/fix-guile-gcrypt-configure-check.patch b/steps-guix/guix-1.5.0/patches/fix-guile-gcrypt-configure-check.patch
index 6849d551..67c4783c 100644
--- a/steps-guix/guix-1.5.0/patches/fix-guile-gcrypt-configure-check.patch
+++ b/steps-guix/guix-1.5.0/patches/fix-guile-gcrypt-configure-check.patch
@@ -1,25 +1,48 @@
 --- guix-1.5.0/m4/guix.m4
 +++ guix-1.5.0/m4/guix.m4
-@@ -206,9 +206,10 @@
+@@ -206,9 +206,18 @@
    AC_CACHE_CHECK([whether Guile-Gcrypt is available and recent enough],
      [guix_cv_have_recent_guile_gcrypt],
      [GUILE_CHECK([retval],
 -      [(use-modules (gcrypt hash))
-+      [(eval-when (expand load eval)
-+         (use-modules (gcrypt hash)))
-        (equal? (hash-algorithm sha256)
-                (lookup-hash-algorithm 'sha256))])
+-       (equal? (hash-algorithm sha256)
+-               (lookup-hash-algorithm 'sha256))])
++      [(use-modules (gcrypt hash)
++                    (rnrs bytevectors))
++       (let ((algorithm (lookup-hash-algorithm 'sha256)))
++         (and algorithm
++              (eq? 'sha256 (hash-algorithm-name algorithm))
++              (= 32 (hash-size algorithm))
++              (bytevector=?
++               (sha256 #vu8(97 98 99))
++               #vu8(186 120 22 191 143 1 207 234
++                     65 65 64 222 93 174 34 35
++                     176 3 97 163 150 23 122 156
++                     180 16 255 97 242 0 21 173)))))])
       if test "$retval" = 0; then
         guix_cv_have_recent_guile_gcrypt="yes"
-      else
+       else
 --- guix-1.5.0/configure
 +++ guix-1.5.0/configure
-@@ -8378,7 +8378,8 @@
+@@ -8376,9 +8376,18 @@
+   $as_echo_n "(cached) " >&6
+ else
  
 -  $GUILE -c "(use-modules (gcrypt hash))
-+  $GUILE -c "(eval-when (expand load eval)
-+         (use-modules (gcrypt hash)))
-        (equal? (hash-algorithm sha256)
-                (lookup-hash-algorithm 'sha256))" > /dev/null 2>&1
+-       (equal? (hash-algorithm sha256)
+-               (lookup-hash-algorithm 'sha256))" > /dev/null 2>&1
++  $GUILE -c "(use-modules (gcrypt hash)
++                    (rnrs bytevectors))
++       (let ((algorithm (lookup-hash-algorithm 'sha256)))
++         (and algorithm
++              (eq? 'sha256 (hash-algorithm-name algorithm))
++              (= 32 (hash-size algorithm))
++              (bytevector=?
++               (sha256 #vu8(97 98 99))
++               #vu8(186 120 22 191 143 1 207 234
++                     65 65 64 222 93 174 34 35
++                     176 3 97 163 150 23 122 156
++                     180 16 255 97 242 0 21 173)))))" > /dev/null 2>&1
    retval=$?
  
+      if test "$retval" = 0; then