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 67c4783c..55084130 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,48 +1,28 @@ --- guix-1.5.0/m4/guix.m4 +++ guix-1.5.0/m4/guix.m4 -@@ -206,9 +206,18 @@ - AC_CACHE_CHECK([whether Guile-Gcrypt is available and recent enough], +@@ -207,8 +207,9 @@ [guix_cv_have_recent_guile_gcrypt], [GUILE_CHECK([retval], -- [(use-modules (gcrypt hash)) + [(use-modules (gcrypt hash)) - (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)))))]) ++ (= 32 (hash-size algorithm))))]) if test "$retval" = 0; then guix_cv_have_recent_guile_gcrypt="yes" - else + else --- guix-1.5.0/configure +++ guix-1.5.0/configure -@@ -8376,9 +8376,18 @@ - $as_echo_n "(cached) " >&6 +@@ -8377,8 +8377,9 @@ else -- $GUILE -c "(use-modules (gcrypt hash)) + $GUILE -c "(use-modules (gcrypt hash)) - (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 ++ (= 32 (hash-size algorithm))))" > /dev/null 2>&1 retval=$? if test "$retval" = 0; then