From cfc5ec77a72d4e4d04d4e93aa8dee8462baa2cf7 Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Wed, 14 Jan 2026 23:19:39 +0100 Subject: [PATCH] gnu: guile-2.2.4: Fix build by using libxcrypt-without-failure-tokens. * gnu/packages/guile.scm (guile-2.2.4): Use libxcrypt-without-failure-tokens. Change-Id: I91d4d7287636f34aa64ce8d47736b14c311b7a62 Signed-off-by: Rutherther Merges: #5624 --- gnu/packages/guile.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 2980b46f2b9..8f138c24bd7 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -335,18 +335,21 @@ without requiring the source code to be rewritten.") (files '("lib/guile/2.2/site-ccache"))))))) (define-public guile-2.2.4 - ;; This has no dependencies, but is used in (guix quirks). + ;; guile-2.2.4 has no dependents, but is used in (guix quirks). ;; Do not remove! (package (inherit guile-2.2) - (version "2.2.4") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))))) + (version "2.2.4") + (source + (origin + (inherit (package-source guile-2.2)) + (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) + (sha256 + (base32 "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))) + ;; libxcrypt-without-failure-tokens uses --disable-failure-tokens, which is + ;; necessary for the "crypt: glibc EINVAL" test of guile-2.2.4. + (inputs (modify-inputs (package-inputs guile-2.2) + (replace "libxcrypt" libxcrypt-without-failure-tokens))))) (define-public guile-3.0 ;; This is the latest Guile stable version.